From 8b54b8488017bbca7cf317ca0eaf4a68da7166d4 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 20 Oct 2024 23:07:31 -0400 Subject: [PATCH] refactor: use const for ranged loops --- src/gui/src/ActionDialog.cpp | 3 ++- src/gui/src/ServerConfigDialog.cpp | 2 +- src/lib/gui/core/CoreProcess.cpp | 5 +++-- src/lib/gui/proxy/QSettingsProxy.cpp | 5 +++-- src/lib/gui/tls/TlsCertificate.cpp | 2 +- src/lib/gui/tls/TlsFingerprint.cpp | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp index 132b79590..fa4e90ea9 100644 --- a/src/gui/src/ActionDialog.cpp +++ b/src/gui/src/ActionDialog.cpp @@ -92,7 +92,8 @@ void ActionDialog::accept() m_Action.typeScreenNames().clear(); - for (const QListWidgetItem *pItem : ui->m_pListScreens->selectedItems()) + const auto &selection = ui->m_pListScreens->selectedItems(); + for (const QListWidgetItem *pItem : selection) m_Action.typeScreenNames().append(pItem->text()); m_Action.setSwitchScreenName(ui->m_pComboSwitchToScreen->currentText()); diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp index 6a643f2f8..33f8228a2 100644 --- a/src/gui/src/ServerConfigDialog.cpp +++ b/src/gui/src/ServerConfigDialog.cpp @@ -77,7 +77,7 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent, ServerConfig &config, Ap ui->m_pSpinBoxClipboardSizeLimit->setValue(clipboardSharingSizeM); ui->m_pSpinBoxClipboardSizeLimit->setEnabled(serverConfig().clipboardSharing()); - for (const Hotkey &hotkey : serverConfig().hotkeys()) + for (const Hotkey &hotkey : std::as_const(serverConfig().hotkeys())) ui->m_pListHotkeys->addItem(hotkey.text()); ui->m_pScreenSetupView->setModel(&m_ScreenSetupModel); diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index de75286bb..afdd3e5d4 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -97,7 +97,7 @@ QString makeQuotedArgs(const QString &app, const QStringList &args) command << args; QStringList quoted; - for (const auto &arg : command) { + for (const auto &arg : std::as_const(command)) { if (arg.contains(' ')) { quoted << QString("\"%1\"").arg(arg); } else { @@ -350,7 +350,8 @@ void CoreProcess::stopService() void CoreProcess::handleLogLines(const QString &text) { - for (const auto &line : text.split(kLineSplitRegex)) { + const auto lines = text.split(kLineSplitRegex); + for (const auto &line : lines) { if (line.isEmpty()) { continue; } diff --git a/src/lib/gui/proxy/QSettingsProxy.cpp b/src/lib/gui/proxy/QSettingsProxy.cpp index 3f79b3568..3bc62b849 100644 --- a/src/lib/gui/proxy/QSettingsProxy.cpp +++ b/src/lib/gui/proxy/QSettingsProxy.cpp @@ -73,7 +73,8 @@ void migrateLegacySystemSettings(QSettings &settings) ); if (QFile(oldSystemSettings.fileName()).exists()) { - for (const auto &key : oldSystemSettings.allKeys()) { + const auto keys = oldSystemSettings.allKeys(); + for (const auto &key : keys) { settings.setValue(key, oldSystemSettings.value(key)); } } @@ -112,7 +113,7 @@ void migrateLegacyUserSettings(QSettings &newSettings) ); QStringList keys = oldSettings.allKeys(); - for (const QString &key : keys) { + for (const QString &key : std::as_const(keys)) { QVariant oldValue = oldSettings.value(key); newSettings.setValue(key, oldValue); logVerbose(QString("migrating setting '%1' = '%2'").arg(key, oldValue.toString())); diff --git a/src/lib/gui/tls/TlsCertificate.cpp b/src/lib/gui/tls/TlsCertificate.cpp index 00373b2e7..dd2306e05 100644 --- a/src/lib/gui/tls/TlsCertificate.cpp +++ b/src/lib/gui/tls/TlsCertificate.cpp @@ -116,7 +116,7 @@ bool TlsCertificate::runTool(const QStringList &args) QProcess process; process.setEnvironment(environment); - for (const auto &envVar : environment) { + for (const auto &envVar : std::as_const(environment)) { qDebug("set env var: %s", qUtf8Printable(envVar)); } diff --git a/src/lib/gui/tls/TlsFingerprint.cpp b/src/lib/gui/tls/TlsFingerprint.cpp index 16fd44cf2..5a9d1109c 100644 --- a/src/lib/gui/tls/TlsFingerprint.cpp +++ b/src/lib/gui/tls/TlsFingerprint.cpp @@ -64,8 +64,8 @@ bool TlsFingerprint::fileExists() const bool TlsFingerprint::isTrusted(const QString &fingerprintText) const { - QStringList list = readList(); - for (QString trusted : list) { + const QStringList list = readList(); + for (const auto &trusted : list) { if (trusted == fingerprintText) { return true; }