From: Christian Kamm Date: Tue, 25 Oct 2016 09:33:38 +0000 (+0200) Subject: Remove unused functions X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1048 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cf48ea2e00fd2e03f0660d4f345c97604979822b;p=nextcloud-desktop.git Remove unused functions Account::changed and AbstractCredentials::changed have not been needed in a long while. --- diff --git a/src/gui/creds/shibbolethcredentials.cpp b/src/gui/creds/shibbolethcredentials.cpp index 21574ddcb..ab660ae39 100644 --- a/src/gui/creds/shibbolethcredentials.cpp +++ b/src/gui/creds/shibbolethcredentials.cpp @@ -79,21 +79,6 @@ void ShibbolethCredentials::setAccount(Account* account) } } -bool ShibbolethCredentials::changed(AbstractCredentials* credentials) const -{ - ShibbolethCredentials* other(qobject_cast< ShibbolethCredentials* >(credentials)); - - if (!other) { - return true; - } - - if (_shibCookie != other->_shibCookie || _user != other->_user) { - return true; - } - - return false; -} - QString ShibbolethCredentials::authType() const { return QString::fromLatin1("shibboleth"); diff --git a/src/gui/creds/shibbolethcredentials.h b/src/gui/creds/shibbolethcredentials.h index 06a70bcad..41911bfdb 100644 --- a/src/gui/creds/shibbolethcredentials.h +++ b/src/gui/creds/shibbolethcredentials.h @@ -48,7 +48,6 @@ public: ShibbolethCredentials(const QNetworkCookie &cookie); void setAccount(Account* account) Q_DECL_OVERRIDE; - bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE; QString authType() const Q_DECL_OVERRIDE; QString user() const Q_DECL_OVERRIDE; QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE; diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 510dfd3aa..10ee8bc3a 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -94,30 +94,6 @@ QString Account::id() const return _id; } -static bool isEqualExceptProtocol(const QUrl &url1, const QUrl &url2) -{ - return (url1.host() != url2.host() || - url1.port() != url2.port() || - url1.path() != url2.path()); -} - -bool Account::changed(AccountPtr other, bool ignoreUrlProtocol) const -{ - if (!other) { - return false; - } - bool changes = false; - if (ignoreUrlProtocol) { - changes = isEqualExceptProtocol(_url, other->_url); - } else { - changes = (_url == other->_url); - } - - changes |= _credentials->changed(other->credentials()); - - return changes; -} - AbstractCredentials *Account::credentials() const { return _credentials.data(); diff --git a/src/libsync/account.h b/src/libsync/account.h index c4852e3ae..f12da0310 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -81,13 +81,6 @@ public: /// The internal id of the account. QString id() const; - /** - * @brief Checks the Account instance is different from @param other - * - * @returns true, if credentials or url have changed, false otherwise - */ - bool changed(AccountPtr other, bool ignoreUrlProtocol) const; - /** Holds the accounts credentials */ AbstractCredentials* credentials() const; void setCredentials(AbstractCredentials *cred); diff --git a/src/libsync/creds/abstractcredentials.h b/src/libsync/creds/abstractcredentials.h index b45bd2c2a..721fba389 100644 --- a/src/libsync/creds/abstractcredentials.h +++ b/src/libsync/creds/abstractcredentials.h @@ -41,7 +41,6 @@ public: */ virtual void setAccount(Account* account); - virtual bool changed(AbstractCredentials* credentials) const = 0; virtual QString authType() const = 0; virtual QString user() const = 0; virtual QNetworkAccessManager* getQNAM() const = 0; diff --git a/src/libsync/creds/dummycredentials.cpp b/src/libsync/creds/dummycredentials.cpp index 33b408670..0231fddba 100644 --- a/src/libsync/creds/dummycredentials.cpp +++ b/src/libsync/creds/dummycredentials.cpp @@ -17,13 +17,6 @@ namespace OCC { -bool DummyCredentials::changed(AbstractCredentials* credentials) const -{ - DummyCredentials* dummy(dynamic_cast< DummyCredentials* >(credentials)); - - return dummy == 0; -} - QString DummyCredentials::authType() const { return QString::fromLatin1("dummy"); diff --git a/src/libsync/creds/dummycredentials.h b/src/libsync/creds/dummycredentials.h index 7ee686267..327c441aa 100644 --- a/src/libsync/creds/dummycredentials.h +++ b/src/libsync/creds/dummycredentials.h @@ -27,7 +27,6 @@ public: QString _user; QString _password; - bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE; QString authType() const Q_DECL_OVERRIDE; QString user() const Q_DECL_OVERRIDE; QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE; diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp index 0530a52e5..ffb9d95dd 100644 --- a/src/libsync/creds/httpcredentials.cpp +++ b/src/libsync/creds/httpcredentials.cpp @@ -71,21 +71,6 @@ HttpCredentials::HttpCredentials(const QString& user, const QString& password, c { } -bool HttpCredentials::changed(AbstractCredentials* credentials) const -{ - HttpCredentials* other(qobject_cast< HttpCredentials* >(credentials)); - - if (!other) { - return true; - } - - if (!other || (other->user() != this->user())) { - return true; - } - - return false; -} - QString HttpCredentials::authType() const { return QString::fromLatin1("http"); diff --git a/src/libsync/creds/httpcredentials.h b/src/libsync/creds/httpcredentials.h index 1032354c7..7cc09e383 100644 --- a/src/libsync/creds/httpcredentials.h +++ b/src/libsync/creds/httpcredentials.h @@ -38,7 +38,6 @@ public: explicit HttpCredentials(); HttpCredentials(const QString& user, const QString& password, const QString& certificatePath, const QString& certificatePasswd); - bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE; QString authType() const Q_DECL_OVERRIDE; QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE; bool ready() const Q_DECL_OVERRIDE; diff --git a/src/libsync/creds/tokencredentials.cpp b/src/libsync/creds/tokencredentials.cpp index 97b6be571..7ea4cf865 100644 --- a/src/libsync/creds/tokencredentials.cpp +++ b/src/libsync/creds/tokencredentials.cpp @@ -80,17 +80,6 @@ TokenCredentials::TokenCredentials(const QString& user, const QString& password, { } -bool TokenCredentials::changed(AbstractCredentials* credentials) const -{ - TokenCredentials* other(dynamic_cast< TokenCredentials* >(credentials)); - - if (!other || (other->user() != this->user())) { - return true; - } - - return false; -} - QString TokenCredentials::authType() const { return QString::fromLatin1("token"); diff --git a/src/libsync/creds/tokencredentials.h b/src/libsync/creds/tokencredentials.h index cf42a4b24..27da7b852 100644 --- a/src/libsync/creds/tokencredentials.h +++ b/src/libsync/creds/tokencredentials.h @@ -40,7 +40,6 @@ public: TokenCredentials(); TokenCredentials(const QString& user, const QString& password, const QString &token); - bool changed(AbstractCredentials* credentials) const Q_DECL_OVERRIDE; QString authType() const Q_DECL_OVERRIDE; QNetworkAccessManager* getQNAM() const Q_DECL_OVERRIDE; bool ready() const Q_DECL_OVERRIDE; diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index 883837c6d..9f38fc680 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -598,7 +598,6 @@ class FakeCredentials : public OCC::AbstractCredentials QNetworkAccessManager *_qnam; public: FakeCredentials(QNetworkAccessManager *qnam) : _qnam{qnam} { } - virtual bool changed(AbstractCredentials *) const { return false; } virtual QString authType() const { return "test"; } virtual QString user() const { return "admin"; } virtual QNetworkAccessManager* getQNAM() const { return _qnam; }