From 7aec256087e28b9aea09ed7bd2f406e0192d904c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 18 Nov 2020 15:36:39 +0100 Subject: QmlDesigner & friends: Fix various new warnings Change-Id: Ia5e3d47e70e1881e70652f090ccc61543535df4e Reviewed-by: Thomas Hartmann --- .../qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp | 3 +++ .../components/componentcore/abstractaction.h | 2 +- .../connectioneditor/dynamicpropertiesmodel.cpp | 1 + .../qmldesigner/components/formeditor/rotationtool.cpp | 5 ----- .../components/navigator/navigatortreeview.cpp | 2 +- tests/unit/unittest/smallstring-benchmark.cpp | 18 ++++++++++-------- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp index cb9d867b0f..a54373f983 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp @@ -132,6 +132,9 @@ bool IconRenderer::eventFilter(QObject *watched, QEvent *event) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (watched == m_quickView && event->type() == QEvent::Expose) QTimer::singleShot(0, this, &IconRenderer::createIcon); +#else + Q_UNUSED(watched) + Q_UNUSED(event) #endif return false; } diff --git a/src/plugins/qmldesigner/components/componentcore/abstractaction.h b/src/plugins/qmldesigner/components/componentcore/abstractaction.h index c564aa89d5..94ceffdbb5 100644 --- a/src/plugins/qmldesigner/components/componentcore/abstractaction.h +++ b/src/plugins/qmldesigner/components/componentcore/abstractaction.h @@ -40,7 +40,7 @@ public: DefaultAction(const QString &description); // virtual function instead of slot - virtual void actionTriggered(bool enable) {} + virtual void actionTriggered(bool enable) { Q_UNUSED(enable) } void setSelectionContext(const SelectionContext &selectionContext); protected: diff --git a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp index 51f5722df2..87380a427c 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp @@ -280,6 +280,7 @@ void DynamicPropertiesModel::bindingRemoved(const BindingProperty &bindingProper void DynamicPropertiesModel::selectionChanged(const QList &selectedNodes) { + Q_UNUSED(selectedNodes) m_handleDataChanged = false; resetModel(); m_handleDataChanged = true; diff --git a/src/plugins/qmldesigner/components/formeditor/rotationtool.cpp b/src/plugins/qmldesigner/components/formeditor/rotationtool.cpp index d9102a6c8d..2773513a47 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationtool.cpp @@ -134,11 +134,6 @@ void RotationTool::keyPressEvent(QKeyEvent * event) event->setAccepted(false); return; } - - double moveStep = 1.0; - - if (event->modifiers().testFlag(Qt::ShiftModifier)) - moveStep = 10.0; } void RotationTool::keyReleaseEvent(QKeyEvent * keyEvent) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp index ddf33ad32d..1d8052c9a1 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp @@ -281,7 +281,7 @@ bool NavigatorTreeView::viewportEvent(QEvent *event) if (m_previewToolTip && m_previewToolTip->isVisible()) { auto *he = static_cast(event); QModelIndex index = indexAt(he->pos()); - if (!index.isValid() || index.internalId() != m_previewToolTipNodeId) { + if (!index.isValid() || index.internalId() != quintptr(m_previewToolTipNodeId)) { m_previewToolTip->hide(); m_previewToolTipNodeId = -1; } else { diff --git a/tests/unit/unittest/smallstring-benchmark.cpp b/tests/unit/unittest/smallstring-benchmark.cpp index 55753244bf..bbca227230 100644 --- a/tests/unit/unittest/smallstring-benchmark.cpp +++ b/tests/unit/unittest/smallstring-benchmark.cpp @@ -42,8 +42,10 @@ Utils::SmallStringView createText(int size) } void CreateSmallStringLiteral(benchmark::State& state) { - while (state.KeepRunning()) + while (state.KeepRunning()) { constexpr auto string = Utils::SmallStringLiteral("very very very long long long text"); + Q_UNUSED(string) + } } BENCHMARK(CreateSmallStringLiteral); @@ -168,7 +170,7 @@ void Size(benchmark::State& state) { while (state.KeepRunning()) benchmark::DoNotOptimize(text.size()); } -BENCHMARK(LongSize); +BENCHMARK(Size); void generateRandomString(char *data, const int length) { @@ -200,7 +202,7 @@ void Collection_CreateQByteArrays(benchmark::State& state) QVector values; values.reserve(entryCount); - for (int i = 0; i < entryCount; i++) + for (int i = 0; i < int(entryCount); i++) values.append(generateRandomQByteArray()); } } @@ -214,7 +216,7 @@ void Collection_SortQByteArrays(benchmark::State& state) QVector values; values.reserve(entryCount); - for (int i = 0; i < entryCount; i++) + for (int i = 0; i < int(entryCount); i++) values.append(generateRandomQByteArray()); state.ResumeTiming(); @@ -234,7 +236,7 @@ void Collection_FilterQByteArrays(benchmark::State& state) QVector filteredValues; filteredValues.reserve(entryCount); - for (int i = 0; i < entryCount; i++) + for (int i = 0; i < int(entryCount); i++) values.append(generateRandomQByteArray()); auto startsWithA = [] (const QByteArray &byteArray) { @@ -267,7 +269,7 @@ void Collection_CreateSmallStrings(benchmark::State& state) Utils::SmallStringVector values; values.reserve(entryCount); - for (int i = 0; i < entryCount; i++) + for (int i = 0; i < int(entryCount); i++) values.push_back(generateRandomSmallString()); } } @@ -281,7 +283,7 @@ void Collection_SortSmallStrings(benchmark::State& state) Utils::SmallStringVector values; values.reserve(entryCount); - for (int i = 0; i < entryCount; i++) + for (int i = 0; i < int(entryCount); i++) values.push_back(generateRandomSmallString()); state.ResumeTiming(); @@ -301,7 +303,7 @@ void Collection_FilterSmallStrings(benchmark::State& state) Utils::SmallStringVector filteredValues; filteredValues.reserve(entryCount); - for (int i = 0; i < entryCount; i++) + for (int i = 0; i < int(entryCount); i++) values.push_back(generateRandomSmallString()); auto startsWithA = [] (const Utils::SmallString &byteArray) { -- cgit v1.2.3