mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-18 03:41:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Clazy: Fix some warnigns

Browse source
This commit is contained in:
Hannah von Reth 2020-07-23 12:40:58 +02:00 committed by Kevin Ottens
parent d109d49b49
commit bd62615aab
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/accountsettings.cpp
View file

@ -684,7 +684,7 @@ void AccountSettings::slotEnableVfsCurrentFolder()
// Wipe selective sync blacklist
bool ok = false;
auto oldBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
const auto oldBlacklist = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, {});
// Change the folder vfs mode and load the plugin
@ -1171,7 +1171,6 @@ void AccountSettings::refreshSelectiveSyncStatus()
bool ok = false;
const auto undecidedList = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, &ok);
QString p;
for (const auto &it : undecidedList) {
// FIXME: add the folder alias in a hoover hint.
// folder->alias() + QLatin1String("/")

2
src/gui/folderman.cpp
View file

@ -90,7 +90,7 @@ FolderMan::~FolderMan()
_instance = nullptr;
}
OCC::Folder::Map FolderMan::map()
const OCC::Folder::Map &FolderMan::map() const
{
return _folderMap;
}

2
src/gui/folderman.h
View file

@ -74,7 +74,7 @@ public:
*/
static void backwardMigrationSettingsKeys(QStringList *deleteKeys, QStringList *ignoreKeys);
OCC::Folder::Map map();
const Folder::Map &map() const;
/** Adds a folder for an account, ensures the journal is gone and saves it in the settings.
*/

10
src/gui/folderstatusmodel.cpp
View file

@ -828,12 +828,12 @@ void FolderStatusModel::slotUpdateFolderState(Folder *folder)
void FolderStatusModel::slotApplySelectiveSync()
{
for (int i = 0; i < _folders.count(); ++i) {
if (!_folders[i]._fetched) {
_folders[i]._folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, QStringList());
for (const auto &folderInfo : qAsConst(_folders)) {
if (!folderInfo._fetched) {
folderInfo._folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncUndecidedList, QStringList());
continue;
}
auto folder = _folders.at(i)._folder;
const auto folder = folderInfo._folder;
bool ok = false;
auto oldBlackList = folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, &ok);
@ -841,7 +841,7 @@ void FolderStatusModel::slotApplySelectiveSync()
qCWarning(lcFolderStatus) << "Could not read selective sync list from db.";
continue;
}
QStringList blackList = createBlackList(_folders.at(i), oldBlackList);
QStringList blackList = createBlackList(folderInfo, oldBlackList);
folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, blackList);
auto blackListSet = blackList.toSet();

2
test/stubremotewipe.cpp
View file

@ -21,7 +21,7 @@ QString OCC::FolderMan::unescapeAlias(QString const&){ return QString(); }
QString OCC::FolderMan::escapeAlias(QString const&){ return QString(); }
void OCC::FolderMan::scheduleFolder(OCC::Folder*){ }
OCC::SocketApi *OCC::FolderMan::socketApi(){ return new SocketApi; }
OCC::Folder::Map OCC::FolderMan::map() { return OCC::Folder::Map(); }
const OCC::Folder::Map &OCC::FolderMan::map() const { return OCC::Folder::Map(); }
void OCC::FolderMan::setSyncEnabled(bool) { }
void OCC::FolderMan::slotSyncOnceFileUnlocks(QString const&) { }
void OCC::FolderMan::slotScheduleETagJob(QString const&, OCC::RequestEtagJob*){ }