diff --git a/src/blackgui/components/copyconfigurationcomponent.cpp b/src/blackgui/components/copyconfigurationcomponent.cpp index 8a72ffc27..4f28db5c3 100644 --- a/src/blackgui/components/copyconfigurationcomponent.cpp +++ b/src/blackgui/components/copyconfigurationcomponent.cpp @@ -420,7 +420,7 @@ namespace BlackGui { ui->cb_OtherVersions->clear(); const QMap otherVersions = CApplicationInfoList::currentApplicationDataDirectoryMapWithoutCurrentVersion(); - for (const auto &pair : makePairsRange(otherVersions)) + for (const auto pair : makePairsRange(otherVersions)) { const CApplicationInfo &info(pair.second); if (info.isNull()) diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp index d5d91077b..53cf45f19 100644 --- a/src/blackgui/components/dbmappingcomponent.cpp +++ b/src/blackgui/components/dbmappingcomponent.cpp @@ -694,8 +694,8 @@ namespace BlackGui QPoint globalPos = this->mapToGlobal(point); QScopedPointer contextMenu(new QMenu(this)); - contextMenu->addAction("Max.data area", this, &CDbMappingComponent::resizeForSelect, QKeySequence(Qt::CTRL + Qt::Key_M, Qt::Key_D)); - contextMenu->addAction("Max.mapping area", this, &CDbMappingComponent::resizeForMapping, QKeySequence(Qt::CTRL + Qt::Key_M, Qt::Key_M)); + contextMenu->addAction("Max.data area", this, &CDbMappingComponent::resizeForSelect, QKeySequence(static_cast(Qt::CTRL) + Qt::Key_M, Qt::Key_D)); + contextMenu->addAction("Max.mapping area", this, &CDbMappingComponent::resizeForMapping, QKeySequence(static_cast(Qt::CTRL) + Qt::Key_M, Qt::Key_M)); QAction *selectedItem = contextMenu.data()->exec(globalPos); Q_UNUSED(selectedItem) } diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index e6bff02e5..a57e35610 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -75,56 +75,56 @@ namespace BlackGui { QAction *a = new QAction(this); a->setObjectName("overview"); - a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_O)); + a->setShortcut(QKeySequence(static_cast(Qt::ALT) + Qt::Key_S, Qt::Key_O)); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); this->addAction(a); ui->lbl_Hint->setText("Hint: See tooltips for shortcuts, \"ALT+S, O\" for overview."); a = new QAction(this); a->setObjectName("audio"); - a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_A)); + a->setShortcut(QKeySequence(static_cast(Qt::ALT) + Qt::Key_S, Qt::Key_A)); ui->pb_Audio->setToolTip(a->shortcut().toString()); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); this->addAction(a); a = new QAction(this); a->setObjectName("data"); - a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_D)); + a->setShortcut(QKeySequence(static_cast(Qt::ALT) + Qt::Key_S, Qt::Key_D)); ui->pb_DataLoadAndCaches->setToolTip(a->shortcut().toString()); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); this->addAction(a); a = new QAction(this); a->setObjectName("gui"); - a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_G)); + a->setShortcut(QKeySequence(static_cast(Qt::ALT) + Qt::Key_S, Qt::Key_G)); ui->pb_Gui->setToolTip(a->shortcut().toString()); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); this->addAction(a); a = new QAction(this); a->setObjectName("hotkeys"); - a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_H)); + a->setShortcut(QKeySequence(static_cast(Qt::ALT) + Qt::Key_S, Qt::Key_H)); ui->pb_Hotkeys->setToolTip(a->shortcut().toString()); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); this->addAction(a); a = new QAction(this); a->setObjectName("network"); - a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_N)); + a->setShortcut(QKeySequence(static_cast(Qt::ALT) + Qt::Key_S, Qt::Key_N)); ui->pb_Network->setToolTip(a->shortcut().toString()); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); this->addAction(a); a = new QAction(this); a->setObjectName("simulator"); - a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_S)); + a->setShortcut(QKeySequence(static_cast(Qt::ALT) + Qt::Key_S, Qt::Key_S)); ui->pb_Simulator->setToolTip(a->shortcut().toString()); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); this->addAction(a); a = new QAction(this); a->setObjectName("matching"); - a->setShortcut(QKeySequence(Qt::ALT + Qt::Key_S, Qt::Key_M)); + a->setShortcut(QKeySequence(static_cast(Qt::ALT) + Qt::Key_S, Qt::Key_M)); ui->pb_Matching->setToolTip(a->shortcut().toString()); connect(a, &QAction::triggered, this, &CSettingsComponent::onActionTriggered); this->addAction(a); diff --git a/src/blackgui/dropsite.cpp b/src/blackgui/dropsite.cpp index 437ee2067..457ca0cf1 100644 --- a/src/blackgui/dropsite.cpp +++ b/src/blackgui/dropsite.cpp @@ -26,7 +26,7 @@ namespace BlackGui { CDropSite::CDropSite(QWidget *parent) : QLabel(parent) { - this->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + this->setFrameStyle(static_cast(QFrame::Sunken) | QFrame::StyledPanel); this->setAlignment(Qt::AlignCenter); this->setAcceptDrops(true); this->setTextFormat(Qt::RichText); diff --git a/src/blackgui/shortcut.cpp b/src/blackgui/shortcut.cpp index 132b28821..a1a39fc96 100644 --- a/src/blackgui/shortcut.cpp +++ b/src/blackgui/shortcut.cpp @@ -17,50 +17,50 @@ namespace BlackGui { const QKeySequence &CShortcut::keyStash() { - static const QKeySequence k(Qt::ALT + Qt::Key_S); + static const QKeySequence k(static_cast(Qt::ALT) + Qt::Key_S); return k; } const QKeySequence &CShortcut::keyAddToModelSet() { - static const QKeySequence k(Qt::ALT + Qt::Key_A); + static const QKeySequence k(static_cast(Qt::ALT) + Qt::Key_A); return k; } const QKeySequence &CShortcut::keyClearSelection() { - static const QKeySequence k(Qt::CTRL + Qt::Key_Space); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_Space); return k; } const QKeySequence &CShortcut::keySelectAll() { - static const QKeySequence k(Qt::CTRL + Qt::Key_A); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_A); return k; } const QKeySequence &BlackGui::CShortcut::keyDisplayFilter() { - static const QKeySequence k(Qt::CTRL + Qt::Key_F); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_F); return k; } const QKeySequence &CShortcut::keyResizeView() { - static const QKeySequence k(Qt::CTRL + Qt::Key_R); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_R); return k; } const QKeySequence &CShortcut::keySave() { - static const QKeySequence k(Qt::CTRL + Qt::Key_S); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_S); return k; } const QKeySequence &CShortcut::keySaveViews() { // remark CTRL+S not working in views - static const QKeySequence k(Qt::SHIFT + Qt::Key_S); + static const QKeySequence k(static_cast(Qt::SHIFT) + Qt::Key_S); return k; } @@ -78,25 +78,25 @@ namespace BlackGui const QKeySequence &CShortcut::keyCopy() { - static const QKeySequence k(Qt::CTRL + Qt::Key_C); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_C); return k; } const QKeySequence &CShortcut::keyFontPlus() { - static const QKeySequence k(Qt::CTRL + Qt::Key_Plus); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_Plus); return k; } const QKeySequence &CShortcut::keyFontMinus() { - static const QKeySequence k(Qt::CTRL + Qt::Key_Minus); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_Minus); return k; } const QKeySequence &CShortcut::keyFontReset() { - static const QKeySequence k(Qt::CTRL + Qt::Key_0); + static const QKeySequence k(static_cast(Qt::CTRL) + Qt::Key_0); return k; } diff --git a/src/blackmisc/db/updateinfo.cpp b/src/blackmisc/db/updateinfo.cpp index 359d211ce..24cb3426e 100644 --- a/src/blackmisc/db/updateinfo.cpp +++ b/src/blackmisc/db/updateinfo.cpp @@ -166,7 +166,7 @@ namespace BlackMisc CUpdateInfo result; result.m_distributions = { alphaDistribution, betaDistribution }; - for (const QJsonValue &release : QJsonDocument::fromJson(jsonData).array()) + for (const QJsonValue release : QJsonDocument::fromJson(jsonData).array()) { QString version = release[QLatin1String("tag_name")].toString(); if (version.isEmpty() || version[0] != 'v') { continue; } @@ -176,7 +176,7 @@ namespace BlackMisc bool existing = !release[QLatin1String("draft")].toBool(); bool alpha = release[QLatin1String("prerelease")].toBool(); - for (const QJsonValue &asset : release[QLatin1String("assets")].toArray()) + for (const QJsonValue asset : release[QLatin1String("assets")].toArray()) { QString name = asset[QLatin1String("name")].toString(); QString filename = QStringLiteral("v%1/%2").arg(version, name); diff --git a/src/blackmisc/sharedstate/dbus/dupleximpl.cpp b/src/blackmisc/sharedstate/dbus/dupleximpl.cpp index 13658073d..ca9b94873 100644 --- a/src/blackmisc/sharedstate/dbus/dupleximpl.cpp +++ b/src/blackmisc/sharedstate/dbus/dupleximpl.cpp @@ -64,7 +64,7 @@ namespace BlackMisc { if (client != this) { channels.unite(client->m_subscriptions.keys().toSet()); } } - for (const auto channel : channels) + for (const auto &channel : channels) { requestPeerSubscriptions(channel); } diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp index 734291a0d..e5429b840 100644 --- a/src/blackmisc/stringutils.cpp +++ b/src/blackmisc/stringutils.cpp @@ -222,7 +222,7 @@ namespace BlackMisc { QString result; // QChar c (NOT QChar &c), see https://discordapp.com/channels/539048679160676382/539925070550794240/686321311076581440 - for (const QChar c : s) + for (const QChar &c : s) { if (c.decompositionTag() == QChar::NoDecomposition) { @@ -230,7 +230,7 @@ namespace BlackMisc } else { - for (const QChar dc : c.decomposition()) + for (const QChar &dc : c.decomposition()) { if (!dc.isMark()) { result.push_back(dc); } } diff --git a/src/blackmisc/timestampbased.h b/src/blackmisc/timestampbased.h index 6870840a4..bc61b59bd 100644 --- a/src/blackmisc/timestampbased.h +++ b/src/blackmisc/timestampbased.h @@ -173,7 +173,7 @@ namespace BlackMisc //! Properties by index enum ColumnIndex { - IndexOffsetMs = CPropertyIndexRef::GlobalIndexITimestampBased + ITimestampBased::IndexMSecsSinceEpoch + 1, + IndexOffsetMs = static_cast(CPropertyIndexRef::GlobalIndexITimestampBased) + ITimestampBased::IndexMSecsSinceEpoch + 1, IndexAdjustedMsWithOffset, IndexOffsetWithUnit // keep this as last item }; diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index 3a9c7d24f..d93c486b4 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -90,7 +90,7 @@ CSwiftLauncher::CSwiftLauncher(QWidget *parent) : connect(ui->pb_FSXConfigDirs, &QPushButton::released, this, &CSwiftLauncher::showSimulatorConfigDirs, Qt::QueuedConnection); connect(ui->pb_P3DConfigDirs, &QPushButton::released, this, &CSwiftLauncher::showSimulatorConfigDirs, Qt::QueuedConnection); - const QShortcut *logPageShortCut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_L), this, SLOT(showLogPage())); + const QShortcut *logPageShortCut = new QShortcut(QKeySequence(static_cast(Qt::CTRL) + Qt::Key_L), this, SLOT(showLogPage())); Q_UNUSED(logPageShortCut) // periodically check diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index 332ee71f5..c86d9581f 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -846,7 +846,7 @@ namespace XSwiftBus void CTraffic::doPlaneUpdates() { m_updates.clear(); - for (const auto pair : m_planesById) + for (const auto &pair : m_planesById) { Plane *plane = pair.second; interpolatePosition(plane); @@ -909,7 +909,7 @@ namespace XSwiftBus XPLMCameraPosition_t camPos {}; XPLMReadCameraPosition(&camPos); - for (const auto pair : m_traffic->m_planesById) + for (const auto &pair : m_traffic->m_planesById) { char *text = const_cast(pair.second->label); const XPMPPlanePosition_t &planePos = pair.second->positions[3];