From 0e9a08cbbf055ab1d77df6fbc75f4be2cd179cfe Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Tue, 15 Jul 2014 13:34:32 +0200 Subject: [PATCH] SocketAPI: rename slot to send UPDATE_VIEW. --- .../UserInterfaceState.xcuserstate | Bin 33432 -> 33056 bytes src/mirall/folderman.cpp | 4 +++- src/mirall/socketapi.cpp | 8 ++++---- src/mirall/socketapi.h | 4 +++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/UserInterfaceState.xcuserstate b/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/UserInterfaceState.xcuserstate index a86c41f93e3e3244070c2b1963d4c37f2590746f..0d18ea8e3cf8df0685cd72a402ad87c615618c0b 100644 GIT binary patch delta 11610 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 db_f$L$;AO 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̎Kgi0im6p37-kd#R(B^pVs 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 Q06zRO<3Id%{cYp@e=6iJjsO4v diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp index ed34475bfe..ee8aced72e 100644 --- a/src/mirall/folderman.cpp +++ b/src/mirall/folderman.cpp @@ -49,11 +49,12 @@ FolderMan::FolderMan(QObject *parent) : this, SLOT(slotScheduleSync(const QString&))); MirallConfigFile cfg; - _socketApi = new SocketApi(this, QUrl::fromLocalFile(cfg.configPathWithAppName().append(QLatin1String("socket")))); ne_sock_init(); Q_ASSERT(!_instance); _instance = this; + + _socketApi = new SocketApi(this, QUrl::fromLocalFile(cfg.configPathWithAppName().append(QLatin1String("socket")))); } FolderMan *FolderMan::instance() @@ -429,6 +430,7 @@ void FolderMan::slotScheduleSync( const QString& alias ) f->prepareToSync(); } else { qDebug() << "Folder is not enabled, not scheduled!"; + _socketApi->slotUpdateFolderView(f->alias()); return; } } diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp index baac10778f..a4f6965b6d 100644 --- a/src/mirall/socketapi.cpp +++ b/src/mirall/socketapi.cpp @@ -155,7 +155,6 @@ SyncFileStatus fileStatus(Folder *folder, const QString& fileName ) } - SocketApi::SocketApi(QObject* parent, const QUrl& localFile) : QObject(parent) , _localServer(0) @@ -166,8 +165,9 @@ SocketApi::SocketApi(QObject* parent, const QUrl& localFile) connect(_localServer, SIGNAL(newConnection()), this, SLOT(slotNewConnection())); // folder watcher - connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(QString)), SLOT(slotSyncStateChanged(QString))); - connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem)), SLOT(slotJobCompleted(QString,SyncFileItem))); + connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(QString)), this, SLOT(slotUpdateFolderView(QString))); + connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem)), + SLOT(slotJobCompleted(QString,SyncFileItem))); } SocketApi::~SocketApi() @@ -222,7 +222,7 @@ void SocketApi::slotReadSocket() } } -void SocketApi::slotSyncStateChanged(const QString& alias) +void SocketApi::slotUpdateFolderView(const QString& alias) { QString msg = QLatin1String("UPDATE_VIEW"); diff --git a/src/mirall/socketapi.h b/src/mirall/socketapi.h index 6bf28bbf0d..9bf2c013b6 100644 --- a/src/mirall/socketapi.h +++ b/src/mirall/socketapi.h @@ -36,11 +36,13 @@ public: SocketApi(QObject* parent, const QUrl& localFile); virtual ~SocketApi(); +public slots: + void slotUpdateFolderView(const QString&); + private slots: void slotNewConnection(); void onLostConnection(); void slotReadSocket(); - void slotSyncStateChanged(const QString&); void slotJobCompleted(const QString &, const SyncFileItem &); private: