Skip to content

Commit 8840e8c

Browse files
committed
Replaced qAsConst with std::as_const
Signed-off-by: Pablo Ariño Muñoz <[email protected]>
1 parent 951e54f commit 8840e8c

16 files changed

+23
-22
lines changed

src/common/ownsql.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ QString SqlDatabase::error() const
186186
void SqlDatabase::close()
187187
{
188188
if (_db) {
189-
for (auto q : qAsConst(_queries)) {
189+
for (auto q : std::as_const(_queries)) {
190190
q->finish();
191191
}
192192
SQLITE_DO(sqlite3_close(_db));

src/gui/folderman.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,8 @@ void FolderMan::slotAccountStateChanged()
853853
qCInfo(lcFolderMan) << "Account" << accountName << "disconnected or paused, "
854854
"terminating or descheduling sync folders";
855855

856-
for (Folder *f : qAsConst(_folderMap.values())) {
856+
auto folderValues = _folderMap.values();
857+
for (Folder *f : std::as_const(folderValues)) {
857858
if (f
858859
&& f->isSyncRunning()
859860
&& f->accountState() == accountState) {

src/gui/ignorelisttablewidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void IgnoreListTableWidget::slotWriteIgnoreFile(const QString & file)
100100
// We need to force a remote discovery after a change of the ignore list.
101101
// Otherwise we would not download the files/directories that are no longer
102102
// ignored (because the remote etag did not change) (issue #3172)
103-
for (Folder *folder : qAsConst(folderMan->map())) {
103+
for (Folder *folder : std::as_const(folderMan->map())) {
104104
folder->journalDb()->forceRemoteDiscoveryNextSync();
105105
folderMan->scheduleFolder(folder);
106106
}

src/gui/selectivesyncdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
218218
// list of top-level folders as soon as possible.
219219
if (_oldBlackList == QStringList("/")) {
220220
_oldBlackList.clear();
221-
for (QString path : qAsConst(list)) {
221+
for (QString path : std::as_const(list)) {
222222
path.remove(pathToRemove);
223223
if (path.isEmpty()) {
224224
continue;
@@ -249,7 +249,7 @@ void SelectiveSyncWidget::slotUpdateDirectories(QStringList list)
249249
}
250250

251251
Utility::sortFilenames(list);
252-
for (QString path : qAsConst(list)) {
252+
for (QString path : std::as_const(list)) {
253253
auto size = job ? job->_folderInfos[path].size : 0;
254254
path.remove(pathToRemove);
255255

src/gui/settingsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ void SettingsDialog::customizeStyle()
350350
QString background(palette().base().color().name());
351351
_toolBar->setStyleSheet(TOOLBAR_CSS().arg(background, dark, highlightColor, highlightTextColor));
352352

353-
for (QAction *a : qAsConst(_actionGroup->actions())) {
353+
for (const auto a : _actionGroup->actions()) {
354354
QIcon icon = Theme::createColorAwareIcon(a->property("iconPath").toString(), palette());
355355
a->setIcon(icon);
356356
auto *btn = qobject_cast<QToolButton *>(_toolBar->widgetForAction(a));

src/gui/sharemanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace OCC {
3434
*/
3535
static void updateFolder(const AccountPtr &account, QStringView path)
3636
{
37-
for (Folder *f : qAsConst(FolderMan::instance()->map())) {
37+
for (Folder *f : std::as_const(FolderMan::instance()->map())) {
3838
if (f->accountState()->account() != account)
3939
continue;
4040
auto folderPath = f->remotePath();

src/gui/sslbutton.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,15 @@ void SslButton::slotUpdateMenu()
217217
const auto systemCerts = QSslConfiguration::systemCaCertificates();
218218

219219
QList<QSslCertificate> tmpChain;
220-
for (const QSslCertificate &cert : qAsConst(chain)) {
220+
for (const auto &cert : chain) {
221221
tmpChain << cert;
222222
if (systemCerts.contains(cert))
223223
break;
224224
}
225225
chain = tmpChain;
226226

227227
// find trust anchor (informational only, verification is done by QSslSocket!)
228-
for (const QSslCertificate &rootCA : systemCerts) {
228+
for (const auto &rootCA : systemCerts) {
229229
if (rootCA.issuerInfo(QSslCertificate::CommonName) == chain.last().issuerInfo(QSslCertificate::CommonName)
230230
&& rootCA.issuerInfo(QSslCertificate::Organization) == chain.last().issuerInfo(QSslCertificate::Organization)) {
231231
chain.append(rootCA);

src/gui/tray/notificationhandler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j
9696
ActivityList list;
9797
ActivityList callList;
9898

99-
for (auto element : qAsConst(notifies)) {
99+
for (auto element : std::as_const(notifies)) {
100100
auto json = element.toObject();
101101
auto a = Activity::fromActivityJson(json, ai->account());
102102

src/libsync/capabilities.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ void Capabilities::addDirectEditor(DirectEditor* directEditor)
445445

446446
DirectEditor* Capabilities::getDirectEditorForMimetype(const QMimeType &mimeType)
447447
{
448-
for (DirectEditor* editor : qAsConst(_directEditors)) {
448+
for (DirectEditor* editor : std::as_const(_directEditors)) {
449449
if(editor->hasMimetype(mimeType))
450450
return editor;
451451
}
@@ -455,7 +455,7 @@ DirectEditor* Capabilities::getDirectEditorForMimetype(const QMimeType &mimeType
455455

456456
DirectEditor* Capabilities::getDirectEditorForOptionalMimetype(const QMimeType &mimeType)
457457
{
458-
for (DirectEditor* editor : qAsConst(_directEditors)) {
458+
for (DirectEditor* editor : std::as_const(_directEditors)) {
459459
if(editor->hasOptionalMimetype(mimeType))
460460
return editor;
461461
}

src/libsync/discovery.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2086,7 +2086,7 @@ int ProcessDirectoryJob::processSubJobs(int nbJobs)
20862086
}
20872087

20882088
int started = 0;
2089-
for (auto *rj : qAsConst(_runningJobs)) {
2089+
for (auto *rj : std::as_const(_runningJobs)) {
20902090
started += rj->processSubJobs(nbJobs - started);
20912091
if (started >= nbJobs)
20922092
return started;

0 commit comments

Comments
 (0)