diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2013-08-05 22:14:22 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2013-08-05 22:14:22 +0400 |
| commit | c9ddb12b5a04a9f7246f0f8fca08f14589915d7f (patch) | |
| tree | caa136588db8ffa12baf390e7b7b3a9eb692341a /src | |
| parent | 0932ee60516f3e8ce7d964de4cee79b96c4e344b (diff) | |
Build after merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/mirall/application.h | 1 | ||||
| -rw-r--r-- | src/mirall/folder.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mirall/application.h b/src/mirall/application.h index 65557a58e..ec8e96606 100644 --- a/src/mirall/application.h +++ b/src/mirall/application.h @@ -105,7 +105,6 @@ protected slots: void slotProgressSyncProblem(const QString& folder, const Progress::SyncProblem &problem); void slotDisplayIdle(); void slotHelp(); - void slotShowRecentChanges(); void slotCredentialsFetched(); private: void setHelp(); diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index 6eb3312ae..ee8532520 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -21,6 +21,7 @@ #include "mirall/syncresult.h" #include "mirall/logger.h" #include "mirall/owncloudinfo.h" +#include "mirall/utility.h" #include "creds/abstractcredentials.h" #include <QDebug> @@ -44,7 +45,6 @@ void csyncLogCatcher(CSYNC */*ctx*/, Folder::Folder(const QString &alias, const QString &path, const QString& secondPath, QObject *parent) : QObject(parent) - , _pollTimer(new QTimer(this)) , _path(path) , _secondPath(secondPath) , _alias(alias) |