From b2d63bf79e6f0144983a87902ad1eb149c6eb527 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 1 Dec 2021 19:19:09 +0100 Subject: [PATCH] Fix various compiler warnings Change-Id: Ib64f04f154b2c44dad3248ef038449c2ac628686 Reviewed-by: Christian Stenger Reviewed-by: --- src/plugins/android/javalanguageserver.cpp | 1 - src/plugins/clangcodemodel/clangdclient.cpp | 2 +- src/plugins/clangformat/clangformatfile.cpp | 2 +- src/plugins/git/gitplugin.cpp | 2 +- src/plugins/mcusupport/mcusupportsdk.cpp | 7 ------- src/plugins/projectexplorer/ioutputparser.cpp | 2 +- src/plugins/qmldesigner/components/componentcore/theme.cpp | 2 -- src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp | 2 +- .../components/itemlibrary/itemlibraryassetimporter.cpp | 2 +- .../components/timelineeditor/timelinesectionitem.cpp | 4 ++-- .../designercore/projectstorage/projectstoragetypes.h | 2 +- 11 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/plugins/android/javalanguageserver.cpp b/src/plugins/android/javalanguageserver.cpp index 37c590d6fbf..6c81873e341 100644 --- a/src/plugins/android/javalanguageserver.cpp +++ b/src/plugins/android/javalanguageserver.cpp @@ -67,7 +67,6 @@ private: QLineEdit *m_name = nullptr; PathChooser *m_java = nullptr; PathChooser *m_ls = nullptr; - PathChooser *m_workspace = nullptr; }; JLSSettingsWidget::JLSSettingsWidget(const JLSSettings *settings, QWidget *parent) diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp index 71a657d049a..032f7b62608 100644 --- a/src/plugins/clangcodemodel/clangdclient.cpp +++ b/src/plugins/clangcodemodel/clangdclient.cpp @@ -2489,7 +2489,7 @@ static void semanticHighlighter(QFutureInterface &future, const Position endPos = startPos.withOffset(token.length, &doc); return Range(startPos, endPos); }; - const auto isOutputParameter = [&ast, &doc, &tokenRange](const ExpandedSemanticToken &token) { + const auto isOutputParameter = [&ast, &tokenRange](const ExpandedSemanticToken &token) { if (token.modifiers.contains("usedAsMutableReference")) return true; if (token.type != "variable" && token.type != "property" && token.type != "parameter") diff --git a/src/plugins/clangformat/clangformatfile.cpp b/src/plugins/clangformat/clangformatfile.cpp index 9c3b7c6717e..3c64ebe1b48 100644 --- a/src/plugins/clangformat/clangformatfile.cpp +++ b/src/plugins/clangformat/clangformatfile.cpp @@ -135,7 +135,7 @@ CppEditor::CppCodeStyleSettings ClangFormatFile::toCppCodeStyleSettings( // Modifier offset should be opposite to indent width in order indentAccessSpecifiers // to be false - settings.indentAccessSpecifiers = (style.AccessModifierOffset != -1 * style.IndentWidth); + settings.indentAccessSpecifiers = (style.AccessModifierOffset != -1 * int(style.IndentWidth)); settings.indentNamespaceBody = style.NamespaceIndentation == FormatStyle::NamespaceIndentationKind::NI_All; diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 848a721e5fc..77a948e7773 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -479,7 +479,7 @@ void GitPluginPrivate::onApplySettings() QString errorMessage; m_settings.gitExecutable(&gitFoundOk, &errorMessage); if (!gitFoundOk) { - QTimer::singleShot(0, this, [this, errorMessage] { + QTimer::singleShot(0, this, [errorMessage] { Core::AsynchronousMessageBox::warning(tr("Git Settings"), errorMessage); }); } diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 90fc1bb1467..ced725c5fe0 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -633,13 +633,6 @@ static QFileInfoList targetDescriptionFiles(const Utils::FilePath &dir) return kitsDir.entryInfoList(); } -static QString extractQulVersion(const QByteArray &data) -{ - const QJsonDocument document = QJsonDocument::fromJson(data); - const QJsonObject target = document.object(); - return target.value("qulVersion").toString(); -} - static McuTargetDescription parseDescriptionJsonCommon(const QString &qulVersion, const QJsonObject &target) { const QString compatVersion = target.value("compatVersion").toString(); diff --git a/src/plugins/projectexplorer/ioutputparser.cpp b/src/plugins/projectexplorer/ioutputparser.cpp index bbe0da41ddd..6cde209d2e7 100644 --- a/src/plugins/projectexplorer/ioutputparser.cpp +++ b/src/plugins/projectexplorer/ioutputparser.cpp @@ -121,7 +121,7 @@ void OutputTaskParser::runPostPrintActions(QPlainTextEdit *edit) { int offset = 0; if (const auto ow = qobject_cast(edit)) { - Utils::reverseForeach(taskInfo(), [this, ow, &offset](const TaskInfo &ti) { + Utils::reverseForeach(taskInfo(), [ow, &offset](const TaskInfo &ti) { ow->registerPositionOf(ti.task.taskId, ti.linkedLines, ti.skippedLines, offset); offset += ti.linkedLines; }); diff --git a/src/plugins/qmldesigner/components/componentcore/theme.cpp b/src/plugins/qmldesigner/components/componentcore/theme.cpp index df96fd61a36..b41f03e7d43 100644 --- a/src/plugins/qmldesigner/components/componentcore/theme.cpp +++ b/src/plugins/qmldesigner/components/componentcore/theme.cpp @@ -96,7 +96,6 @@ QString Theme::replaceCssColors(const QString &input) { const QRegularExpression rx("creatorTheme\\.(\\w+)"); - int pos = 0; QString output = input; QRegularExpressionMatchIterator it = rx.globalMatch(input); @@ -119,7 +118,6 @@ QString Theme::replaceCssColors(const QString &input) .arg(color.alpha()); output.replace(replaceExp, rgbaStr + "\\1"); } - pos += match.capturedLength(); } return output; diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp index 57a4877301d..06630e3a4de 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp @@ -120,7 +120,7 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view) : view->setSeeker(seeker); seeker->setToolTip(QLatin1String("Seek particle system time when paused.")); - QObject::connect(seeker, &SeekerSlider::positionChanged, [this, seeker](){ + QObject::connect(seeker, &SeekerSlider::positionChanged, [seeker](){ QmlDesignerPlugin::instance()->viewManager().nodeInstanceView() ->view3DAction(View3DSeekActionCommand(seeker->position())); }); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index 90ed6b03821..c65d5256c8d 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -661,7 +661,7 @@ void ItemLibraryAssetImporter::finalizeQuick3DImport() QTimer *timer = new QTimer(parent()); static int counter; counter = 0; - timer->callOnTimeout([this, timer, progressTitle, model, doc]() { + timer->callOnTimeout([this, timer, progressTitle, model]() { if (!isCancelled()) { notifyProgress(++counter * 5, progressTitle); if (counter < 10) { diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp index 31316f9aea9..73ffa021ecd 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp @@ -806,8 +806,8 @@ void TimelineRulerSectionItem::setPlaybackLoopEnabled(bool value) void TimelineRulerSectionItem::setPlaybackLoopTimes(float startFrame, float endFrame) { if (m_playbackLoopEnabled) { - startFrame = startFrame; - endFrame = endFrame; + m_start = startFrame; + m_end = endFrame; m_playbackLoopStart = startFrame > m_duration ? m_duration : startFrame < 0.0 ? 0.0 : startFrame; m_playbackLoopEnd = endFrame > m_duration ? m_duration : endFrame < 0.0 ? 0.0 : endFrame; emit playbackLoopValuesChanged(); diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h index 366da00407a..a31999d5bf0 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h +++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstoragetypes.h @@ -555,7 +555,7 @@ public: {} explicit PropertyDeclaration(Utils::SmallStringView name, - TypeId propetyTypeId, + TypeId propertyTypeId, PropertyDeclarationTraits traits, Utils::SmallStringView aliasPropertyName) : name{name}