]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Account: Remove wasMigrated/setMigrated
authorChristian Kamm <mail@ckamm.de>
Tue, 25 Oct 2016 09:42:03 +0000 (11:42 +0200)
committerChristian Kamm <mail@ckamm.de>
Tue, 25 Oct 2016 09:43:06 +0000 (11:43 +0200)
It was unused since early in the multi-account work:
a932eac832b442cca763197240f036905dd284da

src/gui/accountmanager.cpp
src/libsync/account.cpp
src/libsync/account.h

index 70ec84cf079c3db56df1cb2aa1fe4c90d55f498e..0cf8b59722317eecefe8985b94166e784c1057e9 100644 (file)
@@ -71,8 +71,6 @@ bool AccountManager::restoreFromLegacySettings()
     // try to open the correctly themed settings
     auto settings = Account::settingsWithGroup(Theme::instance()->appName());
 
-    bool migratedCreds = false;
-
     // if the settings file could not be opened, the childKeys list is empty
     // then try to load settings from a very old place
     if( settings->childKeys().isEmpty() ) {
@@ -102,7 +100,6 @@ bool AccountManager::restoreFromLegacySettings()
                 qDebug() << "Migrate oC config if " << oCUrl << " == " << overrideUrl << ":"
                          << (oCUrl == overrideUrl ? "Yes" : "No");
                 if( oCUrl == overrideUrl ) {
-                    migratedCreds = true;
                     settings.reset( oCSettings );
                 } else {
                     delete oCSettings;
@@ -114,9 +111,6 @@ bool AccountManager::restoreFromLegacySettings()
     // Try to load the single account.
     if (!settings->childKeys().isEmpty()) {
         if (auto acc = loadAccountHelper(*settings)) {
-            if (migratedCreds) {
-                acc->setMigrated(true);
-            }
             addAccount(acc);
             return true;
         }
index 10ee8bc3a94a1d95f9a602e09e639618a098d24f..468041a665bdea64f4ec955382f45cdf2dc2b54f 100644 (file)
@@ -39,7 +39,6 @@ Account::Account(QObject *parent)
     : QObject(parent)
     , _capabilities(QVariantMap())
     , _davPath( Theme::instance()->webDavPath() )
-    , _wasMigrated(false)
 {
     qRegisterMetaType<AccountPtr>("AccountPtr");
 }
@@ -451,16 +450,6 @@ void Account::handleInvalidCredentials()
     emit invalidCredentials();
 }
 
-bool Account::wasMigrated()
-{
-    return _wasMigrated;
-}
-
-void Account::setMigrated(bool mig)
-{
-    _wasMigrated = mig;
-}
-
 const Capabilities &Account::capabilities() const
 {
     return _capabilities;
index f12da0310f9f628eca6818ff806550ce77ba2f75..7b8917d92d92b290247a9be127bfe2851c755c96 100644 (file)
@@ -217,7 +217,6 @@ private:
     QByteArray _pemCertificate; 
     QString _pemPrivateKey;  
     QString _davPath; // defaults to value from theme, might be overwritten in brandings
-    bool _wasMigrated;
     friend class AccountManager;
 };