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 21574ddcb1ddc621edf977c0679d96e3edafe843..ab660ae397a34a54ca09167a32cd31702e18b0c2 100644 (file)
--- 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 06a70bcad26ccb0e81116013af86cd721d86534d..41911bfdbd95f33073124fbf276d96729012ffa5 100644 (file)
--- 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 510dfd3aa8112db89aec9b109460897f17df10cb..10ee8bc3a94a1d95f9a602e09e639618a098d24f 100644 (file)
--- 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 c4852e3aeaaa0b573c89db23174b36cc350506a1..f12da0310f9f628eca6818ff806550ce77ba2f75 100644 (file)
--- 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 b45bd2c2a99421b0b7350d9b29ffb0b32a669c82..721fba3897d249cb6e034d2a510c7c71fc87b2e9 100644 (file)
--- 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 33b408670aa2037031b13ebca1f46f4b81b6256c..0231fddba39e9b19e744f7e475d6bc055c1f9fa5 100644 (file)
--- 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 7ee686267a51c602b4a5db254f1a7570938ca82d..327c441aa1040831385d224bb51f329fbe271140 100644 (file)
--- 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 0530a52e5bd3c8ce56e6d2082244e3706d34d78b..ffb9d95dd68edde59269df1a7b7d4e8105fe38c0 100644 (file)
--- 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 1032354c7b7f2c188570b39c6deb5369487b8524..7cc09e3837f5627cdf34d8bd3a4ea4bfd1919528 100644 (file)
--- 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 97b6be57163395adceafc036af0e0a7e4b444d04..7ea4cf865d18fa1398084f09b032638845703e87 100644 (file)
--- 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 cf42a4b24fe31abd6b48409aef96fae78f7cc040..27da7b8521be8acbdd22e458a7a9fc520210f03a 100644 (file)
--- 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 883837c6d9948e8d3013c728e9df9fab4677ef4a..9f38fc680f7fcd20ac6c16792aefa6fedcdf1240 100644 (file)
--- 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; }