From: Christian Kamm Date: Wed, 19 Oct 2016 09:03:13 +0000 (+0200) Subject: FolderMan: Clean up API X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1049 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6026148692cb2c97ff76d2f79ade95d14f5416af;p=nextcloud-desktop.git FolderMan: Clean up API Many public slots didn't need to be public or slots. --- diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index eb458079e..a1162372e 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -321,7 +321,7 @@ void AccountSettings::slotFolderWizardAccepted() // The user already accepted the selective sync dialog. everything is in the white list f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList, QStringList() << QLatin1String("/")); - folderMan->slotScheduleAllFolders(); + folderMan->scheduleAllFolders(); emit folderChanged(); } } @@ -360,7 +360,7 @@ void AccountSettings::slotRemoveCurrentFolder() return; } - folderMan->slotRemoveFolder( folderMan->folder(alias) ); + folderMan->removeFolder( folderMan->folder(alias) ); _model->removeRow(row); // single folder fix to show add-button and hide remove-button @@ -468,7 +468,7 @@ void AccountSettings::slotSyncCurrentFolderNow() QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString(); FolderMan *folderMan = FolderMan::instance(); - folderMan->slotScheduleSync(folderMan->folder(alias)); + folderMan->scheduleFolder(folderMan->folder(alias)); } void AccountSettings::slotOpenOC() diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp index aee4b3c2e..c700e4f56 100644 --- a/src/gui/folder.cpp +++ b/src/gui/folder.cpp @@ -940,7 +940,7 @@ void Folder::slotLogPropagationStart() void Folder::slotScheduleThisFolder() { - FolderMan::instance()->slotScheduleSync(this); + FolderMan::instance()->scheduleFolder(this); } void Folder::scheduleThisFolderSoon() diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index b73ce8b31..da3a24e6a 100644 --- a/src/gui/folderman.cpp +++ b/src/gui/folderman.cpp @@ -215,7 +215,7 @@ int FolderMan::setupFolders() if (FolderDefinition::load(*settings, folderAlias, &folderDefinition)) { Folder* f = addFolderInternal(std::move(folderDefinition), account.data()); if (f) { - slotScheduleSync(f); + scheduleFolder(f); emit folderSyncStateChange(f); } } @@ -248,7 +248,7 @@ int FolderMan::setupFoldersMigration() foreach ( const QString& alias, list ) { Folder *f = setupFolderFromOldConfigFile( alias, accountState ); if( f ) { - slotScheduleSync(f); + scheduleFolder(f); emit folderSyncStateChange(f); } } @@ -426,7 +426,7 @@ void FolderMan::slotFolderSyncPaused( Folder *f, bool paused ) if (!paused) { _disabledFolders.remove(f); - slotScheduleSync(f); + scheduleFolder(f); } else { _disabledFolders.insert(f); } @@ -466,11 +466,11 @@ Folder *FolderMan::folder( const QString& alias ) return 0; } -void FolderMan::slotScheduleAllFolders() +void FolderMan::scheduleAllFolders() { foreach( Folder *f, _folderMap.values() ) { if (f && f->canSync()) { - slotScheduleSync( f ); + scheduleFolder( f ); } } } @@ -490,7 +490,7 @@ void FolderMan::slotSyncOnceFileUnlocks(const QString& path) * if a folder wants to be synced, it calls this slot and is added * to the queue. The slot to actually start a sync is called afterwards. */ -void FolderMan::slotScheduleSync( Folder *f ) +void FolderMan::scheduleFolder( Folder *f ) { if( !f ) { qWarning() << "slotScheduleSync called with null folder"; @@ -572,7 +572,7 @@ void FolderMan::slotAccountStateChanged() if (f && f->canSync() && f->accountState() == accountState) { - slotScheduleSync(f); + scheduleFolder(f); } } } else { @@ -731,7 +731,7 @@ void FolderMan::slotRemoveFoldersForAccount(AccountState* accountState) } foreach (const auto &f, foldersToRemove) { - slotRemoveFolder(f); + removeFolder(f); } } @@ -783,7 +783,7 @@ void FolderMan::slotScheduleFolderByTime() << "because it has been" << msecsSinceSync << "ms " << "since the last sync"; - slotScheduleSync(f); + scheduleFolder(f); continue; } @@ -800,7 +800,7 @@ void FolderMan::slotScheduleFolderByTime() << f->syncResult().statusString() << "time since last sync:" << msecsSinceSync; - slotScheduleSync(f); + scheduleFolder(f); continue; } @@ -914,7 +914,7 @@ QStringList FolderMan::findFileInLocalFolders( const QString& relPath, const Acc return re; } -void FolderMan::slotRemoveFolder( Folder *f ) +void FolderMan::removeFolder( Folder *f ) { if( !f ) { qWarning() << "!! Can not remove null folder"; diff --git a/src/gui/folderman.h b/src/gui/folderman.h index 827f91510..3f58538fb 100644 --- a/src/gui/folderman.h +++ b/src/gui/folderman.h @@ -74,6 +74,9 @@ public: */ Folder* addFolder(AccountState* accountState, const FolderDefinition& folderDefinition); + /** Removes a folder */ + void removeFolder( Folder* ); + /** Returns the folder which the file or directory stored in path is in */ Folder* folderForPath(const QString& path); @@ -146,6 +149,24 @@ public: */ Folder* currentSyncFolder() const; + /** Removes all folders */ + int unloadAndDeleteAllFolders(); + + /** + * If enabled is set to false, no new folders will start to sync. + * The current one will finish. + */ + void setSyncEnabled( bool ); + + /** Queues a folder for syncing. */ + void scheduleFolder(Folder*); + + /** Queues all folders for syncing. */ + void scheduleAllFolders(); + + void setDirtyProxy(bool value = true); + void setDirtyNetworkLimits(); + signals: /** * signal to indicate a folder has changed its sync state. @@ -159,41 +180,12 @@ signals: */ void scheduleQueueChanged(); - void folderListChanged(const Folder::Map &); - -public slots: - void slotRemoveFolder( Folder* ); - void slotFolderSyncPaused(Folder *, bool paused); - void slotFolderCanSyncChanged(); - - void slotFolderSyncStarted(); - void slotFolderSyncFinished( const SyncResult& ); - /** - * Terminates the current folder sync. - * - * It does not switch the folder to paused state. + * Emitted whenever the list of configured folders changes. */ - void terminateSyncProcess(); - - /* delete all folder objects */ - int unloadAndDeleteAllFolders(); - - // if enabled is set to false, no new folders will start to sync. - // the current one will finish. - void setSyncEnabled( bool ); - - void slotScheduleAllFolders(); - - void setDirtyProxy(bool value = true); - void setDirtyNetworkLimits(); + void folderListChanged(const Folder::Map &); - // slot to add a folder to the syncing queue - void slotScheduleSync(Folder*); - // slot to schedule an ETag job - void slotScheduleETagJob ( const QString &alias, RequestEtagJob *job); - void slotEtagJobDestroyed (QObject*); - void slotRunOneEtagJob(); +public slots: /** * Schedules folders of newly connected accounts, terminates and @@ -214,7 +206,18 @@ public slots: */ void slotSyncOnceFileUnlocks(const QString& path); + // slot to schedule an ETag job (from Folder only) + void slotScheduleETagJob ( const QString &alias, RequestEtagJob *job); + private slots: + void slotFolderSyncPaused(Folder *, bool paused); + void slotFolderCanSyncChanged(); + void slotFolderSyncStarted(); + void slotFolderSyncFinished( const SyncResult& ); + + void slotRunOneEtagJob(); + void slotEtagJobDestroyed (QObject*); + // slot to take the next folder from queue and start syncing. void slotStartScheduledFolderSync(); void slotEtagPollTimerTimeout(); @@ -244,6 +247,13 @@ private slots: void slotScheduleFolderByTime(); private: + /** + * Terminates the current folder sync. + * + * It does not switch the folder to paused state. + */ + void terminateSyncProcess(); + /** Adds a new folder, does not add it to the account settings and * does not set an account on the new folder. */ diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp index 5b6ea1b2a..4c74d0e2f 100644 --- a/src/gui/folderstatusmodel.cpp +++ b/src/gui/folderstatusmodel.cpp @@ -785,7 +785,7 @@ void FolderStatusModel::slotApplySelectiveSync() foreach(const auto &it, changes) { folder->journalDb()->avoidReadFromDbOnNextSync(it); } - FolderMan::instance()->slotScheduleSync(folder); + FolderMan::instance()->scheduleFolder(folder); } } @@ -1099,7 +1099,7 @@ void FolderStatusModel::slotSyncAllPendingBigFolders() foreach (const auto &it, undecidedList) { folder->journalDb()->avoidReadFromDbOnNextSync(it); } - FolderMan::instance()->slotScheduleSync(folder); + FolderMan::instance()->scheduleFolder(folder); } resetFolders(); diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp index 7b5acd158..afad979a9 100644 --- a/src/gui/ignorelisteditor.cpp +++ b/src/gui/ignorelisteditor.cpp @@ -126,7 +126,7 @@ void IgnoreListEditor::slotUpdateLocalIgnoreList() // ignored (because the remote etag did not change) (issue #3172) foreach (Folder* folder, folderMan->map()) { folder->journalDb()->forceRemoteDiscoveryNextSync(); - folderMan->slotScheduleSync(folder); + folderMan->scheduleFolder(folder); } ExcludedFiles::instance().reloadExcludes(); diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index 590158259..026ddbbb2 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -460,7 +460,7 @@ void SelectiveSyncDialog::accept() _folder->journalDb()->avoidReadFromDbOnNextSync(it); } - folderMan->slotScheduleSync(_folder); + folderMan->scheduleFolder(_folder); } QDialog::accept(); }