[Pkg-owncloud-commits] [owncloud-client] 67/115: Fix compilation error

[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 c291eb3db41426b12ac808e7b1c95c706828a987
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Aug 18 15:45:58 2014 +0200

    Fix compilation error
---
 src/mirall/folderwizard.cpp        | 4 ++--
 src/mirall/selectivesyncdialog.cpp | 2 --
 src/mirall/selectivesyncdialog.h   | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp
index e619cd7..434c860 100644
--- a/src/mirall/folderwizard.cpp
+++ b/src/mirall/folderwizard.cpp
@@ -446,7 +446,7 @@ void FolderWizardSelectiveSync::initializePage()
     if (targetPath.startsWith('/')) {
         targetPath = targetPath.mid(1);
     }
-    _treeView->setFolderInfo(targetPath, alias, {});
+    _treeView->setFolderInfo(targetPath, alias);
     QWizardPage::initializePage();
 }
 
@@ -460,7 +460,7 @@ void FolderWizardSelectiveSync::cleanupPage()
 {
     QString alias        = wizard()->field(QLatin1String("alias")).toString();
     QString targetPath   = wizard()->property("targetPath").toString();
-    _treeView->setFolderInfo(targetPath, alias, {});
+    _treeView->setFolderInfo(targetPath, alias);
     QWizardPage::cleanupPage();
 }
 
diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp
index 0012a91..8e0cf20 100644
--- a/src/mirall/selectivesyncdialog.cpp
+++ b/src/mirall/selectivesyncdialog.cpp
@@ -280,5 +280,3 @@ void SelectiveSyncDialog::accept()
 
 }
 
-
-
diff --git a/src/mirall/selectivesyncdialog.h b/src/mirall/selectivesyncdialog.h
index 44cab64..0506c18 100644
--- a/src/mirall/selectivesyncdialog.h
+++ b/src/mirall/selectivesyncdialog.h
@@ -29,7 +29,7 @@ public:
     QStringList createBlackList(QTreeWidgetItem* root = 0) const;
     void refreshFolders();
     void setFolderInfo(const QString &folderPath, const QString &rootName,
-                       const QStringList &oldBlackList) {
+                       const QStringList &oldBlackList = QStringList()) {
         _folderPath = folderPath;
         _rootName = rootName;
         _oldBlackList = oldBlackList;
@@ -61,5 +61,4 @@ private:
     Folder *_folder;
 };
 
-
-}
\ No newline at end of file
+}

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