From e938d3ddc10afd778f74c0e29eb114a29de31b77 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 18 Jun 2025 00:02:29 +0200 Subject: [PATCH] QmlDesigner: Remove tracing category function pointer Change-Id: I340ea2e0e413471b8d1f2f9c3c4c1bb9b42966da Reviewed-by: Thomas Hartmann --- .../formeditor/abstractcustomtool.cpp | 2 +- .../formeditor/abstractformeditortool.cpp | 2 +- .../components/formeditor/anchorindicator.cpp | 2 +- .../anchorindicatorgraphicsitem.cpp | 2 +- .../formeditor/backgroundaction.cpp | 2 +- .../formeditor/bindingindicator.cpp | 2 +- .../bindingindicatorgraphicsitem.cpp | 2 +- .../components/formeditor/controlelement.cpp | 2 +- .../components/formeditor/dragtool.cpp | 2 +- .../formeditor/formeditorannotationicon.cpp | 2 +- .../formeditor/formeditorgraphicsview.cpp | 2 +- .../components/formeditor/formeditoritem.cpp | 2 +- .../components/formeditor/formeditorscene.cpp | 2 +- .../formeditor/formeditortoolbutton.cpp | 2 +- .../components/formeditor/formeditorview.cpp | 2 +- .../formeditor/formeditorwidget.cpp | 2 +- .../components/formeditor/layeritem.cpp | 2 +- .../components/formeditor/lineeditaction.cpp | 2 +- .../components/formeditor/movemanipulator.cpp | 2 +- .../components/formeditor/movetool.cpp | 2 +- .../formeditor/onedimensionalcluster.cpp | 2 +- .../formeditor/resizecontroller.cpp | 2 +- .../formeditor/resizehandleitem.cpp | 2 +- .../components/formeditor/resizeindicator.cpp | 2 +- .../formeditor/resizemanipulator.cpp | 2 +- .../components/formeditor/resizetool.cpp | 2 +- .../formeditor/rotationcontroller.cpp | 2 +- .../formeditor/rotationhandleitem.cpp | 2 +- .../formeditor/rotationindicator.cpp | 2 +- .../formeditor/rotationmanipulator.cpp | 2 +- .../components/formeditor/rotationtool.cpp | 2 +- .../rubberbandselectionmanipulator.cpp | 2 +- .../components/formeditor/scaleitem.cpp | 2 +- .../formeditor/scalemanipulator.cpp | 2 +- .../components/formeditor/seekerslider.cpp | 2 +- .../formeditor/selectionindicator.cpp | 2 +- .../formeditor/selectionrectangle.cpp | 2 +- .../components/formeditor/selectiontool.cpp | 2 +- .../formeditor/singleselectionmanipulator.cpp | 2 +- .../components/formeditor/snapper.cpp | 2 +- .../formeditor/snappinglinecreator.cpp | 2 +- .../components/formeditor/toolbox.cpp | 2 +- .../components/formeditor/view3dtool.cpp | 2 +- .../itemlibrary/itemlibraryaddimportmodel.cpp | 2 +- .../itemlibrarycategoriesmodel.cpp | 2 +- .../itemlibrary/itemlibrarycategory.cpp | 2 +- .../itemlibraryiconimageprovider.cpp | 2 +- .../itemlibrary/itemlibraryimageprovider.cpp | 2 +- .../itemlibrary/itemlibraryimport.cpp | 2 +- .../itemlibrary/itemlibraryitem.cpp | 2 +- .../itemlibrary/itemlibraryitemsmodel.cpp | 2 +- .../itemlibrary/itemlibrarymodel.cpp | 2 +- .../itemlibrary/itemlibraryview.cpp | 2 +- .../itemlibrary/itemlibrarywidget.cpp | 2 +- .../choosefrompropertylistdialog.cpp | 2 +- .../navigator/iconcheckboxitemdelegate.cpp | 2 +- .../components/navigator/nameitemdelegate.cpp | 2 +- .../navigator/navigatorsearchwidget.cpp | 2 +- .../navigator/navigatortreemodel.cpp | 2 +- .../navigator/navigatortreeview.cpp | 2 +- .../components/navigator/navigatorview.cpp | 2 +- .../components/navigator/navigatorwidget.cpp | 2 +- .../components/navigator/previewtooltip.cpp | 2 +- .../propertyeditor/aligndistribute.cpp | 2 +- .../propertyeditor/colorpalettebackend.cpp | 2 +- .../propertyeditor/compatibleproperties.cpp | 2 +- .../propertyeditor/designerpropertymap.cpp | 2 +- .../dynamicpropertiesproxymodel.cpp | 2 +- .../propertyeditor/fileresourcesmodel.cpp | 2 +- .../propertyeditor/fontresourcesmodel.cpp | 2 +- .../propertyeditor/gradientmodel.cpp | 2 +- .../gradientpresetcustomlistmodel.cpp | 2 +- .../gradientpresetdefaultlistmodel.cpp | 2 +- .../propertyeditor/gradientpresetitem.cpp | 2 +- .../gradientpresetlistmodel.cpp | 2 +- .../propertyeditor/instanceimageprovider.cpp | 2 +- .../propertyeditor/itemfiltermodel.cpp | 2 +- .../propertyeditor/listvalidator.cpp | 2 +- .../propertyeditorcontextobject.cpp | 2 +- ...pertyeditordynamicpropertiesproxymodel.cpp | 2 +- .../propertyeditorqmlbackend.cpp | 2 +- .../propertyeditortransaction.cpp | 2 +- .../propertyeditor/propertyeditorutils.cpp | 2 +- .../propertyeditor/propertyeditorvalue.cpp | 2 +- .../propertyeditor/propertyeditorview.cpp | 2 +- .../propertyeditor/propertyeditorwidget.cpp | 2 +- .../propertyeditor/propertynamevalidator.cpp | 2 +- .../propertyeditor/qmlanchorbindingproxy.cpp | 2 +- .../propertyeditor/qmlmaterialnodeproxy.cpp | 2 +- .../propertyeditor/qmlmodelnodeproxy.cpp | 2 +- .../propertyeditor/qmltexturenodeproxy.cpp | 2 +- .../quick2propertyeditorview.cpp | 2 +- .../components/propertyeditor/tooltip.cpp | 2 +- .../designercore/metainfo/nodemetainfo.cpp | 2 +- .../libs/designercore/model/modelnode.cpp | 2 +- .../projectstorageexceptions.cpp | 35 ++++++------ .../projectstorage/projectstorageupdater.cpp | 54 +++++++++++-------- .../projectstorage/qmldocumentparser.cpp | 6 +-- .../projectstorage/qmltypesparser.cpp | 12 ++--- .../qmldesigner/qmltools/anchorline.cpp | 2 +- .../qmldesigner/qmltools/qml3dnode.cpp | 2 +- .../qmldesigner/qmltools/qmlanchors.cpp | 2 +- .../qmldesigner/qmltools/qmlchangeset.cpp | 2 +- .../qmldesigner/qmltools/qmlconnections.cpp | 2 +- .../qmldesigner/qmltools/qmlitemnode.cpp | 2 +- .../qmltools/qmlmodelnodefacade.cpp | 2 +- .../qmldesigner/qmltools/qmlobjectnode.cpp | 2 +- src/plugins/qmldesigner/qmltools/qmlstate.cpp | 2 +- .../qmldesigner/qmltools/qmltimeline.cpp | 2 +- .../qmltools/qmltimelinekeyframegroup.cpp | 2 +- .../qmldesigner/qmltools/qmlvisualnode.cpp | 2 +- 111 files changed, 165 insertions(+), 156 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp index b0b97130d01..d910c25d495 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp @@ -7,7 +7,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; AbstractCustomTool::AbstractCustomTool() : AbstractFormEditorTool(nullptr) diff --git a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp index c4c900072cb..cb5120b829c 100644 --- a/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/abstractformeditortool.cpp @@ -19,7 +19,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; AbstractFormEditorTool::AbstractFormEditorTool(FormEditorView *editorView) : m_view(editorView) { diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicator.cpp b/src/plugins/qmldesigner/components/formeditor/anchorindicator.cpp index 744f75ef6bf..0511dbd4648 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/anchorindicator.cpp @@ -12,7 +12,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; AnchorIndicator::AnchorIndicator(LayerItem *layerItem) : m_layerItem(layerItem) diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp index 42d094549ce..363a4eac50d 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp @@ -13,7 +13,7 @@ const int AngleDegree = 16; namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; AnchorIndicatorGraphicsItem::AnchorIndicatorGraphicsItem(QGraphicsItem *parent) : QGraphicsObject(parent) diff --git a/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp b/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp index e96020c995f..a5fa268f3f1 100644 --- a/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp +++ b/src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; BackgroundAction::BackgroundAction(QObject *parent) : QWidgetAction(parent) diff --git a/src/plugins/qmldesigner/components/formeditor/bindingindicator.cpp b/src/plugins/qmldesigner/components/formeditor/bindingindicator.cpp index 4a93b4bb16f..3799798f973 100644 --- a/src/plugins/qmldesigner/components/formeditor/bindingindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/bindingindicator.cpp @@ -10,7 +10,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; BindingIndicator::BindingIndicator(LayerItem *layerItem) : m_layerItem(layerItem) diff --git a/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp b/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp index 0c966ddabe1..63c95624270 100644 --- a/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/bindingindicatorgraphicsitem.cpp @@ -8,7 +8,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; BindingIndicatorGraphicsItem::BindingIndicatorGraphicsItem(QGraphicsItem *parent) : QGraphicsObject(parent) diff --git a/src/plugins/qmldesigner/components/formeditor/controlelement.cpp b/src/plugins/qmldesigner/components/formeditor/controlelement.cpp index c167ca4d220..cdd6aae36e3 100644 --- a/src/plugins/qmldesigner/components/formeditor/controlelement.cpp +++ b/src/plugins/qmldesigner/components/formeditor/controlelement.cpp @@ -12,7 +12,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; ControlElement::ControlElement(LayerItem *layerItem) : m_controlShape(new QGraphicsRectItem(layerItem)) diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index fffdc86c265..2c38e530110 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -30,7 +30,7 @@ static Q_LOGGING_CATEGORY(dragToolInfo, "qtc.qmldesigner.formeditor", QtWarningM namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; DragTool::DragTool(FormEditorView *editorView) : AbstractFormEditorTool(editorView), diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp index d7008571ffd..c762cee53b6 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp @@ -24,7 +24,7 @@ namespace QmlDesigner { const int penWidth = 2; -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; FormEditorAnnotationIcon::FormEditorAnnotationIcon(const ModelNode &modelNode, QGraphicsItem *parent) : QGraphicsObject(parent) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp index 9cdfc8100ab..86f23d60246 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorgraphicsview.cpp @@ -23,7 +23,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; FormEditorGraphicsView::FormEditorGraphicsView(QWidget *parent) : QGraphicsView(parent) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp index 8b603a594ed..52fda50de04 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp @@ -36,7 +36,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; FormEditorScene *FormEditorItem::scene() const { return qobject_cast(QGraphicsItem::scene()); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index 9c54b6dbf55..98e2ecf4f38 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -33,7 +33,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; FormEditorScene::FormEditorScene(FormEditorWidget *view, FormEditorView *editorView) : QGraphicsScene() diff --git a/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp b/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp index ce9a7b1ffcd..181b0cb33e4 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp @@ -15,7 +15,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; const int toolButtonSize = 14; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index b7f64e6abad..f4fa5791266 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -49,7 +49,7 @@ using NanotraceHR::keyValue; namespace { constexpr AuxiliaryDataKeyView autoSizeProperty{AuxiliaryDataType::Temporary, "autoSize"}; -const auto category = FormEditorTracing::category; +using FormEditorTracing::category; } FormEditorView::FormEditorView(ExternalDependenciesInterface &externalDependencies) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 28badd3e930..550daeaddec 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -51,7 +51,7 @@ namespace { constexpr AuxiliaryDataKeyView formeditorZoomProperty{AuxiliaryDataType::NodeInstancePropertyOverwrite, "formeditorZoom"}; -const auto category = FormEditorTracing::category; +using FormEditorTracing::category; } FormEditorWidget::FormEditorWidget(FormEditorView *view) diff --git a/src/plugins/qmldesigner/components/formeditor/layeritem.cpp b/src/plugins/qmldesigner/components/formeditor/layeritem.cpp index 1d225ee2a40..43dc214e955 100644 --- a/src/plugins/qmldesigner/components/formeditor/layeritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/layeritem.cpp @@ -12,7 +12,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; LayerItem::LayerItem(FormEditorScene* scene) { diff --git a/src/plugins/qmldesigner/components/formeditor/lineeditaction.cpp b/src/plugins/qmldesigner/components/formeditor/lineeditaction.cpp index 1f1c1be1075..14a5c894f0d 100644 --- a/src/plugins/qmldesigner/components/formeditor/lineeditaction.cpp +++ b/src/plugins/qmldesigner/components/formeditor/lineeditaction.cpp @@ -9,7 +9,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; LineEditAction::LineEditAction(const QString &placeHolderText, QObject *parent) : QWidgetAction(parent), diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp index de3a23ec36b..4897121aa57 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp @@ -25,7 +25,7 @@ static Q_LOGGING_CATEGORY(moveManipulatorInfo, "qtc.qmldesigner.formeditor", QtW namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; MoveManipulator::MoveManipulator(LayerItem *layerItem, FormEditorView *view) : m_layerItem(layerItem), diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp index 7ee2958c641..7113916de7b 100644 --- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp @@ -20,7 +20,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; MoveTool::MoveTool(FormEditorView *editorView) : AbstractFormEditorTool(editorView) diff --git a/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp b/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp index 965d4d05dbb..c54b6ed095e 100644 --- a/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp +++ b/src/plugins/qmldesigner/components/formeditor/onedimensionalcluster.cpp @@ -10,7 +10,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; double sum(const QList & list) { diff --git a/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp b/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp index 31380f83f05..d3e958dbab5 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp @@ -13,7 +13,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; class ResizeControllerData { diff --git a/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp b/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp index 0c66fb3f13d..d414652941c 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizehandleitem.cpp @@ -9,7 +9,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; ResizeHandleItem::ResizeHandleItem(QGraphicsItem *parent, const ResizeController &resizeController) : QGraphicsItem(parent), diff --git a/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp b/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp index 16bbd41a023..0b339cd186c 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizeindicator.cpp @@ -8,7 +8,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; ResizeIndicator::ResizeIndicator(LayerItem *layerItem) : m_layerItem(layerItem) diff --git a/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp index 96f0015e827..62741ce3579 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizemanipulator.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; ResizeManipulator::ResizeManipulator(LayerItem *layerItem, FormEditorView *view) : m_view(view), diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp index aaebc7ef6ca..95d69200dbf 100644 --- a/src/plugins/qmldesigner/components/formeditor/resizetool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/resizetool.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; ResizeTool::ResizeTool(FormEditorView *editorView) : AbstractFormEditorTool(editorView) diff --git a/src/plugins/qmldesigner/components/formeditor/rotationcontroller.cpp b/src/plugins/qmldesigner/components/formeditor/rotationcontroller.cpp index 1fd5ff9c53d..717f8c8027d 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationcontroller.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationcontroller.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; class RotationControllerData { diff --git a/src/plugins/qmldesigner/components/formeditor/rotationhandleitem.cpp b/src/plugins/qmldesigner/components/formeditor/rotationhandleitem.cpp index 8e18c449d81..0922c063f3f 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationhandleitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationhandleitem.cpp @@ -9,7 +9,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; RotationHandleItem::RotationHandleItem(QGraphicsItem *parent, const RotationController &rotationController) : QGraphicsItem(parent) diff --git a/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp b/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp index 8c9e34dea64..b58893a7f18 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp @@ -12,7 +12,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; RotationIndicator::RotationIndicator(LayerItem *layerItem) : m_layerItem(layerItem) diff --git a/src/plugins/qmldesigner/components/formeditor/rotationmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rotationmanipulator.cpp index 468f904ccff..42527ab2557 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationmanipulator.cpp @@ -18,7 +18,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; RotationManipulator::RotationManipulator(LayerItem *layerItem, FormEditorView *view) : m_view(view) diff --git a/src/plugins/qmldesigner/components/formeditor/rotationtool.cpp b/src/plugins/qmldesigner/components/formeditor/rotationtool.cpp index d6f6059df3f..7ef7f2697f1 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationtool.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; RotationTool::RotationTool(FormEditorView *editorView) : AbstractFormEditorTool(editorView) diff --git a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp index 6ca557aadb5..7231cf243fb 100644 --- a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp @@ -10,7 +10,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; RubberBandSelectionManipulator::RubberBandSelectionManipulator(LayerItem *layerItem, FormEditorView *editorView) : m_selectionRectangleElement(layerItem), diff --git a/src/plugins/qmldesigner/components/formeditor/scaleitem.cpp b/src/plugins/qmldesigner/components/formeditor/scaleitem.cpp index c2a4712772f..63aed2c02d5 100644 --- a/src/plugins/qmldesigner/components/formeditor/scaleitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/scaleitem.cpp @@ -8,7 +8,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; ScaleItem::ScaleItem(LayerItem *layerItem, ScaleIndicator *indicator) : QGraphicsRectItem(layerItem), diff --git a/src/plugins/qmldesigner/components/formeditor/scalemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/scalemanipulator.cpp index 49c692c1660..7ed74ae866f 100644 --- a/src/plugins/qmldesigner/components/formeditor/scalemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/scalemanipulator.cpp @@ -6,7 +6,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; ScaleManipulator::ScaleManipulator(LayerItem *layerItem, FormEditorItem *formEditorItem) : m_layerItem(layerItem), diff --git a/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp b/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp index 7eede08c1bf..a6e63cc1615 100644 --- a/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp +++ b/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp @@ -14,7 +14,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; SeekerSlider::SeekerSlider(QWidget *parent) : QSlider(parent) diff --git a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp index 988507111b5..c25bfa7f012 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectionindicator.cpp @@ -22,7 +22,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; SelectionIndicator::SelectionIndicator(LayerItem *layerItem) : m_layerItem(layerItem) diff --git a/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp b/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp index 9a18f57a655..b0c15d935b3 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectionrectangle.cpp @@ -11,7 +11,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; SelectionRectangle::SelectionRectangle(LayerItem *layerItem) : m_controlShape(new QGraphicsRectItem(layerItem)), diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp index 0ed214b5255..4c00becbe98 100644 --- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp @@ -20,7 +20,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; const int s_startDragDistance = 20; const int s_startDragTime = 50; diff --git a/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp index 9a9934ada6d..a31a1214420 100644 --- a/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/singleselectionmanipulator.cpp @@ -11,7 +11,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; SingleSelectionManipulator::SingleSelectionManipulator(FormEditorView *editorView) : m_editorView(editorView), diff --git a/src/plugins/qmldesigner/components/formeditor/snapper.cpp b/src/plugins/qmldesigner/components/formeditor/snapper.cpp index 59c09f19b6d..ee4d764b1d7 100644 --- a/src/plugins/qmldesigner/components/formeditor/snapper.cpp +++ b/src/plugins/qmldesigner/components/formeditor/snapper.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; Snapper::Snapper() : m_containerFormEditorItem(nullptr), diff --git a/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.cpp b/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.cpp index 675e4a38cef..60ea21cd162 100644 --- a/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/snappinglinecreator.cpp @@ -10,7 +10,7 @@ #include namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; SnappingLineCreator::SnappingLineCreator(FormEditorItem *formEditorItem) : m_formEditorItem(formEditorItem), diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp index 0859da98c3d..9006d51fbdb 100644 --- a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp +++ b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp @@ -15,7 +15,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; ToolBox::ToolBox(QWidget *parentWidget) : Utils::StyledBar(parentWidget) diff --git a/src/plugins/qmldesigner/components/formeditor/view3dtool.cpp b/src/plugins/qmldesigner/components/formeditor/view3dtool.cpp index 6a6e9dac357..b9d3216fe42 100644 --- a/src/plugins/qmldesigner/components/formeditor/view3dtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/view3dtool.cpp @@ -12,7 +12,7 @@ namespace QmlDesigner { -static const auto category = FormEditorTracing::category; +using FormEditorTracing::category; View3DTool::View3DTool() : QObject(), AbstractCustomTool() diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryaddimportmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryaddimportmodel.cpp index fbb51774aff..ff63cee179a 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryaddimportmodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryaddimportmodel.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; ItemLibraryAddImportModel::ItemLibraryAddImportModel(QObject *parent) : QAbstractListModel(parent) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategoriesmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategoriesmodel.cpp index 595d802f0c2..5531585d05b 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategoriesmodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategoriesmodel.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; ItemLibraryCategoriesModel::ItemLibraryCategoriesModel(QObject *parent) : QAbstractListModel(parent) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp index c376359e18f..1e04f6bbe0a 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycategory.cpp @@ -11,7 +11,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; ItemLibraryCategory::ItemLibraryCategory(const QString &groupName, QObject *parent) : QObject(parent), diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryiconimageprovider.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryiconimageprovider.cpp index b6c56f0d533..3b3ed78f538 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryiconimageprovider.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryiconimageprovider.cpp @@ -15,7 +15,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; QQuickImageResponse *ItemLibraryIconImageProvider::requestImageResponse(const QString &id, const QSize &) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp index 906b85b0edc..1c32e6c4c58 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp @@ -9,7 +9,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; namespace Internal { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp index e8057033d4b..de435898fa1 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp @@ -7,7 +7,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; ItemLibraryImport::ItemLibraryImport(const Import &import, QObject *parent, SectionType sectionType) : QObject(parent), diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp index b2aff698ef4..88fa21e02a9 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp @@ -8,7 +8,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; ItemLibraryItem::ItemLibraryItem(const ItemLibraryEntry &itemLibraryEntry, bool isUsable, QObject *parent) : QObject(parent) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitemsmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitemsmodel.cpp index 617d64b6008..7f8d3cc665d 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitemsmodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitemsmodel.cpp @@ -11,7 +11,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; ItemLibraryItemsModel::ItemLibraryItemsModel(QObject *parent) : QAbstractListModel(parent) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 5fb71a53f2c..c5896bba143 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -30,7 +30,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; // sectionName can be an import url or a category name void ItemLibraryModel::saveExpandedState(bool expanded, const QString §ionName) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp index fd171b33519..19ac2dcea29 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp @@ -26,7 +26,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; ItemLibraryView::ItemLibraryView(AsynchronousImageCache &imageCache, ExternalDependenciesInterface &externalDependencies) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index c76fe522e84..b6073ad4ac8 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -66,7 +66,7 @@ namespace QmlDesigner { -static const auto category = ItemLibraryTracing::category; +using ItemLibraryTracing::category; static QString propertyEditorResourcesPath() { diff --git a/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp b/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp index 4d4beb8381a..8c0cc4605ae 100644 --- a/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp +++ b/src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp @@ -11,7 +11,7 @@ namespace QmlDesigner { -static const auto category = NavigatorTracing::category; +using NavigatorTracing::category; // This will filter and return possible properties that the given type can be bound to ChooseFromPropertyListFilter::ChooseFromPropertyListFilter(const NodeMetaInfo &insertInfo, diff --git a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp index 67d4d5c4aab..cd0b0746df5 100644 --- a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp +++ b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.cpp @@ -23,7 +23,7 @@ namespace QmlDesigner { -static const auto category = NavigatorTracing::category; +using NavigatorTracing::category; IconCheckboxItemDelegate::IconCheckboxItemDelegate(QObject *parent, const QIcon &icon) : QStyledItemDelegate(parent), diff --git a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp index ab7fd8a5d83..3280df54d4b 100644 --- a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp +++ b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.cpp @@ -31,7 +31,7 @@ namespace QmlDesigner { -static const auto category = NavigatorTracing::category; +using NavigatorTracing::category; int NameItemDelegate::iconOffset = 0; diff --git a/src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.cpp index 08234b097e2..f5a6d4fcf92 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorsearchwidget.cpp @@ -17,7 +17,7 @@ namespace QmlDesigner { -static const auto category = NavigatorTracing::category; +using NavigatorTracing::category; LineEdit::LineEdit(QWidget *parent) : QLineEdit(parent) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index b5e14acd4a8..76bb3560192 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -57,7 +57,7 @@ namespace QmlDesigner { -static const auto category = NavigatorTracing::category; +using NavigatorTracing::category; static QList modelNodesFromMimeData(const QMimeData *mimeData, AbstractView *view) { diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp index bc042cadb35..0fa8806e09c 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp @@ -33,7 +33,7 @@ namespace QmlDesigner { namespace { -const auto category = NavigatorTracing::category; +using NavigatorTracing::category; // This style basically allows us to span the entire row // including the arrow indicators which would otherwise not be diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 35c99eff207..0cc00c958b2 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -43,7 +43,7 @@ #include #include -static auto category = QmlDesigner::NavigatorTracing::category; +using QmlDesigner::NavigatorTracing::category; inline static void setScenePos(const QmlDesigner::ModelNode &modelNode, const QPointF &pos) { diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp index 00a6697a98b..8cfc4426394 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp @@ -30,7 +30,7 @@ using namespace Core; namespace QmlDesigner { -static const auto category = NavigatorTracing::category; +using NavigatorTracing::category; NavigatorWidget::NavigatorWidget(NavigatorView *view) : m_treeView(new NavigatorTreeView) diff --git a/src/plugins/qmldesigner/components/navigator/previewtooltip.cpp b/src/plugins/qmldesigner/components/navigator/previewtooltip.cpp index a6ce494c665..6d02376aa62 100644 --- a/src/plugins/qmldesigner/components/navigator/previewtooltip.cpp +++ b/src/plugins/qmldesigner/components/navigator/previewtooltip.cpp @@ -12,7 +12,7 @@ namespace QmlDesigner { -static const auto category = NavigatorTracing::category; +using NavigatorTracing::category; PreviewToolTip::PreviewToolTip(QWidget *parent) : QWidget(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp b/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp index 70ae3975c7a..8c5d5cbd76c 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/aligndistribute.cpp @@ -25,7 +25,7 @@ using namespace Utils; namespace QmlDesigner { -static const auto category = PropertyEditorTracing::category; +using PropertyEditorTracing::category; AlignDistribute::AlignDistribute(QObject *parent) : QObject(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/colorpalettebackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/colorpalettebackend.cpp index 51581b946d4..b9d1c9a0036 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/colorpalettebackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/colorpalettebackend.cpp @@ -23,7 +23,7 @@ namespace QmlDesigner { QPointer ColorPaletteBackend::m_instance = nullptr; -static const auto category = PropertyEditorTracing::category; +using PropertyEditorTracing::category; ColorPaletteBackend::ColorPaletteBackend() : m_currentPalette() diff --git a/src/plugins/qmldesigner/components/propertyeditor/compatibleproperties.cpp b/src/plugins/qmldesigner/components/propertyeditor/compatibleproperties.cpp index 7b81e96099f..051ab5202ed 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/compatibleproperties.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/compatibleproperties.cpp @@ -12,7 +12,7 @@ namespace QmlDesigner { -static const auto category = PropertyEditorTracing::category; +using PropertyEditorTracing::category; /*! * \internal diff --git a/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp b/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp index 616b91a4cb1..a1c114848cc 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.cpp @@ -7,7 +7,7 @@ namespace QmlDesigner { -static const auto category = PropertyEditorTracing::category; +using PropertyEditorTracing::category; DesignerPropertyMap::DesignerPropertyMap(QObject *parent) : QQmlPropertyMap(parent) { diff --git a/src/plugins/qmldesigner/components/propertyeditor/dynamicpropertiesproxymodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/dynamicpropertiesproxymodel.cpp index f554333fa67..46d900fd7b6 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/dynamicpropertiesproxymodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/dynamicpropertiesproxymodel.cpp @@ -46,7 +46,7 @@ namespace QmlDesigner { -static const auto category = PropertyEditorTracing::category; +using PropertyEditorTracing::category; static const int propertyNameRole = Qt::UserRole + 1; static const int propertyTypeRole = Qt::UserRole + 2; diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp index 8bc2bb11d2d..7f6518e8df6 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp @@ -20,7 +20,7 @@ static QString s_lastBrowserPath; -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; FileResourcesModel::FileResourcesModel(QObject *parent) : QObject(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/fontresourcesmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/fontresourcesmodel.cpp index efed448d74d..96c55f72024 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fontresourcesmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/fontresourcesmodel.cpp @@ -33,7 +33,7 @@ using namespace Qt::Literals::StringLiterals; namespace { -auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; QStringList makeFontFilesFilterList() { diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp index a9b496efa68..113a2f58a8a 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp @@ -24,7 +24,7 @@ namespace { -auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; constexpr auto widthBinding = [](const QStringView nodeName) -> QString { return QString("%1.width").arg(nodeName); diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp index 446713db439..3375445194d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp @@ -17,7 +17,7 @@ namespace { -auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; const char settingsKey[] = "GradientPresetCustomList"; const char settingsFileName[] = "GradientPresets.ini"; diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetdefaultlistmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetdefaultlistmodel.cpp index b99c8ff62d7..ff19778d15e 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetdefaultlistmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetdefaultlistmodel.cpp @@ -10,7 +10,7 @@ #include #include -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; GradientPresetDefaultListModel::GradientPresetDefaultListModel(QObject *parent) : GradientPresetListModel(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp index 98620535215..6aef3158c53 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp @@ -15,7 +15,7 @@ #include -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; GradientPresetItem::GradientPresetItem() : m_gradientVal(QGradient()) diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetlistmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetlistmodel.cpp index f4359b41203..9176076a993 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetlistmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetlistmodel.cpp @@ -9,7 +9,7 @@ #include #include -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; GradientPresetListModel::GradientPresetListModel(QObject *parent) : QAbstractListModel(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/instanceimageprovider.cpp b/src/plugins/qmldesigner/components/propertyeditor/instanceimageprovider.cpp index f85fbb2a7da..b70d73ac4a4 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/instanceimageprovider.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/instanceimageprovider.cpp @@ -7,7 +7,7 @@ #include #include -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; constexpr QByteArrayView instanceImageRequestId = "PropertyEditor.InstanceImage_"; diff --git a/src/plugins/qmldesigner/components/propertyeditor/itemfiltermodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/itemfiltermodel.cpp index ecddd07f5cc..f52cb772c85 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/itemfiltermodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/itemfiltermodel.cpp @@ -17,7 +17,7 @@ using namespace QmlDesigner; -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; ItemFilterModel::ItemFilterModel(QObject *parent) : QAbstractListModel(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/listvalidator.cpp b/src/plugins/qmldesigner/components/propertyeditor/listvalidator.cpp index 14742d36622..437ad65dea6 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/listvalidator.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/listvalidator.cpp @@ -5,7 +5,7 @@ #include "propertyeditortracing.h" -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; ListValidator::ListValidator(QObject *parent) : QValidator{parent} diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp index fe215d60962..b7172fdeca2 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp @@ -40,7 +40,7 @@ namespace QmlDesigner { using namespace Qt::StringLiterals; -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; static Q_LOGGING_CATEGORY(urlSpecifics, "qtc.propertyeditor.specifics", QtWarningMsg) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditordynamicpropertiesproxymodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditordynamicpropertiesproxymodel.cpp index 7d8387d6196..efa2ffda079 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditordynamicpropertiesproxymodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditordynamicpropertiesproxymodel.cpp @@ -33,7 +33,7 @@ namespace QmlDesigner { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; PropertyEditorDynamicPropertiesProxyModel::PropertyEditorDynamicPropertiesProxyModel(QObject *parent) : DynamicPropertiesProxyModel(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 2414a493b23..7f1e76fb2b2 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -52,7 +52,7 @@ #include -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; static Q_LOGGING_CATEGORY(propertyEditorBenchmark, "qtc.propertyeditor.load", QtWarningMsg) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp index b09b5ad401e..f6bbe64dd18 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp @@ -11,7 +11,7 @@ namespace QmlDesigner { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; PropertyEditorTransaction::PropertyEditorTransaction(QmlDesigner::PropertyEditorView *propertyEditor) : QObject(propertyEditor), m_propertyEditor(propertyEditor), m_timerId(-1) { diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorutils.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorutils.cpp index 912f756af37..22b630f12ec 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorutils.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorutils.cpp @@ -9,7 +9,7 @@ namespace QmlDesigner { namespace PropertyEditorUtils { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; #ifndef QDS_USE_PROJECTSTORAGE diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index cc1ae3d2993..ddbe1bdd4c1 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -30,7 +30,7 @@ namespace QmlDesigner { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; PropertyEditorValue::PropertyEditorValue(QObject *parent) : QObject(parent), diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index b307de17542..cda584b0ada 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -52,7 +52,7 @@ enum { namespace QmlDesigner { -static const auto category = PropertyEditorTracing::category; +using PropertyEditorTracing::category; constexpr QStringView quick3dImport{u"QtQuick3D"}; diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.cpp index 76fdd34c10a..bfa40d40c67 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.cpp @@ -10,7 +10,7 @@ namespace QmlDesigner { -static const auto category = PropertyEditorTracing::category; +using PropertyEditorTracing::category; PropertyEditorWidget::PropertyEditorWidget(QWidget *parent) : QStackedWidget(parent) { diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertynamevalidator.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertynamevalidator.cpp index 3a36c4917d8..33a6f162cc4 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertynamevalidator.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertynamevalidator.cpp @@ -9,7 +9,7 @@ #include -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; PropertyNameValidator::PropertyNameValidator(QObject *parent) : QValidator(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp index f83dc1b7680..e2f77ea576b 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp @@ -25,7 +25,7 @@ class NodeState; namespace { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; const Utils::SmallString auxDataString("anchors_"); diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlmaterialnodeproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlmaterialnodeproxy.cpp index 3249301fd41..44a54c82820 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlmaterialnodeproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlmaterialnodeproxy.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; using namespace Qt::StringLiterals; diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp index f8a3a33c82a..253768588d8 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp @@ -18,7 +18,7 @@ namespace QmlDesigner { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; QmlModelNodeProxy::QmlModelNodeProxy(QObject *parent) : QObject(parent) diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmltexturenodeproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmltexturenodeproxy.cpp index c0d9fb2b621..333c2e77b5f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmltexturenodeproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmltexturenodeproxy.cpp @@ -15,7 +15,7 @@ namespace QmlDesigner { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; using namespace Qt::StringLiterals; diff --git a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp index f49cb23c566..a04fba8a258 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp @@ -39,7 +39,7 @@ namespace QmlDesigner { -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; Quick2PropertyEditorView::Quick2PropertyEditorView(AsynchronousImageCache &imageCache) : QQuickWidget() diff --git a/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp b/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp index 3d3a5e25a0c..de09cfa67e4 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp @@ -11,7 +11,7 @@ #include #include -static auto category = QmlDesigner::PropertyEditorTracing::category; +using QmlDesigner::PropertyEditorTracing::category; Tooltip::Tooltip(QObject *parent) : QObject(parent) diff --git a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp index 3012bcd9f79..5fb14a459b8 100644 --- a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp @@ -39,7 +39,7 @@ namespace { using NanotraceHR::keyValue; using Storage::ModuleKind; -const auto category = ModelTracing::category; +using ModelTracing::category; struct TypeDescription { diff --git a/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp index 5930e7d45a9..35fcdf5af54 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp @@ -22,7 +22,7 @@ namespace QmlDesigner { using namespace QmlDesigner::Internal; using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; /*! \class QmlDesigner::ModelNode diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageexceptions.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageexceptions.cpp index e4f5943e0fc..0b16cdacccb 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageexceptions.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageexceptions.cpp @@ -12,7 +12,7 @@ using NanotraceHR::keyValue; namespace { -auto category = ProjectStorageTracing::projectStorageCategory; +using ProjectStorageTracing::projectStorageCategory; } // namespace @@ -20,7 +20,7 @@ TypeHasInvalidSourceId::TypeHasInvalidSourceId(const Sqlite::source_location &lo : ProjectStorageError{location} { - category().threadEvent("TypeHasInvalidSourceId"); + projectStorageCategory().threadEvent("TypeHasInvalidSourceId"); } const char *TypeHasInvalidSourceId::what() const noexcept @@ -32,7 +32,7 @@ ModuleDoesNotExists::ModuleDoesNotExists(const Sqlite::source_location &location : ProjectStorageError{location} { - category().threadEvent("ModuleDoesNotExists"); + projectStorageCategory().threadEvent("ModuleDoesNotExists"); } const char *ModuleDoesNotExists::what() const noexcept @@ -44,7 +44,7 @@ ModuleAlreadyExists::ModuleAlreadyExists(const Sqlite::source_location &location : ProjectStorageError{location} { - category().threadEvent("ModuleAlreadyExists"); + projectStorageCategory().threadEvent("ModuleAlreadyExists"); } const char *ModuleAlreadyExists::what() const noexcept @@ -61,16 +61,16 @@ TypeNameDoesNotExists::TypeNameDoesNotExists(std::string_view typeName, {"type: ", typeName, ", source id: ", Utils::SmallString::number(sourceId.internalId())}), location} { - category().threadEvent("TypeNameDoesNotExists", - keyValue("type name", typeName), - keyValue("source id", sourceId)); + projectStorageCategory().threadEvent("TypeNameDoesNotExists", + keyValue("type name", typeName), + keyValue("source id", sourceId)); } PrototypeChainCycle::PrototypeChainCycle(const Sqlite::source_location &location) : ProjectStorageError{location} { - category().threadEvent("PrototypeChainCycle"); + projectStorageCategory().threadEvent("PrototypeChainCycle"); } const char *PrototypeChainCycle::what() const noexcept @@ -82,7 +82,7 @@ AliasChainCycle::AliasChainCycle(const Sqlite::source_location &location) : ProjectStorageError{location} { - category().threadEvent("AliasChainCycle"); + projectStorageCategory().threadEvent("AliasChainCycle"); } const char *AliasChainCycle::what() const noexcept @@ -94,7 +94,7 @@ CannotParseQmlTypesFile::CannotParseQmlTypesFile(const Sqlite::source_location & : ProjectStorageError{location} { - category().threadEvent("CannotParseQmlTypesFile"); + projectStorageCategory().threadEvent("CannotParseQmlTypesFile"); } const char *CannotParseQmlTypesFile::what() const noexcept @@ -106,7 +106,7 @@ CannotParseQmlDocumentFile::CannotParseQmlDocumentFile(const Sqlite::source_loca : ProjectStorageError{location} { - category().threadEvent("CannotParseQmlDocumentFile"); + projectStorageCategory().threadEvent("CannotParseQmlDocumentFile"); } const char *CannotParseQmlDocumentFile::what() const noexcept @@ -119,7 +119,7 @@ DirectoryInfoHasInvalidProjectSourceId::DirectoryInfoHasInvalidProjectSourceId( : ProjectStorageError{location} { - category().threadEvent("DirectoryInfoHasInvalidProjectSourceId"); + projectStorageCategory().threadEvent("DirectoryInfoHasInvalidProjectSourceId"); } const char *DirectoryInfoHasInvalidProjectSourceId::what() const noexcept @@ -131,7 +131,7 @@ DirectoryInfoHasInvalidSourceId::DirectoryInfoHasInvalidSourceId(const Sqlite::s : ProjectStorageError{location} { - category().threadEvent("DirectoryInfoHasInvalidSourceId"); + projectStorageCategory().threadEvent("DirectoryInfoHasInvalidSourceId"); } const char *DirectoryInfoHasInvalidSourceId::what() const noexcept @@ -143,7 +143,7 @@ DirectoryInfoHasInvalidModuleId::DirectoryInfoHasInvalidModuleId(const Sqlite::s : ProjectStorageError{location} { - category().threadEvent("DirectoryInfoHasInvalidModuleId"); + projectStorageCategory().threadEvent("DirectoryInfoHasInvalidModuleId"); } const char *DirectoryInfoHasInvalidModuleId::what() const noexcept @@ -155,7 +155,7 @@ FileStatusHasInvalidSourceId::FileStatusHasInvalidSourceId(const Sqlite::source_ : ProjectStorageError{location} { - category().threadEvent("FileStatusHasInvalidSourceId"); + projectStorageCategory().threadEvent("FileStatusHasInvalidSourceId"); } const char *FileStatusHasInvalidSourceId::what() const noexcept @@ -188,13 +188,14 @@ ExportedTypeCannotBeInserted::ExportedTypeCannotBeInserted(std::string_view erro const Sqlite::source_location &location) : ProjectStorageErrorWithMessage{"ExportedTypeCannotBeInserted"sv, errorMessage, location} { - category().threadEvent("ExportedTypeCannotBeInserted", keyValue("error message", errorMessage)); + projectStorageCategory().threadEvent("ExportedTypeCannotBeInserted", + keyValue("error message", errorMessage)); } TypeAnnotationHasInvalidSourceId::TypeAnnotationHasInvalidSourceId(const Sqlite::source_location &location) : ProjectStorageError{location} { - category().threadEvent("TypeAnnotationHasInvalidSourceId"); + projectStorageCategory().threadEvent("TypeAnnotationHasInvalidSourceId"); } const char *TypeAnnotationHasInvalidSourceId::what() const noexcept diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp index 5eee0ca9106..f148465cf85 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp @@ -28,8 +28,8 @@ #include namespace QmlDesigner { -constexpr auto category = ProjectStorageTracing::projectStorageUpdaterCategory; using NanotraceHR::keyValue; +using ProjectStorageTracing::projectStorageUpdaterCategory; using Tracer = NanotraceHR::Tracer; template @@ -205,7 +205,7 @@ void addModuleExportedImport(Storage::Synchronization::ModuleExportedImports &im std::string_view exportedModuleName) { NanotraceHR::Tracer tracer{"add module exported imports", - category(), + projectStorageUpdaterCategory(), keyValue("module id", moduleId), keyValue("exported module id", exportedModuleId), keyValue("version", version), @@ -231,7 +231,7 @@ void addModuleExportedImports(Storage::Synchronization::ModuleExportedImports &i ProjectStorageInterface &projectStorage) { NanotraceHR::Tracer tracer{"add module exported imports", - category(), + projectStorageUpdaterCategory(), keyValue("cpp module id", cppModuleId), keyValue("module id", moduleId)}; @@ -294,7 +294,7 @@ void ProjectStorageUpdater::update(Update update) const Utils::PathString projectDirectory = update.projectDirectory; NanotraceHR::Tracer tracer{"update", - category(), + projectStorageUpdaterCategory(), keyValue("Qt directories", qtDirectories), keyValue("project directory", projectDirectory)}; @@ -516,7 +516,7 @@ void ProjectStorageUpdater::updateDirectories(const QStringList &directories, NotUpdatedSourceIds ¬UpdatedSourceIds, WatchedSourceIds &watchedSourceIds) { - NanotraceHR::Tracer tracer{"update directories", category()}; + NanotraceHR::Tracer tracer{"update directories", projectStorageUpdaterCategory()}; for (const QString &directory : directories) updateDirectory( @@ -624,7 +624,7 @@ void ProjectStorageUpdater::annotationDirectoryChanged( Storage::Synchronization::SynchronizationPackage &package) { NanotraceHR::Tracer tracer{"annotation directory changed", - category(), + projectStorageUpdaterCategory(), keyValue("directory path", directoryPath), keyValue("directory id", directoryId)}; @@ -640,7 +640,7 @@ void ProjectStorageUpdater::updatePropertyEditorFiles( Storage::Synchronization::SynchronizationPackage &package) { NanotraceHR::Tracer tracer{"update property editor files", - category(), + projectStorageUpdaterCategory(), keyValue("directory path", directoryPath), keyValue("directory id", directoryId)}; @@ -676,7 +676,9 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa WatchedSourceIds &watchedSourceIds, IsInsideProject isInsideProject) { - NanotraceHR::Tracer tracer{"update directory", category(), keyValue("directory", directoryPath)}; + NanotraceHR::Tracer tracer{"update directory", + projectStorageUpdaterCategory(), + keyValue("directory", directoryPath)}; SourcePath qmldirPath{directoryPath + "/qmldir"}; SourceId qmldirSourceId = m_pathCache.sourceId(qmldirPath); @@ -764,7 +766,7 @@ void ProjectStorageUpdater::updatePropertyEditorPaths( NotUpdatedSourceIds ¬UpdatedSourceIds) { NanotraceHR::Tracer tracer{"update property editor paths", - category(), + projectStorageUpdaterCategory(), keyValue("property editor resources path", propertyEditorResourcesPath)}; if (propertyEditorResourcesPath.isEmpty()) @@ -808,7 +810,7 @@ void ProjectStorageUpdater::updateTypeAnnotations(const QStringList &directoryPa Storage::Synchronization::SynchronizationPackage &package, NotUpdatedSourceIds ¬UpdatedSourceIds) { - NanotraceHR::Tracer tracer("update type annotations", category()); + NanotraceHR::Tracer tracer("update type annotations", projectStorageUpdaterCategory()); std::map> updatedSourceIdsDictonary; @@ -828,7 +830,7 @@ void ProjectStorageUpdater::updateTypeAnnotations( std::map> &updatedSourceIdsDictonary) { NanotraceHR::Tracer tracer("update type annotation directory", - category(), + projectStorageUpdaterCategory(), keyValue("path", rootDirectoryPath)); if (rootDirectoryPath.isEmpty()) @@ -902,7 +904,7 @@ void ProjectStorageUpdater::updateTypeAnnotation(const QString &directoryPath, Storage::Synchronization::SynchronizationPackage &package) { NanotraceHR::Tracer tracer{"update type annotation path", - category(), + projectStorageUpdaterCategory(), keyValue("path", filePath), keyValue("directory path", directoryPath)}; @@ -925,7 +927,7 @@ void ProjectStorageUpdater::updatePropertyEditorPath( long long pathOffset) { NanotraceHR::Tracer tracer{"update property editor path", - category(), + projectStorageUpdaterCategory(), keyValue("directory path", directoryPath), keyValue("directory id", directoryId)}; @@ -945,7 +947,7 @@ void ProjectStorageUpdater::updatePropertyEditorFilePath( long long pathOffset) { NanotraceHR::Tracer tracer{"update property editor file path", - category(), + projectStorageUpdaterCategory(), keyValue("directory path", path), keyValue("directory id", directoryId)}; @@ -1036,7 +1038,7 @@ void appendProjectChunkSourceIds(ProjectChunkSourceIds &ids, void ProjectStorageUpdater::pathsWithIdsChanged(const std::vector &changedIdPaths) { NanotraceHR::Tracer tracer{"paths with ids changed", - category(), + projectStorageUpdaterCategory(), keyValue("id paths", changedIdPaths)}; try { @@ -1163,13 +1165,15 @@ void ProjectStorageUpdater::parseTypeInfos(const QStringList &typeInfos, IsInsideProject isInsideProject) { NanotraceHR::Tracer tracer{"parse type infos", - category(), + projectStorageUpdaterCategory(), keyValue("directory id", directoryId), keyValue("directory path", directoryPath), keyValue("module id", moduleId)}; for (const QString &typeInfo : typeInfos) { - NanotraceHR::Tracer tracer{"parse type info", category(), keyValue("type info", typeInfo)}; + NanotraceHR::Tracer tracer{"parse type info", + projectStorageUpdaterCategory(), + keyValue("type info", typeInfo)}; Utils::PathString qmltypesFileName = typeInfo; SourceId sourceId = m_pathCache.sourceId(directoryId, qmltypesFileName); @@ -1212,7 +1216,7 @@ void ProjectStorageUpdater::parseDirectoryInfos( WatchedSourceIds &watchedSourceIds, IsInsideProject isInsideProject) { - NanotraceHR::Tracer tracer{"parse project datas", category()}; + NanotraceHR::Tracer tracer{"parse project datas", projectStorageUpdaterCategory()}; for (const Storage::Synchronization::DirectoryInfo &directoryInfo : directoryInfos) { switch (directoryInfo.fileType) { @@ -1241,7 +1245,9 @@ auto ProjectStorageUpdater::parseTypeInfo(const Storage::Synchronization::Direct NotUpdatedSourceIds ¬UpdatedSourceIds, IsInsideProject isInsideProject) -> FileState { - NanotraceHR::Tracer tracer{"parse type info", category(), keyValue("qmltypes path", qmltypesPath)}; + NanotraceHR::Tracer tracer{"parse type info", + projectStorageUpdaterCategory(), + keyValue("qmltypes path", qmltypesPath)}; auto state = fileState(directoryInfo.sourceId, package, notUpdatedSourceIds); switch (state) { @@ -1287,7 +1293,7 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil IsInsideProject isInsideProject) { NanotraceHR::Tracer tracer{"parse qml component", - category(), + projectStorageUpdaterCategory(), keyValue("relative file path", relativeFilePath), keyValue("directory path", directoryPath), keyValue("exported types", exportedTypes), @@ -1363,7 +1369,9 @@ void ProjectStorageUpdater::parseQmlComponent(SourceId sourceId, NotUpdatedSourceIds ¬UpdatedSourceIds, IsInsideProject isInsideProject) { - NanotraceHR::Tracer tracer{"parse qml component", category(), keyValue("source id", sourceId)}; + NanotraceHR::Tracer tracer{"parse qml component", + projectStorageUpdaterCategory(), + keyValue("source id", sourceId)}; auto state = fileState(sourceId, package, notUpdatedSourceIds); if (isUnchanged(state)) @@ -1460,7 +1468,7 @@ void ProjectStorageUpdater::parseQmlComponents(Components components, IsInsideProject isInsideProject) { NanotraceHR::Tracer tracer{"parse qml components", - category(), + projectStorageUpdaterCategory(), keyValue("directory id", directoryId), keyValue("qmldir state", qmldirState)}; @@ -1494,7 +1502,7 @@ ProjectStorageUpdater::FileState ProjectStorageUpdater::fileState( NotUpdatedSourceIds ¬UpdatedSourceIds) const { NanotraceHR::Tracer tracer{"update property editor paths", - category(), + projectStorageUpdaterCategory(), keyValue("source id", sourceId)}; auto currentFileStatus = m_fileStatusCache.find(sourceId); diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/qmldocumentparser.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/qmldocumentparser.cpp index 9165b1170ac..fa1e44e29eb 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/qmldocumentparser.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/qmldocumentparser.cpp @@ -23,7 +23,7 @@ namespace QmlDesigner { #ifdef QDS_BUILD_QMLPARSER -constexpr auto category = ProjectStorageTracing::projectStorageUpdaterCategory; +using ProjectStorageTracing::projectStorageUpdaterCategory; using NanotraceHR::keyValue; using Storage::IsInsideProject; using Tracer = NanotraceHR::Tracer; @@ -97,7 +97,7 @@ QualifiedImports createQualifiedImports(const QList &qmlImports, ProjectStorageType &storage) { NanotraceHR::Tracer tracer{"create qualified imports", - category(), + projectStorageUpdaterCategory(), keyValue("sourceId", sourceId), keyValue("directoryPath", directoryPath)}; @@ -331,7 +331,7 @@ Storage::Synchronization::Type QmlDocumentParser::parse(const QString &sourceCon IsInsideProject isInsideProject) { NanotraceHR::Tracer tracer{"qml document parser parse", - category(), + projectStorageUpdaterCategory(), keyValue("sourceId", sourceId), keyValue("directoryPath", directoryPath)}; diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/qmltypesparser.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/qmltypesparser.cpp index 5abb2be6981..41586d2727d 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/qmltypesparser.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/qmltypesparser.cpp @@ -25,7 +25,7 @@ namespace QmlDesigner { #ifdef QDS_BUILD_QMLPARSER -constexpr auto category = ProjectStorageTracing::projectStorageUpdaterCategory; +using ProjectStorageTracing::projectStorageUpdaterCategory; using NanotraceHR::keyValue; using Storage::IsInsideProject; using Tracer = NanotraceHR::Tracer; @@ -40,7 +40,7 @@ using Storage::TypeNameString; ComponentWithoutNamespaces createComponentNameWithoutNamespaces(const QList &objects) { - NanotraceHR::Tracer tracer{"parse qmltypes file", category()}; + NanotraceHR::Tracer tracer{"parse qmltypes file", projectStorageUpdaterCategory()}; ComponentWithoutNamespaces componentWithoutNamespaces; @@ -83,7 +83,7 @@ void addImports(Storage::Imports &imports, { NanotraceHR::Tracer tracer{ "add imports", - category(), + projectStorageUpdaterCategory(), keyValue("source id", sourceId), keyValue("module id", cppModuleId), }; @@ -467,7 +467,7 @@ void addType(Storage::Synchronization::Types &types, Internal::LastModule &lastQmlModule) { NanotraceHR::Tracer tracer{"add type", - category(), + projectStorageUpdaterCategory(), keyValue("source id", sourceId), keyValue("module id", cppModuleId)}; @@ -507,7 +507,7 @@ void addTypes(Storage::Synchronization::Types &types, IsInsideProject isInsideProject, Internal::LastModule &lastQmlModule) { - NanotraceHR::Tracer tracer{"add types", category()}; + NanotraceHR::Tracer tracer{"add types", projectStorageUpdaterCategory()}; types.reserve(Utils::usize(objects) + types.size()); @@ -531,7 +531,7 @@ void QmlTypesParser::parse(const QString &sourceContent, const Storage::Synchronization::DirectoryInfo &directoryInfo, IsInsideProject isInsideProject) { - NanotraceHR::Tracer tracer{"qmltypes parser parse", category()}; + NanotraceHR::Tracer tracer{"qmltypes parser parse", projectStorageUpdaterCategory()}; lastQmlModule.name.clear(); lastQmlModule.id = ModuleId{}; diff --git a/src/plugins/qmldesigner/qmltools/anchorline.cpp b/src/plugins/qmldesigner/qmltools/anchorline.cpp index 3cfe17ed23f..1b8dfc39941 100644 --- a/src/plugins/qmldesigner/qmltools/anchorline.cpp +++ b/src/plugins/qmldesigner/qmltools/anchorline.cpp @@ -5,7 +5,7 @@ namespace QmlDesigner { -static const auto category = ModelTracing::category; +using ModelTracing::category; AnchorLine::AnchorLine() : m_qmlItemNode(QmlItemNode()) diff --git a/src/plugins/qmldesigner/qmltools/qml3dnode.cpp b/src/plugins/qmldesigner/qmltools/qml3dnode.cpp index 94687a33e52..c016323ad74 100644 --- a/src/plugins/qmldesigner/qmltools/qml3dnode.cpp +++ b/src/plugins/qmldesigner/qmltools/qml3dnode.cpp @@ -16,7 +16,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; bool Qml3DNode::isValid(SL sl) const { diff --git a/src/plugins/qmldesigner/qmltools/qmlanchors.cpp b/src/plugins/qmldesigner/qmltools/qmlanchors.cpp index b17736d6341..39cc1bc5704 100644 --- a/src/plugins/qmldesigner/qmltools/qmlanchors.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlanchors.cpp @@ -11,7 +11,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; static PropertyName lineTypeToString(AnchorLineType lineType) { diff --git a/src/plugins/qmldesigner/qmltools/qmlchangeset.cpp b/src/plugins/qmldesigner/qmltools/qmlchangeset.cpp index a74e8867c98..04d9c8f4552 100644 --- a/src/plugins/qmldesigner/qmltools/qmlchangeset.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlchangeset.cpp @@ -13,7 +13,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; ModelNode QmlModelStateOperation::target(SL sl) const { diff --git a/src/plugins/qmldesigner/qmltools/qmlconnections.cpp b/src/plugins/qmldesigner/qmltools/qmlconnections.cpp index a350f85da36..62efad565e6 100644 --- a/src/plugins/qmldesigner/qmltools/qmlconnections.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlconnections.cpp @@ -11,7 +11,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; bool QmlConnections::isValid(SL sl) const { diff --git a/src/plugins/qmldesigner/qmltools/qmlitemnode.cpp b/src/plugins/qmldesigner/qmltools/qmlitemnode.cpp index e3015d72ead..2d14796e066 100644 --- a/src/plugins/qmldesigner/qmltools/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlitemnode.cpp @@ -30,7 +30,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; bool QmlItemNode::isItemOrWindow(const ModelNode &modelNode, SL sl) { diff --git a/src/plugins/qmldesigner/qmltools/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/qmltools/qmlmodelnodefacade.cpp index d8d9cb4340c..e115dd20a4c 100644 --- a/src/plugins/qmldesigner/qmltools/qmlmodelnodefacade.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlmodelnodefacade.cpp @@ -8,7 +8,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; AbstractView *QmlModelNodeFacade::view() const { diff --git a/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp b/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp index e8f9d12c943..4900326dbba 100644 --- a/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp @@ -31,7 +31,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; void QmlObjectNode::setVariantProperty(PropertyNameView name, const QVariant &value, SL sl) { diff --git a/src/plugins/qmldesigner/qmltools/qmlstate.cpp b/src/plugins/qmldesigner/qmltools/qmlstate.cpp index 1d911d6624e..b86729d089b 100644 --- a/src/plugins/qmldesigner/qmltools/qmlstate.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlstate.cpp @@ -17,7 +17,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; QmlPropertyChanges QmlModelState::ensurePropertyChangesForTarget(const ModelNode &node, SL sl) { diff --git a/src/plugins/qmldesigner/qmltools/qmltimeline.cpp b/src/plugins/qmldesigner/qmltools/qmltimeline.cpp index a0a5b069448..dbae8b47793 100644 --- a/src/plugins/qmldesigner/qmltools/qmltimeline.cpp +++ b/src/plugins/qmldesigner/qmltools/qmltimeline.cpp @@ -19,7 +19,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; bool QmlTimeline::isValid(SL sl) const { diff --git a/src/plugins/qmldesigner/qmltools/qmltimelinekeyframegroup.cpp b/src/plugins/qmldesigner/qmltools/qmltimelinekeyframegroup.cpp index 3065f820e10..2201feadce2 100644 --- a/src/plugins/qmldesigner/qmltools/qmltimelinekeyframegroup.cpp +++ b/src/plugins/qmldesigner/qmltools/qmltimelinekeyframegroup.cpp @@ -20,7 +20,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; bool QmlTimelineKeyframeGroup::isValid(SL sl) const { diff --git a/src/plugins/qmldesigner/qmltools/qmlvisualnode.cpp b/src/plugins/qmldesigner/qmltools/qmlvisualnode.cpp index 03d5770342c..30d78d405f5 100644 --- a/src/plugins/qmldesigner/qmltools/qmlvisualnode.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlvisualnode.cpp @@ -31,7 +31,7 @@ namespace QmlDesigner { using NanotraceHR::keyValue; -static const auto category = ModelTracing::category; +using ModelTracing::category; static char imagePlaceHolder[] = "qrc:/qtquickplugin/images/template_image.png";