diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-08-26 13:29:42 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-08-26 13:29:42 +0400 |
| commit | 902bb7a198c2fcefaf2ac741efadfc10d891fac7 (patch) | |
| tree | 956fd1ebb6717878dfa1140084aab06b98fa8b1f /src/gui/settingsdialog.h | |
| parent | 4fc044d368b2fe54f153ff33d761428a6b8f595d (diff) | |
| parent | 03dc27a3271fff5bc8be06e1bd714fbf528a2d69 (diff) | |
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
Diffstat (limited to 'src/gui/settingsdialog.h')
| -rw-r--r-- | src/gui/settingsdialog.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/settingsdialog.h b/src/gui/settingsdialog.h index 8c8765aa9..fd35e5140 100644 --- a/src/gui/settingsdialog.h +++ b/src/gui/settingsdialog.h @@ -45,13 +45,15 @@ public: void setGeneralErrors( const QStringList& errors ); public slots: - void slotSyncStateChange(const QString& alias = QString()); void showActivityPage(); + void slotUpdateAccountIcon(const QIcon& icon); protected: void reject() Q_DECL_OVERRIDE; void accept() Q_DECL_OVERRIDE; +private slots: + private: Ui::SettingsDialog *_ui; AccountSettings *_accountSettings; |