From 2554ad9870dc481dca8af4a37a9bbe71e2a88dee Mon Sep 17 00:00:00 2001 From: nowrep Date: Sun, 30 Jun 2013 12:41:01 +0200 Subject: [PATCH] Coding style: Uninline public functions --- .../databaseencryptedpasswordbackend.cpp | 10 ++++++++++ .../databaseencryptedpasswordbackend.h | 4 ++-- src/lib/network/networkmanager.cpp | 2 +- .../network/schemehandlers/ftpschemehandler.cpp | 15 +++++++++++++++ src/lib/network/schemehandlers/ftpschemehandler.h | 6 +++--- src/lib/tools/aesinterface.cpp | 5 +++++ src/lib/tools/aesinterface.h | 2 +- src/lib/webview/tabbar.cpp | 5 +++++ src/lib/webview/tabbar.h | 2 +- 9 files changed, 43 insertions(+), 8 deletions(-) diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp index e198a9cef..fe65276e4 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp @@ -245,6 +245,11 @@ QString DatabaseEncryptedPasswordBackend::name() const return AutoFill::tr("Database (encrypted)"); } +bool DatabaseEncryptedPasswordBackend::hasSettings() const +{ + return true; +} + void DatabaseEncryptedPasswordBackend::showSettings(QWidget* parent) { MasterPasswordDialog* masterPasswordDialog = new MasterPasswordDialog(this, parent); @@ -383,6 +388,11 @@ void DatabaseEncryptedPasswordBackend::removeMasterPassword() } } +void DatabaseEncryptedPasswordBackend::setAskMasterPasswordState(bool ask) +{ + m_askMasterPassword = ask; +} + void DatabaseEncryptedPasswordBackend::encryptDataBaseTableOnFly(const QByteArray &decryptorPassword, const QByteArray &encryptorPassword) { if (encryptorPassword == decryptorPassword) { diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h index fee7606c9..b1d8a3646 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h +++ b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h @@ -54,7 +54,7 @@ public: QString name() const; - inline bool hasSettings() const { return true; } + bool hasSettings() const; void showSettings(QWidget* parent); bool isMasterPasswordSetted(); @@ -70,7 +70,7 @@ public: void tryToChangeMasterPassword(const QByteArray &newPassword); void removeMasterPassword(); - inline void setAskMasterPasswordState(bool ask) { m_askMasterPassword = ask; } + void setAskMasterPasswordState(bool ask); void encryptDataBaseTableOnFly(const QByteArray &decryptorPassword, const QByteArray &encryptorPassword); diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp index bae94f21d..fd59b7368 100644 --- a/src/lib/network/networkmanager.cpp +++ b/src/lib/network/networkmanager.cpp @@ -166,7 +166,7 @@ void NetworkManager::setSSLConfiguration(QNetworkReply* reply) } } -inline uint qHash(const QSslCertificate &cert) +static inline uint qHash(const QSslCertificate &cert) { return qHash(cert.toPem()); } diff --git a/src/lib/network/schemehandlers/ftpschemehandler.cpp b/src/lib/network/schemehandlers/ftpschemehandler.cpp index 579ca9a7b..978b0eb70 100644 --- a/src/lib/network/schemehandlers/ftpschemehandler.cpp +++ b/src/lib/network/schemehandlers/ftpschemehandler.cpp @@ -442,6 +442,21 @@ void FtpDownloader::download(const QUrl &url, QIODevice* dev) connectToHost(server, port); } +bool FtpDownloader::isFinished() +{ + return m_isFinished; +} + +QUrl FtpDownloader::url() const +{ + return m_url; +} + +QIODevice* FtpDownloader::device() const +{ + return m_dev; +} + void FtpDownloader::setError(QFtp::Error err, const QString &errStr) { m_lastError = err; diff --git a/src/lib/network/schemehandlers/ftpschemehandler.h b/src/lib/network/schemehandlers/ftpschemehandler.h index 2431da925..dc1573977 100644 --- a/src/lib/network/schemehandlers/ftpschemehandler.h +++ b/src/lib/network/schemehandlers/ftpschemehandler.h @@ -99,9 +99,9 @@ public: FtpDownloader(QObject* parent = 0); void download(const QUrl &url, QIODevice* dev); - inline bool isFinished() {return m_isFinished;} - inline QUrl url() const {return m_url;} - inline QIODevice* device() const {return m_dev;} + bool isFinished(); + QUrl url() const; + QIODevice* device() const; void setError(QFtp::Error err, const QString &errStr); void abort(); QFtp::Error error(); diff --git a/src/lib/tools/aesinterface.cpp b/src/lib/tools/aesinterface.cpp index 1879ce01e..66be0034b 100644 --- a/src/lib/tools/aesinterface.cpp +++ b/src/lib/tools/aesinterface.cpp @@ -50,6 +50,11 @@ AesInterface::~AesInterface() EVP_CIPHER_CTX_cleanup(&m_decodeCTX); } +bool AesInterface::isOk() +{ + return m_ok; +} + // Create an 256 bit 'key' using the supplied password, and creates a random 'iv'. // saltArray is an array of 8 bytes can be added for taste. // Fills in the encryption and decryption ctx objects and returns true on success diff --git a/src/lib/tools/aesinterface.h b/src/lib/tools/aesinterface.h index f6d6d527b..7529178ab 100644 --- a/src/lib/tools/aesinterface.h +++ b/src/lib/tools/aesinterface.h @@ -38,7 +38,7 @@ public: explicit AesInterface(QObject* parent = 0); ~AesInterface(); - inline bool isOk() { return m_ok; } + bool isOk(); QByteArray encrypt(const QByteArray &plainData, const QByteArray &password); QByteArray decrypt(const QByteArray &cipherData, const QByteArray &password); diff --git a/src/lib/webview/tabbar.cpp b/src/lib/webview/tabbar.cpp index b8ab97269..0b7259db3 100644 --- a/src/lib/webview/tabbar.cpp +++ b/src/lib/webview/tabbar.cpp @@ -713,6 +713,11 @@ QSize CloseButton::sizeHint() const return QSize(width, height); } +QSize CloseButton::minimumSizeHint() const +{ + return sizeHint(); +} + void CloseButton::enterEvent(QEvent* event) { if (isEnabled()) { diff --git a/src/lib/webview/tabbar.h b/src/lib/webview/tabbar.h index 9272a04e9..29e3159c1 100644 --- a/src/lib/webview/tabbar.h +++ b/src/lib/webview/tabbar.h @@ -137,7 +137,7 @@ public: CloseButton(QWidget* parent = 0); QSize sizeHint() const; - inline QSize minimumSizeHint() const { return sizeHint(); } + QSize minimumSizeHint() const; void enterEvent(QEvent* event); void leaveEvent(QEvent* event);