[Pkg-owncloud-commits] [owncloud-client] 45/219: Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7

[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 7ce2a93c63e4e01b5777bc1f854ebfb1047afb98
Merge: 4d33773 e17243b
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Aug 29 20:23:07 2014 +0200

    Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7
    
    Conflicts:
    	src/CMakeLists.txt
    	src/mirall/folderman.cpp
    	src/mirall/folderman.h
    	src/mirall/owncloudtheme.h

 src/CMakeLists.txt             |  1 +
 src/mirall/account.cpp         | 64 ++++++++++++++++++++++++++++--
 src/mirall/account.h           |  8 ++++
 src/mirall/accountmigrator.cpp | 89 ++++++++++++++++++++++++++++++++++++++++++
 src/mirall/accountmigrator.h   | 38 ++++++++++++++++++
 src/mirall/folderman.cpp       | 12 ++++++
 src/mirall/owncloudtheme.cpp   | 10 +++++
 src/mirall/owncloudtheme.h     |  2 +
 8 files changed, 221 insertions(+), 3 deletions(-)

diff --cc src/CMakeLists.txt
index 6526377,e07325d..6727e17
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -268,8 -295,6 +268,9 @@@ set(mirall_SRC
      mirall/owncloudgui.cpp
      mirall/socketapi.cpp
      mirall/sslbutton.cpp
 +    mirall/syncrunfilelog.cpp
 +    mirall/selectivesyncdialog.cpp
++    mirall/accountmigrator.cpp
  )
  
  
diff --cc src/mirall/folderman.cpp
index b8973d5,7aa08f4..2cea122
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@@ -17,7 -19,7 +19,8 @@@
  #include "mirall/folder.h"
  #include "mirall/syncresult.h"
  #include "mirall/theme.h"
 +#include "mirall/socketapi.h"
+ #include "mirall/accountmigrator.h"
  
  #include <neon/ne_socket.h>
  
diff --cc src/mirall/owncloudtheme.h
index 1d8e599,af1c042..9ab83a9
--- a/src/mirall/owncloudtheme.h
+++ b/src/mirall/owncloudtheme.h
@@@ -30,15 -30,19 +30,17 @@@ public
      QPixmap splashScreen() const;
  
      QIcon   folderIcon( const QString& ) const;
 -    QIcon   trayFolderIcon( const QString& ) const;
 -    QIcon   folderDisabledIcon() const;
 -    QIcon   applicationIcon() const;
 -    QString appName() const;
 -    QString appNameGUI() const;
 +    QIcon   trayFolderIcon( const QString& ) const Q_DECL_OVERRIDE;
 +    QIcon   applicationIcon() const Q_DECL_OVERRIDE;
++    QString appName() const Q_DECL_OVERRIDE;
++    QString appNameGUI() const Q_DECL_OVERRIDE;
  
 +    QVariant customMedia(CustomMediaType type) Q_DECL_OVERRIDE;
 +    QString helpUrl() const Q_DECL_OVERRIDE;
  
 -    QVariant customMedia(CustomMediaType type);
 -    QString helpUrl() const;
 -
 -    QColor  wizardHeaderBackgroundColor() const;
 -    QColor  wizardHeaderTitleColor() const;
 -    QPixmap wizardHeaderLogo() const;
 +    QColor  wizardHeaderBackgroundColor() const Q_DECL_OVERRIDE;
 +    QColor  wizardHeaderTitleColor() const Q_DECL_OVERRIDE;
 +    QPixmap wizardHeaderLogo() const Q_DECL_OVERRIDE;
  private:
  
  

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