From 6b588d72277ad87fcf240a6de63c5bb1c5d87ab3 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 18 Nov 2020 14:30:03 +0100 Subject: [PATCH] Remove unused variables Mark some of them with Q_UNUSED, since it looks like sometimes the copy is done on purpose, to force detach or used for some hack with memory management. In one case make unused variable used again. Change-Id: I3825cd3399fa63bf6e12173c64509287d4a125e5 Reviewed-by: hjk Reviewed-by: Tim Jenssen --- src/plugins/android/androidmanifesteditorwidget.cpp | 2 -- src/plugins/android/avddialog.cpp | 1 - src/plugins/autotest/testrunner.cpp | 1 - src/plugins/boot2qt/qdbmakedefaultappservice.cpp | 1 + src/plugins/clangtools/clangtoolruncontrol.cpp | 1 - src/plugins/cmakeprojectmanager/fileapidataextractor.cpp | 1 - src/plugins/projectexplorer/gcctoolchain.cpp | 1 - src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp | 1 - src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp | 1 - src/plugins/projectexplorer/targetsettingspanel.cpp | 1 - src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp | 2 +- .../assetexporterplugin/parsers/assetnodeparser.cpp | 1 - .../components/connectioneditor/connectionmodel.cpp | 1 - .../components/connectioneditor/connectionviewwidget.cpp | 1 - .../components/itemlibrary/itemlibraryassetimporter.cpp | 2 -- .../qmldesigner/components/richtexteditor/richtexteditor.cpp | 2 +- src/plugins/qmlpreview/qmldebugtranslationwidget.cpp | 2 -- src/plugins/qmlpreview/qmlpreviewruncontrol.cpp | 3 --- src/plugins/valgrind/memchecktool.cpp | 1 + src/shared/proparser/qmakebuiltins.cpp | 1 + 20 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index 4bdbb9ab97f..7ba2e513a6e 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -854,8 +854,6 @@ void AndroidManifestEditorWidget::syncToWidgets(const QDomDocument &doc) setApiLevel(m_androidTargetSdkVersion, usesSdkElement, QLatin1String("android:targetSdkVersion")); } - QString baseDir = m_textEditorWidget->textDocument()->filePath().toFileInfo().absolutePath(); - QDomElement applicationElement = manifest.firstChildElement(QLatin1String("application")); m_appNameLineEdit->setText(applicationElement.attribute(QLatin1String("android:label"))); diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index 3f8e687d449..42498b64675 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -146,7 +146,6 @@ void AvdDialog::parseDeviceDefinitionsList() if (line.startsWith("---------") || line.isEmpty()) { DeviceDefinitionStruct deviceDefinition; for (const QString &line : avdDeviceInfo) { - QString value; if (line.contains("id:")) { deviceDefinition.name_id = line.split("or").at(1); deviceDefinition.name_id = deviceDefinition.name_id.remove(0, 1).remove('"'); diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 37fc75f464f..8259ef9f0fb 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -568,7 +568,6 @@ void TestRunner::debugTests() return; } - QString errorMessage; auto runControl = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE); runControl->setRunConfiguration(config->runConfiguration()); diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp index 9512ac8f7d1..20192d6aad6 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp +++ b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp @@ -74,6 +74,7 @@ void QdbMakeDefaultAppService::handleProcessFinished(const QString &error) return; } + // FIXME: Check that ignoring is fine QByteArray processOutput = d->processRunner->readAllStandardOutput(); if (d->makeDefault) diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index fda0b596ee2..23fce8492b2 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -381,7 +381,6 @@ void ClangToolRunWorker::onRunnerFinishedWithFailure(const QString &errorMessage auto *toolRunner = qobject_cast(sender()); const QString fileToAnalyze = toolRunner->fileToAnalyze(); - const QString outputFilePath = toolRunner->outputFilePath(); m_filesAnalyzed.remove(fileToAnalyze); m_filesNotAnalyzed.insert(fileToAnalyze); diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 08937953f12..852b6565142 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -466,7 +466,6 @@ void addCompileGroups(ProjectNode *targetRoot, QSet &knownHeaderNodes) { const bool inSourceBuild = (sourceDirectory == buildDirectory); - const QDir currentSourceDir(sourceDirectory.toString()); std::vector> toList; QSet alreadyListed; diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 5acf42828d9..b104863c7ef 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -1058,7 +1058,6 @@ QList GccToolChainFactory::autoDetect(const QList &alr if (HostOsInfo::isMacHost()) return {}; QList tcs; - QList known = alreadyKnown; static const auto tcChecker = [](const ToolChain *tc) { return tc->targetAbi().osFlavor() != Abi::WindowsMSysFlavor && tc->compilerCommand().fileName() != "c89-gcc" diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp index 9cfb13feac7..0985dd80715 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp @@ -636,7 +636,6 @@ void LineEditField::setupCompletion(FancyLineEdit *lineEdit) const auto handleResults = [this, lineEdit, watcher](int firstIndex, int endIndex) { QSet namespaces; QStringList classes; - QString projectBaseDir; Project * const project = ProjectTree::currentProject(); for (int i = firstIndex; i < endIndex; ++i) { static const auto isReservedName = [](const QString &name) { diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp index bf878346805..b1d690b8a41 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.cpp @@ -542,7 +542,6 @@ JsonWizardJsExtension::JsonWizardJsExtension(JsonWizard *wizard) QVariant JsonWizardJsExtension::value(const QString &name) const { - const QVariant value = m_wizard->value(name); return m_wizard->expander()->expandVariant(m_wizard->value(name)); } diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp index f34ada1628f..dbd999ecf7b 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.cpp +++ b/src/plugins/projectexplorer/targetsettingspanel.cpp @@ -396,7 +396,6 @@ public: { Kit *kit = KitManager::kit(m_kitId); QTC_ASSERT(kit, return); - const QString kitName = kit->displayName(); const QString projectName = m_project->displayName(); QAction *enableAction = menu->addAction(tr("Enable Kit for Project \"%1\"").arg(projectName)); diff --git a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp index c0cfeacb972..718a11f7d99 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp @@ -45,7 +45,7 @@ void findQmlFiles(QFutureInterface &f, const Project *project) return; int index = 0; - Utils::FilePaths qmlFiles = project->files([&f, &index](const Node* node) ->bool { + project->files([&f, &index](const Node* node) ->bool { if (f.isCanceled()) return false; Utils::FilePath path = node->filePath(); diff --git a/src/plugins/qmldesigner/assetexporterplugin/parsers/assetnodeparser.cpp b/src/plugins/qmldesigner/assetexporterplugin/parsers/assetnodeparser.cpp index adc46678aed..85b8f11c1ef 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/parsers/assetnodeparser.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/parsers/assetnodeparser.cpp @@ -54,7 +54,6 @@ QJsonObject AssetNodeParser::json(Component &component) const { QJsonObject jsonObject = ItemNodeParser::json(component); - QPixmap asset = objectNode().toQmlItemNode().instanceRenderPixmap(); Utils::FilePath assetPath = component.exporter().exportAsset(objectNode(), uuid()); QJsonObject assetData; assetData.insert(AssetPathTag, assetPath.toString()); diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp index 8ea93278299..643f7462210 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp @@ -523,7 +523,6 @@ QStringList ConnectionModel::getPossibleSignalsForConnection(const ModelNode &co const BindingProperty bp = connection.bindingProperty("target"); if (bp.isValid()) { - const QString bindExpression = bp.expression(); QStringList expression = bp.expression().split("."); if (expression.size() > 1) { const QString itemId = expression.constFirst(); diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp index e94b1605707..769b33e31de 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionviewwidget.cpp @@ -535,7 +535,6 @@ void ConnectionViewWidget::editorForDynamic() VariantProperty property = abProp.toVariantProperty(); PropertyName name = property.name(); TypeName type = property.dynamicTypeName(); - QVariant value = newValue; BindingProperty newProperty = propertiesModel ->replaceVariantWithBinding(name); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index e244db93814..8489c0d63a2 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -238,7 +238,6 @@ void ItemLibraryAssetImporter::parseFiles(const QStringList &filePaths, if (isCancelled()) return; if (isQuick3DAsset(file)) { - QVariantMap varOpts; int index = extToImportOptionsMap.value(QFileInfo(file).suffix()); parseQuick3DAsset(file, options[index].toVariantMap()); } @@ -383,7 +382,6 @@ void ItemLibraryAssetImporter::parseQuick3DAsset(const QString &file, const QVar out << "canBeDroppedInView3D: true" << Qt::endl; file.close(); } - QString outIconSource = QString::fromUtf8(content); if (generateComponentIcon(24, iconFileName, qmlIt.filePath())) { // Since icon is generated by external process, the file won't be // ready for asset gathering below, so assume its generation succeeds diff --git a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp index 50fe089859a..a8e693876e0 100644 --- a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp +++ b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp @@ -658,7 +658,7 @@ void RichTextEditor::setupTableActions() m_actionSplitRow->setCheckable(false); const QIcon splitColumnIcon(getIcon(Theme::Icon::splitColumns)); - m_actionSplitColumn = ui->tableBar->addAction(splitRowIcon, tr("Split Column"), [this]() { + m_actionSplitColumn = ui->tableBar->addAction(splitColumnIcon, tr("Split Column"), [this]() { QTextCursor cursor = ui->textEdit->textCursor(); if (QTextTable *currentTable = cursor.currentTable()) { cursorEditBlock(cursor, [&] () { diff --git a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp index 47bc6ec4b83..7a25c6f75fe 100644 --- a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp +++ b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp @@ -413,8 +413,6 @@ QString QmlDebugTranslationWidget::currentDir() const void QmlDebugTranslationWidget::setCurrentDir(const QString &path) { m_lastDir = path; - const QString currentDir = m_lastDir.isEmpty() ? - ProjectExplorer::ProjectTree::currentFilePath().parentDir().toString() : m_lastDir; } void QmlDebugTranslationWidget::loadLogFile() diff --git a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp index a1b667b78b2..f04f7525277 100644 --- a/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp +++ b/src/plugins/qmlpreview/qmlpreviewruncontrol.cpp @@ -142,9 +142,6 @@ LocalQmlPreviewSupport::LocalQmlPreviewSupport(ProjectExplorer::RunControl *runC const QString mainScriptFromProject = qmlBuildSystem->targetFile( Utils::FilePath::fromString(mainScript)).toString(); - const QString currentFileFromProject = qmlBuildSystem->targetFile( - Utils::FilePath::fromString(currentFile)).toString(); - if (!currentFile.isEmpty() && qmlProjectRunConfigurationArguments.last().contains(mainScriptFromProject)) { qmlProjectRunConfigurationArguments.removeLast(); auto commandLine = Utils::CommandLine(runnable.commandLine().executable(), qmlProjectRunConfigurationArguments); diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index b6b518e311f..3dd39d6188c 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -824,6 +824,7 @@ void MemcheckToolPrivate::heobAction() if (!commandLineArguments.isEmpty()) arguments += ' ' + commandLineArguments; QByteArray argumentsCopy(reinterpret_cast(arguments.utf16()), arguments.size() * 2 + 2); + Q_UNUSED(argumentsCopy) // process environment QByteArray env; diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index 9288d9e8876..724bd9624b1 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -1143,6 +1143,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand( for (const ProString &val : vals) { QString rstr = val.toQString(m_tmp1); QString copy = rstr; // Force a detach on modify + Q_UNUSED(copy) rstr.replace(before, after); ret << (rstr.isSharedWith(m_tmp1) ? val