diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index fae0a0e509..227880c802 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -301,8 +301,7 @@ void Folder::bubbleUpSyncResult() SyncRunFileLog syncFileLog; - syncFileLog.start(path(), _stopWatch ); - _stopWatch.reset(); + syncFileLog.start(path(), _engine->stopWatch() ); QElapsedTimer timer; timer.start(); @@ -630,7 +629,6 @@ void Folder::slotSyncFinished() qDebug() << "-> CSync Finished slot with error " << _csyncError << "warn count" << _syncResult.warnCount(); bubbleUpSyncResult(); - _stopWatch = _engine->stopWatch(); _engine.reset(0); // _watcher->setEventsEnabledDelayed(2000); diff --git a/src/mirall/folder.h b/src/mirall/folder.h index f648182e09..1918225091 100644 --- a/src/mirall/folder.h +++ b/src/mirall/folder.h @@ -21,7 +21,6 @@ #include "mirall/progressdispatcher.h" #include "mirall/syncjournaldb.h" #include "mirall/clientproxy.h" -#include "mirall/utility.h" #include @@ -187,6 +186,7 @@ private slots: private: bool init(); + void setIgnoredFiles(); void bubbleUpSyncResult(); @@ -217,8 +217,6 @@ private: ClientProxy _clientProxy; - Utility::StopWatch _stopWatch; - CSYNC *_csync_ctx; };