[Pkg-owncloud-commits] [owncloud-client] 11/70: FolderWizard: Get folder map from FolderMan rather than store locally.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit c72c72a106e4ecff390de275c892d67596a7e9bb
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Jun 12 23:17:13 2014 +0200

    FolderWizard: Get folder map from FolderMan rather than store locally.
    
    If the Folder::Map object is kept locally in the wizard, changes to
    the map are not reflected there, as they happen when signing out.
    This fixes bug #1875
---
 src/mirall/accountsettings.cpp |  2 --
 src/mirall/folderwizard.cpp    | 11 ++---------
 src/mirall/folderwizard.h      |  5 +----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp
index c3793b0..5200d02 100644
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@ -172,8 +172,6 @@ void AccountSettings::slotAddFolder()
     folderMan->setSyncEnabled(false); // do not start more syncs.
 
     FolderWizard *folderWizard = new FolderWizard(this);
-    Folder::Map folderMap = folderMan->map();
-    folderWizard->setFolderMap( folderMap );
 
     connect(folderWizard, SIGNAL(accepted()), SLOT(slotFolderWizardAccepted()));
     connect(folderWizard, SIGNAL(rejected()), SLOT(slotFolderWizardRejected()));
diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp
index ec617aa..d11100d 100644
--- a/src/mirall/folderwizard.cpp
+++ b/src/mirall/folderwizard.cpp
@@ -104,7 +104,7 @@ bool FolderWizardLocalPath::isComplete() const
   }
 
   // check if the local directory isn't used yet in another ownCloud sync
-  Folder::Map map = _folderMap;
+  Folder::Map map = FolderMan::instance()->map();
 
   if( isOk ) {
     Folder::Map::const_iterator i = map.constBegin();
@@ -374,7 +374,7 @@ bool FolderWizardRemotePath::isComplete() const
     }
     wizard()->setProperty("targetPath", dir);
 
-    Folder::Map map = _folderMap;
+    Folder::Map map = FolderMan::instance()->map();
     Folder::Map::const_iterator i = map.constBegin();
     for(i = map.constBegin();i != map.constEnd(); i++ ) {
         Folder *f = static_cast<Folder*>(i.value());
@@ -448,13 +448,6 @@ FolderWizard::~FolderWizard()
 {
 }
 
-void FolderWizard::setFolderMap( const Folder::Map& fm)
-{
-    _folderWizardSourcePage->setFolderMap( fm );
-    if (!Theme::instance()->singleSyncFolder()) {
-       _folderWizardTargetPage->setFolderMap( fm );
-    }
-}
 
 } // end namespace
 
diff --git a/src/mirall/folderwizard.h b/src/mirall/folderwizard.h
index 52789e0..658524f 100644
--- a/src/mirall/folderwizard.h
+++ b/src/mirall/folderwizard.h
@@ -73,8 +73,6 @@ public:
     virtual void initializePage();
     virtual void cleanupPage();
 
-    void setFolderMap( const Folder::Map &fm ) { _folderMap = fm; }
-
 protected slots:
 
     void showWarn( const QString& = QString() ) const;
@@ -91,7 +89,7 @@ private:
     ownCloudInfo *_ownCloudDirCheck;
     bool _dirChecked;
     bool _warnWasVisible;
-    Folder::Map _folderMap;
+
 };
 
 /**
@@ -109,7 +107,6 @@ public:
 
     FolderWizard(QWidget *parent = 0);
     ~FolderWizard();
-    void setFolderMap( const Folder::Map &map );
 
 private:
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git