[Pkg-owncloud-commits] [owncloud-client] 121/332: Fix compilation after merge

[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 4759429702174a6a1ccfc4ab153ab11640f93cce
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Jun 23 12:53:51 2014 +0200

    Fix compilation after merge
    
    Some initializer were added in 1.6 for variable that are gone in master
---
 src/mirall/folderwizard.cpp      | 2 --
 src/wizard/owncloudsetuppage.cpp | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp
index 1641ec1..e5792ab 100644
--- a/src/mirall/folderwizard.cpp
+++ b/src/mirall/folderwizard.cpp
@@ -224,8 +224,6 @@ void FolderWizardLocalPath::slotChooseLocalFolder()
 // =================================================================================
 FolderWizardRemotePath::FolderWizardRemotePath()
     : FormatWarningsWizardPage()
-    , _ownCloudDirCheck(0)
-    , _dirChecked(false)
     ,_warnWasVisible(false)
 
 {
diff --git a/src/wizard/owncloudsetuppage.cpp b/src/wizard/owncloudsetuppage.cpp
index a2f33dd..da1e54a 100644
--- a/src/wizard/owncloudsetuppage.cpp
+++ b/src/wizard/owncloudsetuppage.cpp
@@ -35,8 +35,6 @@ OwncloudSetupPage::OwncloudSetupPage()
     _ocUser(),
     _authTypeKnown(false),
     _checking(false),
-    _configExists(false),
-    _multipleFoldersExist(false),
     _authType(WizardCommon::HttpCreds),
     _progressIndi(new QProgressIndicator (this))
 {

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