From 9d99e900b46bc278ebd7e01096fbfc7cb6b5222a Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 21 Jun 2022 13:55:29 +0200 Subject: [PATCH] Fix warnings Change-Id: I49dc38853df77bcc4d72c64132700c6059fbd5d7 Reviewed-by: Tim Jenssen --- .../projectstorage/projectstorage.h | 4 +- .../projectstorage/projectstorageupdater.cpp | 3 +- .../designercore/include/itemlibraryinfo.h | 8 +- .../designercore/include/metainfo.h | 6 +- .../designercore/include/nodeinstanceview.h | 78 +++++++++++-------- .../designercore/include/qmlmodelnodefacade.h | 10 ++- .../designercore/include/qmlobjectnode.h | 2 +- .../designercore/include/qmltimeline.h | 2 +- .../designercore/include/rewriterview.h | 4 +- .../unittest/asynchronousimagecache-test.cpp | 4 +- .../unit/unittest/gtest-creator-printing.cpp | 4 + .../unittest/imagecachegenerator-test.cpp | 2 +- .../unittest/projectstorageupdater-test.cpp | 2 - tests/unit/unittest/sqlitealgorithms-test.cpp | 10 --- .../unittest/synchronousimagecache-test.cpp | 8 +- 15 files changed, 79 insertions(+), 68 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h index aec546344ff..9f3045bc1f9 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h +++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.h @@ -1560,8 +1560,8 @@ private: insertSignalDeclarationStatement.write(&typeId, value.name, signature); }; - auto update = [&](const Storage::SignalDeclarationView &view, - const Storage::SignalDeclaration &value) { + auto update = [&]([[maybe_unused]] const Storage::SignalDeclarationView &view, + [[maybe_unused]] const Storage::SignalDeclaration &value) { return Sqlite::UpdateChange::No; }; diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp index e84ae6a8a29..156210acaa0 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp +++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorageupdater.cpp @@ -289,7 +289,8 @@ void ProjectStorageUpdater::updateQmldirs(const QStringList &qmlDirs, } } -void ProjectStorageUpdater::pathsWithIdsChanged(const std::vector &idPaths) {} +void ProjectStorageUpdater::pathsWithIdsChanged([[maybe_unused]] const std::vector &idPaths) +{} void ProjectStorageUpdater::parseTypeInfos(const QStringList &typeInfos, const QList &qmldirDependencies, diff --git a/tests/unit/mockup/qmldesigner/designercore/include/itemlibraryinfo.h b/tests/unit/mockup/qmldesigner/designercore/include/itemlibraryinfo.h index ad854699b4e..e465b2420ce 100644 --- a/tests/unit/mockup/qmldesigner/designercore/include/itemlibraryinfo.h +++ b/tests/unit/mockup/qmldesigner/designercore/include/itemlibraryinfo.h @@ -44,13 +44,13 @@ class ItemLibraryInfo { public: QList entries() const { return {}; } - QList entriesForType(const QByteArray &typeName, - int majorVersion, - int minorVersion) const + QList entriesForType([[maybe_unused]] const QByteArray &typeName, + [[maybe_unused]] int majorVersion, + [[maybe_unused]] int minorVersion) const { return {}; } - ItemLibraryEntry entry(const QString &name) const { return {}; } + ItemLibraryEntry entry([[maybe_unused]] const QString &name) const { return {}; } }; } // namespace QmlDesigner diff --git a/tests/unit/mockup/qmldesigner/designercore/include/metainfo.h b/tests/unit/mockup/qmldesigner/designercore/include/metainfo.h index 22e7c5762db..7dde58ca4bd 100644 --- a/tests/unit/mockup/qmldesigner/designercore/include/metainfo.h +++ b/tests/unit/mockup/qmldesigner/designercore/include/metainfo.h @@ -39,11 +39,11 @@ class ModelNode; class AbstractProperty; class ItemLibraryInfo; -inline bool operator==(const MetaInfo &first, const MetaInfo &second) +inline bool operator==([[maybe_unused]] const MetaInfo &first, [[maybe_unused]] const MetaInfo &second) { return {}; } -inline bool operator!=(const MetaInfo &first, const MetaInfo &second) +inline bool operator!=([[maybe_unused]] const MetaInfo &first, [[maybe_unused]] const MetaInfo &second) { return {}; } @@ -57,7 +57,7 @@ public: static MetaInfo global() { return {}; } static void clearGlobal() {} - static void setPluginPaths(const QStringList &paths) {} + static void setPluginPaths([[maybe_unused]] const QStringList &paths) {} }; } //namespace QmlDesigner diff --git a/tests/unit/mockup/qmldesigner/designercore/include/nodeinstanceview.h b/tests/unit/mockup/qmldesigner/designercore/include/nodeinstanceview.h index 2cdcc0ac216..525f4f9afb5 100644 --- a/tests/unit/mockup/qmldesigner/designercore/include/nodeinstanceview.h +++ b/tests/unit/mockup/qmldesigner/designercore/include/nodeinstanceview.h @@ -39,57 +39,67 @@ class NodeInstanceView : public AbstractView Q_OBJECT public: - NodeInstanceView(QObject *parent) {} + NodeInstanceView([[maybe_unused]] QObject *parent) {} ~NodeInstanceView() override {} - void modelAttached(Model *model) override {} - void modelAboutToBeDetached(Model *model) override {} - void nodeCreated(const ModelNode &createdNode) override {} - void nodeRemoved(const ModelNode &removedNode, - const NodeAbstractProperty &parentProperty, - PropertyChangeFlags propertyChange) override + void modelAttached([[maybe_unused]] Model *model) override {} + void modelAboutToBeDetached([[maybe_unused]] Model *model) override {} + void nodeCreated([[maybe_unused]] const ModelNode &createdNode) override {} + void nodeRemoved([[maybe_unused]] const ModelNode &removedNode, + [[maybe_unused]] const NodeAbstractProperty &parentProperty, + [[maybe_unused]] PropertyChangeFlags propertyChange) override {} - void propertiesAboutToBeRemoved(const QList &propertyList) override {} - void propertiesRemoved(const QList &propertyList) override {} - void variantPropertiesChanged(const QList &propertyList, - PropertyChangeFlags propertyChange) override + void propertiesAboutToBeRemoved([[maybe_unused]] const QList &propertyList) override {} - void bindingPropertiesChanged(const QList &propertyList, - PropertyChangeFlags propertyChange) override + void propertiesRemoved([[maybe_unused]] const QList &propertyList) override {} + void variantPropertiesChanged([[maybe_unused]] const QList &propertyList, + [[maybe_unused]] PropertyChangeFlags propertyChange) override {} - void signalHandlerPropertiesChanged(const QVector &propertyList, - PropertyChangeFlags propertyChange) override + void bindingPropertiesChanged([[maybe_unused]] const QList &propertyList, + [[maybe_unused]] PropertyChangeFlags propertyChange) override {} - void nodeReparented(const ModelNode &node, - const NodeAbstractProperty &newPropertyParent, - const NodeAbstractProperty &oldPropertyParent, - AbstractView::PropertyChangeFlags propertyChange) override + void signalHandlerPropertiesChanged([[maybe_unused]] const QVector &propertyList, + [[maybe_unused]] PropertyChangeFlags propertyChange) override {} - void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) override + void nodeReparented([[maybe_unused]] const ModelNode &node, + [[maybe_unused]] const NodeAbstractProperty &newPropertyParent, + [[maybe_unused]] const NodeAbstractProperty &oldPropertyParent, + [[maybe_unused]] AbstractView::PropertyChangeFlags propertyChange) override {} - void nodeOrderChanged(const NodeListProperty &listProperty) override {} - void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override {} - void nodeTypeChanged(const ModelNode &node, - const TypeName &type, - int majorVersion, - int minorVersion) override + void nodeIdChanged([[maybe_unused]] const ModelNode &node, + [[maybe_unused]] const QString &newId, + [[maybe_unused]] const QString &oldId) override {} - void customNotification(const AbstractView *view, - const QString &identifier, - const QList &nodeList, - const QList &data) override + void nodeOrderChanged([[maybe_unused]] const NodeListProperty &listProperty) override {} + void rootNodeTypeChanged([[maybe_unused]] const QString &type, + [[maybe_unused]] int majorVersion, + [[maybe_unused]] int minorVersion) override + {} + void nodeTypeChanged([[maybe_unused]] const ModelNode &node, + [[maybe_unused]] const TypeName &type, + [[maybe_unused]] int majorVersion, + [[maybe_unused]] int minorVersion) override + {} + void customNotification([[maybe_unused]] const AbstractView *view, + [[maybe_unused]] const QString &identifier, + [[maybe_unused]] const QList &nodeList, + [[maybe_unused]] const QList &data) override {} void rewriterBeginTransaction() override {} void rewriterEndTransaction() override {} - void importsChanged(const QList &addedImports, const QList &removedImports) override + void importsChanged([[maybe_unused]] const QList &addedImports, + [[maybe_unused]] const QList &removedImports) override {} - void requestModelNodePreviewImage(const ModelNode &node) {} + void requestModelNodePreviewImage([[maybe_unused]] const ModelNode &node) {} - void sendToken(const QString &token, int number, const QVector &nodeVector) {} - void setTarget(ProjectExplorer::Target *newTarget) {} + void sendToken([[maybe_unused]] const QString &token, + [[maybe_unused]] int number, + [[maybe_unused]] const QVector &nodeVector) + {} + void setTarget([[maybe_unused]] ProjectExplorer::Target *newTarget) {} void setCrashCallback(std::function) {} }; diff --git a/tests/unit/mockup/qmldesigner/designercore/include/qmlmodelnodefacade.h b/tests/unit/mockup/qmldesigner/designercore/include/qmlmodelnodefacade.h index 3821943d8fd..6cdf168d40a 100644 --- a/tests/unit/mockup/qmldesigner/designercore/include/qmlmodelnodefacade.h +++ b/tests/unit/mockup/qmldesigner/designercore/include/qmlmodelnodefacade.h @@ -40,11 +40,17 @@ public: ModelNode modelNode() { return {}; } const ModelNode modelNode() const { return {}; } bool hasModelNode() const { return {}; } - static bool isValidQmlModelNodeFacade(const ModelNode &modelNode) { return {}; } + static bool isValidQmlModelNodeFacade([[maybe_unused]] const ModelNode &modelNode) + { + return {}; + } virtual bool isValid() const { return {}; } AbstractView *view() const { return {}; } - static NodeInstanceView *nodeInstanceView(const ModelNode &modelNode) { return {}; } + static NodeInstanceView *nodeInstanceView([[maybe_unused]] const ModelNode &modelNode) + { + return {}; + } NodeInstanceView *nodeInstanceView() const { return {}; } bool isRootNode() const { return {}; } diff --git a/tests/unit/mockup/qmldesigner/designercore/include/qmlobjectnode.h b/tests/unit/mockup/qmldesigner/designercore/include/qmlobjectnode.h index 7e2c118589a..ee538b655c1 100644 --- a/tests/unit/mockup/qmldesigner/designercore/include/qmlobjectnode.h +++ b/tests/unit/mockup/qmldesigner/designercore/include/qmlobjectnode.h @@ -36,7 +36,7 @@ class QMLDESIGNERCORE_EXPORT QmlObjectNode : public QmlModelNodeFacade { public: QmlObjectNode() {} - QmlObjectNode(const ModelNode &modelNode){}; + QmlObjectNode([[maybe_unused]] const ModelNode &modelNode){}; }; } // namespace QmlDesigner diff --git a/tests/unit/mockup/qmldesigner/designercore/include/qmltimeline.h b/tests/unit/mockup/qmldesigner/designercore/include/qmltimeline.h index 0d2c05b1b56..f1fd47f0293 100644 --- a/tests/unit/mockup/qmldesigner/designercore/include/qmltimeline.h +++ b/tests/unit/mockup/qmldesigner/designercore/include/qmltimeline.h @@ -38,7 +38,7 @@ public: bool isValid() const override { return {}; } - void toogleRecording(bool b) const {} + void toogleRecording(bool) const {} void resetGroupRecording() const {} }; diff --git a/tests/unit/mockup/qmldesigner/designercore/include/rewriterview.h b/tests/unit/mockup/qmldesigner/designercore/include/rewriterview.h index c055f7d2529..697f45a9cad 100644 --- a/tests/unit/mockup/qmldesigner/designercore/include/rewriterview.h +++ b/tests/unit/mockup/qmldesigner/designercore/include/rewriterview.h @@ -108,7 +108,9 @@ public: void reactivateTextMofifierChangeSignals() {} void deactivateTextMofifierChangeSignals() {} - void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override + void auxiliaryDataChanged([[maybe_unused]] const ModelNode &node, + [[maybe_unused]] const PropertyName &name, + [[maybe_unused]] const QVariant &data) override {} Internal::ModelNodePositionStorage *positionStorage() const { return nullptr; } diff --git a/tests/unit/unittest/asynchronousimagecache-test.cpp b/tests/unit/unittest/asynchronousimagecache-test.cpp index fab158c0dca..37977e31623 100644 --- a/tests/unit/unittest/asynchronousimagecache-test.cpp +++ b/tests/unit/unittest/asynchronousimagecache-test.cpp @@ -410,7 +410,7 @@ TEST_F(AsynchronousImageCache, RequestImageWithAuxiliaryDataRequestImageFromGene mockCaptureCallback.AsStdFunction(), mockAbortCallback.AsStdFunction(), "extraId1", - FontCollectorSizesAuxiliaryData{sizes, "color"}); + FontCollectorSizesAuxiliaryData{sizes, "color", "text"}); notification.wait(); } @@ -438,7 +438,7 @@ TEST_F(AsynchronousImageCache, RequestSmallImageWithAuxiliaryDataRequestImageFro mockCaptureCallback.AsStdFunction(), mockAbortCallback.AsStdFunction(), "extraId1", - FontCollectorSizesAuxiliaryData{sizes, "color"}); + FontCollectorSizesAuxiliaryData{sizes, "color", "text"}); notification.wait(); } diff --git a/tests/unit/unittest/gtest-creator-printing.cpp b/tests/unit/unittest/gtest-creator-printing.cpp index 9493c11bc63..842063b5419 100644 --- a/tests/unit/unittest/gtest-creator-printing.cpp +++ b/tests/unit/unittest/gtest-creator-printing.cpp @@ -586,6 +586,10 @@ const char *importKindToText(ImportKind kind) return "Import"; case ImportKind::ModuleDependency: return "ModuleDependency"; + case ImportKind::ModuleExportedImport: + return "ModuleExportedImport"; + case ImportKind::ModuleExportedModuleDependency: + return "ModuleExportedModuleDependency"; } return ""; diff --git a/tests/unit/unittest/imagecachegenerator-test.cpp b/tests/unit/unittest/imagecachegenerator-test.cpp index 7bdef1b0b96..eef4389a9bb 100644 --- a/tests/unit/unittest/imagecachegenerator-test.cpp +++ b/tests/unit/unittest/imagecachegenerator-test.cpp @@ -347,7 +347,7 @@ TEST_F(ImageCacheGenerator, CallsCollectorWithAuxiliaryData) {}, imageCallbackMock.AsStdFunction(), {}, - FontCollectorSizesAuxiliaryData{sizes, "color"}); + FontCollectorSizesAuxiliaryData{sizes, "color", "text"}); notification.wait(); } diff --git a/tests/unit/unittest/projectstorageupdater-test.cpp b/tests/unit/unittest/projectstorageupdater-test.cpp index dceca42c472..8ddb489ec93 100644 --- a/tests/unit/unittest/projectstorageupdater-test.cpp +++ b/tests/unit/unittest/projectstorageupdater-test.cpp @@ -281,8 +281,6 @@ protected: TEST_F(ProjectStorageUpdater, GetContentForQmlDirPathsIfFileStatusIsDifferent) { - SourceId qmlDir1PathSourceId = sourcePathCache.sourceId("/path/one/qmldir"); - SourceId qmlDir2PathSourceId = sourcePathCache.sourceId("/path/two/qmldir"); SourceId qmlDir3PathSourceId = sourcePathCache.sourceId("/path/three/qmldir"); QStringList qmlDirs = {"/path/one/qmldir", "/path/two/qmldir", "/path/three/qmldir"}; ON_CALL(fileSystemMock, fileStatus(_)).WillByDefault([](auto sourceId) { diff --git a/tests/unit/unittest/sqlitealgorithms-test.cpp b/tests/unit/unittest/sqlitealgorithms-test.cpp index 6a494696615..1a0d15cc1af 100644 --- a/tests/unit/unittest/sqlitealgorithms-test.cpp +++ b/tests/unit/unittest/sqlitealgorithms-test.cpp @@ -46,11 +46,6 @@ public: long long value = 0; }; -std::ostream &operator<<(std::ostream &out, KeyValueView keyValueView) -{ - return out << "(" << keyValueView.key << ", " << keyValueView.value << ")"; -} - class KeyValue { public: @@ -74,11 +69,6 @@ public: long long value = 0; }; -std::ostream &operator<<(std::ostream &out, KeyValue keyValue) -{ - return out << "(" << keyValue.key << ", " << keyValue.value << ")"; -} - using KeyValues = std::vector; MATCHER_P2(IsKeyValue, diff --git a/tests/unit/unittest/synchronousimagecache-test.cpp b/tests/unit/unittest/synchronousimagecache-test.cpp index d18cad23529..f6b54616197 100644 --- a/tests/unit/unittest/synchronousimagecache-test.cpp +++ b/tests/unit/unittest/synchronousimagecache-test.cpp @@ -198,7 +198,7 @@ TEST_F(SynchronousImageCache, GetIconWithOutdatedTimeStampStored) auto icon = cache.icon("/path/to/Component.qml", "extraId1", - FontCollectorSizesAuxiliaryData{sizes, "color"}); + FontCollectorSizesAuxiliaryData{sizes, "color", "text"}); } TEST_F(SynchronousImageCache, IconCallsCollectorWithAuxiliaryData) @@ -219,7 +219,7 @@ TEST_F(SynchronousImageCache, IconCallsCollectorWithAuxiliaryData) auto icon = cache.icon("/path/to/Component.qml", "extraId1", - FontCollectorSizesAuxiliaryData{sizes, "color"}); + FontCollectorSizesAuxiliaryData{sizes, "color", "text"}); } TEST_F(SynchronousImageCache, ImageCallsCollectorWithAuxiliaryData) @@ -240,7 +240,7 @@ TEST_F(SynchronousImageCache, ImageCallsCollectorWithAuxiliaryData) auto icon = cache.image("/path/to/Component.qml", "extraId1", - FontCollectorSizesAuxiliaryData{sizes, "color"}); + FontCollectorSizesAuxiliaryData{sizes, "color", "text"}); } TEST_F(SynchronousImageCache, SmallImageCallsCollectorWithAuxiliaryData) @@ -261,7 +261,7 @@ TEST_F(SynchronousImageCache, SmallImageCallsCollectorWithAuxiliaryData) auto icon = cache.smallImage("/path/to/Component.qml", "extraId1", - FontCollectorSizesAuxiliaryData{sizes, "color"}); + FontCollectorSizesAuxiliaryData{sizes, "color", "text"}); } } // namespace