From 49569574de6625478d1141f27e9f3046a64b40d2 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 23 Sep 2021 17:49:52 +0200 Subject: [PATCH] Fix some warnings about unused variables and functions Change-Id: I5f0acd9598bc7f3a79963cc4e1b255e2b6fb2e5d Reviewed-by: Christian Stenger --- src/libs/tracing/runscenegraphtest.cpp | 4 +++ src/plugins/android/androiddevice.cpp | 4 +-- src/plugins/android/androidmanager.cpp | 1 - .../androidpackageinstallationstep.cpp | 2 +- src/plugins/android/androidpotentialkit.cpp | 2 -- .../android/androidqmlpreviewworker.cpp | 1 - src/plugins/android/androidrunner.cpp | 1 - .../qmakeprojectmanager/makefileparse.cpp | 30 +++++++++---------- .../timelineeditor/timelinewidget.cpp | 2 +- src/shared/help/indexwindow.cpp | 3 ++ 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/libs/tracing/runscenegraphtest.cpp b/src/libs/tracing/runscenegraphtest.cpp index 826bb403561..5b405535130 100644 --- a/src/libs/tracing/runscenegraphtest.cpp +++ b/src/libs/tracing/runscenegraphtest.cpp @@ -37,6 +37,7 @@ namespace Timeline { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) static void renderMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message) { @@ -45,6 +46,7 @@ static void renderMessageHandler(QtMsgType type, const QMessageLogContext &conte else QTest::qWarn(message.toLatin1().constData(), context.file, context.line); } +#endif // < Qt 6 void runSceneGraphTest(QSGNode *node) { @@ -78,6 +80,8 @@ void runSceneGraphTest(QSGNode *node) // Unfortunately we cannot check the results of the rendering. But at least we know the shaders // have not crashed here. +#else + Q_UNUSED(node) #endif // < Qt 6 context.doneCurrent(); diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 9ad156370cf..9a276ce6f71 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -426,7 +426,7 @@ void AndroidDeviceManager::devicesListUpdated() } // Set devices no longer connected to disconnected state. - for (const IDevice::ConstPtr dev : existingDevs) { + for (const IDevice::ConstPtr &dev : existingDevs) { if (dev->id() != Constants::ANDROID_DEVICE_ID && !connectedDevs.contains(dev) && dev->deviceState() != IDevice::DeviceDisconnected) { qCDebug(androidDeviceLog, "Device id \"%s\" is no longer connected.", @@ -443,7 +443,7 @@ AndroidDeviceManager *AndroidDeviceManager::instance() } AndroidDeviceManager::AndroidDeviceManager(QObject *parent) - : m_androidConfig(AndroidConfigurations::currentConfig()) + : QObject(parent), m_androidConfig(AndroidConfigurations::currentConfig()) { connect(qApp, &QCoreApplication::aboutToQuit, this, [this]() { m_devicesUpdaterTimer.stop(); diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 7d181c405b6..7d2a568303f 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -552,7 +552,6 @@ void AndroidManager::installQASIPackage(Target *target, const FilePath &packageP const QStringList appAbis = AndroidManager::applicationAbis(target); if (appAbis.isEmpty()) return; - const int deviceAPILevel = AndroidManager::minimumSDK(target); const IDevice::ConstPtr device = DeviceKitAspect::device(target->kit()); AndroidDeviceInfo info = AndroidDevice::androidDeviceInfoFromIDevice(device.data()); if (!info.isValid()) // aborted diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index 9212443b7ea..cc951859ea9 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -136,7 +136,7 @@ FilePath AndroidPackageInstallationStep::androidBuildDirectory() const FilePath AndroidPackageInstallationStep::buildDirectory() const { if (const BuildSystem *bs = buildSystem()) - return buildSystem()->buildTarget(target()->activeBuildKey()).workingDirectory; + return bs->buildTarget(target()->activeBuildKey()).workingDirectory; return {}; } diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp index b2d5bbe7cbf..128c853c844 100644 --- a/src/plugins/android/androidpotentialkit.cpp +++ b/src/plugins/android/androidpotentialkit.cpp @@ -68,7 +68,6 @@ bool AndroidPotentialKit::isEnabled() const { QList kits = ProjectExplorer::KitManager::kits(); foreach (ProjectExplorer::Kit *kit, kits) { - Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit); if (kit->isAutoDetected() && !kit->isSdkProvided()) { return false; } @@ -118,7 +117,6 @@ void AndroidPotentialKitWidget::recheck() { QList kits = ProjectExplorer::KitManager::kits(); foreach (ProjectExplorer::Kit *kit, kits) { - Utils::Id deviceId = ProjectExplorer::DeviceKitAspect::deviceId(kit); if (kit->isAutoDetected() && !kit->isSdkProvided()) { setVisible(false); return; diff --git a/src/plugins/android/androidqmlpreviewworker.cpp b/src/plugins/android/androidqmlpreviewworker.cpp index 9325d16f064..645cabbb48a 100644 --- a/src/plugins/android/androidqmlpreviewworker.cpp +++ b/src/plugins/android/androidqmlpreviewworker.cpp @@ -262,7 +262,6 @@ bool AndroidQmlPreviewWorker::ensureAvdIsRunning() if (!avdMan.isAvdBooted(devSN)) { m_devInfo = {}; - int minTargetApi = AndroidManager::minimumSDK(m_rc->target()->kit()); using namespace ProjectExplorer; const IDevice *dev = DeviceKitAspect::device(m_rc->target()->kit()).data(); AndroidDeviceInfo devInfoLocal = AndroidDevice::androidDeviceInfoFromIDevice(dev); diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index c0266e1d712..b8be01ae808 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -184,7 +184,6 @@ void AndroidRunner::launchAVD() if (!m_target || !m_target->project()) return; - int deviceAPILevel = AndroidManager::minimumSDK(m_target); QStringList androidAbis = AndroidManager::applicationAbis(m_target); // Get AVD info diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index bb525904718..ca274324641 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -396,7 +396,6 @@ void QmakeProjectManagerPlugin::testMakefileParser_data() QTest::addColumn("command"); QTest::addColumn("project"); QTest::addColumn("unparsedArguments"); - QTest::addColumn("archConfig"); QTest::addColumn("osType"); QTest::addColumn("linkQmlDebuggingQQ2"); QTest::addColumn("useQtQuickCompiler"); @@ -407,85 +406,85 @@ void QmakeProjectManagerPlugin::testMakefileParser_data() << QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.7 extra1") << QString::fromLatin1("SOMETHING=ELSE -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.7 extra2") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.7 extra3") << QString::fromLatin1("-spec linux-g++ CONFIG+=debug SOMETHING=ELSE CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.7 extra4") << QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug SOMETHING=ELSE -o Makefile ../untitled7/untitled7.pro") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.7 extra5") << QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile SOMETHING=ELSE ../untitled7/untitled7.pro") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.7 extra6") << QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro SOMETHING=ELSE") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.8") << QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.8 extra1") << QString::fromLatin1("SOMETHING=ELSE -o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.8 extra2") << QString::fromLatin1("-o Makefile SOMETHING=ELSE ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.8 extra3") << QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro SOMETHING=ELSE -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.8 extra4") << QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ SOMETHING=ELSE CONFIG+=debug CONFIG+=qml_debug") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.8 extra5") << QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug SOMETHING=ELSE CONFIG+=qml_debug") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; QTest::newRow("Qt 5.8 extra6") << QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug SOMETHING=ELSE") << QString::fromLatin1("../untitled7/untitled7.pro") << QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE") - << static_cast(QMakeStepConfig::NoArch) << static_cast(QMakeStepConfig::NoOsType) + << static_cast(QMakeStepConfig::NoOsType) << true << false << false << 2; } @@ -494,7 +493,6 @@ void QmakeProjectManagerPlugin::testMakefileParser() QFETCH(QString, command); QFETCH(QString, project); QFETCH(QString, unparsedArguments); - QFETCH(int, archConfig); QFETCH(int, osType); QFETCH(bool, linkQmlDebuggingQQ2); QFETCH(bool, useQtQuickCompiler); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp index 0df28ee597d..149d1fd7e97 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp @@ -292,6 +292,7 @@ TimelineWidget::TimelineWidget(TimelineView *view) connect(graphicsScene()->layoutRuler(), &TimelineRulerSectionItem::playbackLoopValuesChanged, updatePlaybackLoopValues); auto setPlaybackState = [this](QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { + Q_UNUSED(oldState) m_toolbar->setPlayState(newState == QAbstractAnimation::State::Running); }; connect(m_playbackAnimation, &QVariantAnimation::stateChanged, setPlaybackState); @@ -431,7 +432,6 @@ void TimelineWidget::updatePlaybackValues() if (m_playbackAnimation->state() == QAbstractAnimation::Running) m_playbackAnimation->stop(); } - qreal a = m_playbackAnimation->duration(); qreal newCurrentTime = (currentTimeline.currentKeyframe() - startFrame) * (1.0 / m_playbackSpeed); if (qRound(m_playbackAnimation->startValue().toDouble()) != qRound(startFrame) || qRound(m_playbackAnimation->endValue().toDouble()) != qRound(endFrame)) { diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp index dd6a9ed1ac1..374b615f008 100644 --- a/src/shared/help/indexwindow.cpp +++ b/src/shared/help/indexwindow.cpp @@ -247,6 +247,9 @@ int IndexFilterModel::columnCount(const QModelIndex &parent) const QVariant IndexFilterModel::headerData(int section, Qt::Orientation orientation, int role) const { // we don't show header + Q_UNUSED(section) + Q_UNUSED(orientation) + Q_UNUSED(role) return {}; }