From 765a9b0277d379a28f78dca32a5f8d71d5a20391 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 26 May 2025 13:43:25 +0200 Subject: [PATCH] QmlDesigner: Cleanup using NanotraceHR::keyValue In a cpp file they can be used on the namespace level because they are not exported to other header files. Change-Id: Ie743ff19ae435870bb64094dd9e6990d83544d5b Reviewed-by: Marco Bubke --- .../designercore/metainfo/nodemetainfo.cpp | 157 +---------------- .../libs/designercore/model/modelnode.cpp | 109 +----------- .../projectstorage/projectstorage.cpp | 161 ++++-------------- .../sourcepathstorage/sourcepathstorage.cpp | 12 +- .../qmldesigner/qmltools/qml3dnode.cpp | 8 +- .../qmldesigner/qmltools/qmlanchors.cpp | 31 +--- .../qmldesigner/qmltools/qmlchangeset.cpp | 12 +- .../qmldesigner/qmltools/qmlconnections.cpp | 9 +- .../qmldesigner/qmltools/qmlitemnode.cpp | 69 +------- .../qmltools/qmlmodelnodefacade.cpp | 5 +- .../qmldesigner/qmltools/qmlobjectnode.cpp | 63 +------ src/plugins/qmldesigner/qmltools/qmlstate.cpp | 32 +--- .../qmldesigner/qmltools/qmltimeline.cpp | 26 +-- .../qmltools/qmltimelinekeyframegroup.cpp | 32 +--- .../qmldesigner/qmltools/qmlvisualnode.cpp | 35 +--- 15 files changed, 60 insertions(+), 701 deletions(-) diff --git a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp index e3e67f3c53d..9b218125d9a 100644 --- a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp @@ -36,6 +36,7 @@ namespace QmlDesigner { namespace { +using NanotraceHR::keyValue; using Storage::ModuleKind; auto category = ModelTracing::category; @@ -1488,7 +1489,6 @@ MetaInfoType NodeMetaInfo::type(SL sl) const { if constexpr (useProjectStorage()) { if (isValid()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get type", category(), keyValue("type id", m_typeId), @@ -1518,7 +1518,6 @@ bool NodeMetaInfo::isFileComponent(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is file component", category(), keyValue("type id", m_typeId), @@ -1541,7 +1540,6 @@ bool NodeMetaInfo::isSingleton(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is singleton", category(), keyValue("type id", m_typeId), @@ -1564,7 +1562,6 @@ bool NodeMetaInfo::isInsideProject(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is inside project", category(), keyValue("type id", m_typeId), @@ -1587,7 +1584,6 @@ FlagIs NodeMetaInfo::canBeContainer(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info can be container", category(), keyValue("type id", m_typeId), @@ -1609,7 +1605,6 @@ FlagIs NodeMetaInfo::forceClip(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info force clip", category(), keyValue("type id", m_typeId), @@ -1631,7 +1626,6 @@ FlagIs NodeMetaInfo::doesLayoutChildren(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info does layout children", category(), keyValue("type id", m_typeId), @@ -1653,7 +1647,6 @@ FlagIs NodeMetaInfo::canBeDroppedInFormEditor(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info can be dropped in form editor", category(), keyValue("type id", m_typeId), @@ -1675,7 +1668,6 @@ FlagIs NodeMetaInfo::canBeDroppedInNavigator(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info can be dropped in navigator", category(), keyValue("type id", m_typeId), @@ -1697,7 +1689,6 @@ FlagIs NodeMetaInfo::canBeDroppedInView3D(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info can be dropped in view3d", category(), keyValue("type id", m_typeId), @@ -1719,7 +1710,6 @@ FlagIs NodeMetaInfo::isMovable(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is movable", category(), keyValue("type id", m_typeId), @@ -1741,7 +1731,6 @@ FlagIs NodeMetaInfo::isResizable(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is resizable", category(), keyValue("type id", m_typeId), @@ -1763,7 +1752,6 @@ FlagIs NodeMetaInfo::hasFormEditorItem(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info has form editor item", category(), keyValue("type id", m_typeId), @@ -1785,7 +1773,6 @@ FlagIs NodeMetaInfo::isStackedContainer(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is stacked container", category(), keyValue("type id", m_typeId), @@ -1807,7 +1794,6 @@ FlagIs NodeMetaInfo::takesOverRenderingOfChildren(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info takes over rendering of children", category(), keyValue("type id", m_typeId), @@ -1829,7 +1815,6 @@ FlagIs NodeMetaInfo::visibleInNavigator(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info visible in navigator", category(), keyValue("type id", m_typeId), @@ -1863,7 +1848,6 @@ FlagIs NodeMetaInfo::visibleInLibrary(SL sl) const if (!isValid()) return FlagIs::False; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info visible in library", category(), keyValue("type id", m_typeId), @@ -1913,7 +1897,6 @@ namespace { bool NodeMetaInfo::hasProperty(Utils::SmallStringView propertyName, SL sl) const { if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info has property", category(), keyValue("type id", m_typeId), @@ -1939,7 +1922,6 @@ PropertyMetaInfos NodeMetaInfo::properties(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get properties", category(), keyValue("type id", m_typeId), @@ -1967,7 +1949,6 @@ PropertyMetaInfos NodeMetaInfo::localProperties(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get local properties", category(), keyValue("type id", m_typeId), @@ -1996,7 +1977,6 @@ PropertyMetaInfo NodeMetaInfo::property(PropertyNameView propertyName, SL sl) co return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get property", category(), keyValue("type id", m_typeId), @@ -2018,7 +1998,6 @@ PropertyNameList NodeMetaInfo::signalNames(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get signal names", category(), keyValue("type id", m_typeId), @@ -2038,7 +2017,6 @@ PropertyNameList NodeMetaInfo::slotNames(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get slot names", category(), keyValue("type id", m_typeId), @@ -2056,7 +2034,6 @@ PropertyName NodeMetaInfo::defaultPropertyName(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get default property name", category(), keyValue("type id", m_typeId), @@ -2079,7 +2056,6 @@ PropertyMetaInfo NodeMetaInfo::defaultProperty(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get default property", category(), keyValue("type id", m_typeId), @@ -2101,7 +2077,6 @@ bool NodeMetaInfo::hasDefaultProperty(SL sl) const return false; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info has default property", category(), keyValue("type id", m_typeId), @@ -2121,7 +2096,7 @@ std::vector NodeMetaInfo::selfAndPrototypes([[maybe_unused]] SL sl return {}; #ifdef QDS_USE_PROJECTSTORAGE - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"node meta info get self and prototypes", category(), keyValue("type id", m_typeId), @@ -2151,7 +2126,7 @@ NodeMetaInfos NodeMetaInfo::prototypes([[maybe_unused]] SL sl) const return {}; #ifdef QDS_USE_PROJECTSTORAGE - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"node meta info get prototypes", category(), keyValue("type id", m_typeId), @@ -2255,7 +2230,6 @@ Storage::Info::ExportedTypeNames NodeMetaInfo::allExportedTypeNames(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get all exported type names", category(), keyValue("type id", m_typeId), @@ -2273,7 +2247,6 @@ Storage::Info::ExportedTypeNames NodeMetaInfo::exportedTypeNamesForSourceId(Sour return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get exported type names for source id", category(), keyValue("type id", m_typeId), @@ -2291,7 +2264,6 @@ Storage::Info::TypeHints NodeMetaInfo::typeHints(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get type hints", category(), keyValue("type id", m_typeId), @@ -2313,7 +2285,6 @@ Utils::PathString NodeMetaInfo::iconPath(SL sl) const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get icon path", category(), keyValue("type id", m_typeId), @@ -2335,7 +2306,6 @@ Storage::Info::ItemLibraryEntries NodeMetaInfo::itemLibrariesEntries(SL sl) cons return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get item library entries", category(), keyValue("type id", m_typeId), @@ -2357,7 +2327,6 @@ SourceId NodeMetaInfo::sourceId(SL sl) const return SourceId{}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get source id", category(), keyValue("type id", m_typeId), @@ -2417,7 +2386,6 @@ SourceId NodeMetaInfo::propertyEditorPathId(SL sl) const return SourceId{}; if (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get property editor path id", category(), keyValue("type id", m_typeId), @@ -2493,7 +2461,6 @@ bool NodeMetaInfo::isSuitableForMouseAreaFill(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is suitable for mouse area fill", category(), keyValue("type id", m_typeId), @@ -2525,7 +2492,6 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo, [[maybe_unused]] SL s if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is based on 1 node meta info", category(), keyValue("type id", m_typeId), @@ -2550,7 +2516,6 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is based on 2 node meta infos", category(), keyValue("type id", m_typeId), @@ -2577,7 +2542,6 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is based on 3 node meta infos", category(), keyValue("type id", m_typeId), @@ -2608,7 +2572,6 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is based on 4 node meta infos", category(), keyValue("type id", m_typeId), @@ -2638,7 +2601,6 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is based on 5 node meta infos", category(), keyValue("type id", m_typeId), @@ -2674,7 +2636,6 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is based on 6 node meta infos", category(), keyValue("type id", m_typeId), @@ -2713,7 +2674,6 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is based on 7 node meta infos", category(), keyValue("type id", m_typeId), @@ -2748,7 +2708,6 @@ NodeMetaInfo NodeMetaInfo::basedOn([[maybe_unused]] const NodeMetaInfo &metaInfo if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"based on 1 node meta info", category(), keyValue("type id", m_typeId), @@ -2769,7 +2728,6 @@ NodeMetaInfo NodeMetaInfo::basedOn([[maybe_unused]] const NodeMetaInfo &metaInfo if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"based on 2 node meta infos", category(), keyValue("type id", m_typeId), @@ -2791,7 +2749,6 @@ NodeMetaInfo NodeMetaInfo::basedOn([[maybe_unused]] const NodeMetaInfo &metaInfo if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"based on 3 node meta infos", category(), keyValue("type id", m_typeId), @@ -2814,7 +2771,6 @@ NodeMetaInfo NodeMetaInfo::basedOn([[maybe_unused]] const NodeMetaInfo &metaInfo if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"based on 4 node meta infos", category(), keyValue("type id", m_typeId), @@ -2842,7 +2798,6 @@ NodeMetaInfo NodeMetaInfo::basedOn([[maybe_unused]] const NodeMetaInfo &metaInfo if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"based on 5 node meta infos", category(), keyValue("type id", m_typeId), @@ -2872,7 +2827,6 @@ NodeMetaInfo NodeMetaInfo::basedOn([[maybe_unused]] const NodeMetaInfo &metaInfo if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"based on 6 node meta infos", category(), keyValue("type id", m_typeId), @@ -2904,7 +2858,6 @@ NodeMetaInfo NodeMetaInfo::basedOn([[maybe_unused]] const NodeMetaInfo &metaInfo if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"based on 7 node meta infos", category(), keyValue("type id", m_typeId), @@ -2930,7 +2883,6 @@ bool NodeMetaInfo::isGraphicalItem(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is graphical item", category(), keyValue("type id", m_typeId), @@ -2957,7 +2909,6 @@ bool NodeMetaInfo::isQtObject(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is Qt object", category(), keyValue("type id", m_typeId), @@ -2976,7 +2927,6 @@ bool NodeMetaInfo::isQtQmlConnections([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is Qt Qml connections", category(), keyValue("type id", m_typeId), @@ -2995,7 +2945,6 @@ bool NodeMetaInfo::isLayoutable(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is layoutable", category(), keyValue("type id", m_typeId), @@ -3021,7 +2970,6 @@ bool NodeMetaInfo::isQtQuickLayoutsLayout(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Layouts.Layout", category(), keyValue("type id", m_typeId), @@ -3040,7 +2988,6 @@ bool NodeMetaInfo::isView(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is view", category(), keyValue("type id", m_typeId), @@ -3064,7 +3011,6 @@ bool NodeMetaInfo::usesCustomParser([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info uses custom parser", category(), keyValue("type id", m_typeId), @@ -3099,7 +3045,6 @@ bool NodeMetaInfo::isVector2D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is vector2d", category(), keyValue("type id", m_typeId), @@ -3123,7 +3068,6 @@ bool NodeMetaInfo::isVector3D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is vector3d", category(), keyValue("type id", m_typeId), @@ -3147,7 +3091,6 @@ bool NodeMetaInfo::isVector4D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is vector4d", category(), keyValue("type id", m_typeId), @@ -3171,7 +3114,6 @@ bool NodeMetaInfo::isQtQuickPropertyChanges(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.PropertyChanges", category(), keyValue("type id", m_typeId), @@ -3191,7 +3133,6 @@ bool NodeMetaInfo::isQtSafeRendererSafeRendererPicture(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is Qt.SafeRenderer.SafeRendererPicture", category(), keyValue("type id", m_typeId), @@ -3210,7 +3151,6 @@ bool NodeMetaInfo::isQtSafeRendererSafePicture(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is Qt.SafeRenderer.SafePicture", category(), keyValue("type id", m_typeId), @@ -3229,7 +3169,6 @@ bool NodeMetaInfo::isQtQuickTimelineKeyframe(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Timeline.Keyframe", category(), keyValue("type id", m_typeId), @@ -3249,7 +3188,6 @@ bool NodeMetaInfo::isQtQuickTimelineTimelineAnimation(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Timeline.TimelineAnimation", category(), keyValue("type id", m_typeId), @@ -3268,7 +3206,6 @@ bool NodeMetaInfo::isQtQuickTimelineTimeline(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Timeline.Timeline", category(), keyValue("type id", m_typeId), @@ -3287,7 +3224,6 @@ bool NodeMetaInfo::isQtQuickTimelineKeyframeGroup(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Timeline.KeyframeGroup", category(), keyValue("type id", m_typeId), @@ -3306,7 +3242,6 @@ bool NodeMetaInfo::isListOrGridView(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is list or grid view", category(), keyValue("type id", m_typeId), @@ -3327,7 +3262,6 @@ bool NodeMetaInfo::isNumber(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is number", category(), keyValue("type id", m_typeId), @@ -3355,7 +3289,6 @@ bool NodeMetaInfo::isQtQuickExtrasPicture(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Extras.Picture", category(), keyValue("type id", m_typeId), @@ -3375,7 +3308,6 @@ bool NodeMetaInfo::isQtQuickGradient([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Gradient", category(), keyValue("type id", m_typeId), @@ -3394,7 +3326,6 @@ bool NodeMetaInfo::isQtQuickImage([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Image", category(), keyValue("type id", m_typeId), @@ -3414,7 +3345,6 @@ bool NodeMetaInfo::isQtQuickBorderImage([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.BorderImage", category(), keyValue("type id", m_typeId), @@ -3434,7 +3364,6 @@ bool NodeMetaInfo::isAlias(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is alias", category(), keyValue("type id", m_typeId), @@ -3452,7 +3381,6 @@ bool NodeMetaInfo::isQtQuickPositioner(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Positioner", category(), keyValue("type id", m_typeId), @@ -3472,7 +3400,6 @@ bool NodeMetaInfo::isQtQuickPropertyAnimation(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.PropertyAnimation", category(), keyValue("type id", m_typeId), @@ -3492,7 +3419,6 @@ bool NodeMetaInfo::isQtQuickRectangle([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Rectange", category(), keyValue("type id", m_typeId), @@ -3511,7 +3437,6 @@ bool NodeMetaInfo::isQtQuickRepeater(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Repeater", category(), keyValue("type id", m_typeId), @@ -3530,7 +3455,6 @@ bool NodeMetaInfo::isQtQuickShapesShape(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Shapes.Shape", category(), keyValue("type id", m_typeId), @@ -3549,7 +3473,6 @@ bool NodeMetaInfo::isQtQuickControlsTabBar(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Controls.TabBar", category(), keyValue("type id", m_typeId), @@ -3568,7 +3491,6 @@ bool NodeMetaInfo::isQtQuickControlsLabel([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Controls.SwipeView", category(), keyValue("type id", m_typeId), @@ -3587,7 +3509,6 @@ bool NodeMetaInfo::isQtQuickControlsSwipeView(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Controls.SwipeView", category(), keyValue("type id", m_typeId), @@ -3606,7 +3527,6 @@ bool NodeMetaInfo::isQtQuick3DCamera(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Camera", category(), keyValue("type id", m_typeId), @@ -3625,7 +3545,6 @@ bool NodeMetaInfo::isQtQuick3DBakedLightmap(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.BakedLightmap", category(), keyValue("type id", m_typeId), @@ -3644,7 +3563,6 @@ bool NodeMetaInfo::isQtQuick3DBuffer(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Buffer", category(), keyValue("type id", m_typeId), @@ -3663,7 +3581,6 @@ bool NodeMetaInfo::isQtQuick3DInstanceListEntry(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.InstanceListEntry", category(), keyValue("type id", m_typeId), @@ -3682,7 +3599,6 @@ bool NodeMetaInfo::isQtQuick3DLight(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Light", category(), keyValue("type id", m_typeId), @@ -3701,7 +3617,6 @@ bool NodeMetaInfo::isQtQmlModelsListElement(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQml.Models.ListElement", category(), keyValue("type id", m_typeId), @@ -3720,7 +3635,6 @@ bool NodeMetaInfo::isQtQuickListModel(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.ListModel", category(), keyValue("type id", m_typeId), @@ -3739,7 +3653,6 @@ bool NodeMetaInfo::isQtQuickListView(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.ListView", category(), keyValue("type id", m_typeId), @@ -3758,7 +3671,6 @@ bool QmlDesigner::NodeMetaInfo::isQtQuickGridView(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.GridView", category(), keyValue("type id", m_typeId), @@ -3777,7 +3689,6 @@ bool NodeMetaInfo::isQtQuick3DInstanceList(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.InstanceList", category(), keyValue("type id", m_typeId), @@ -3796,7 +3707,6 @@ bool NodeMetaInfo::isQtQuick3DParticles3DParticle3D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Particles3D.Particle3D", category(), keyValue("type id", m_typeId), @@ -3815,7 +3725,6 @@ bool NodeMetaInfo::isQtQuick3DParticles3DParticleEmitter3D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Particles3D.ParticleEmitter3D", category(), keyValue("type id", m_typeId), @@ -3835,7 +3744,6 @@ bool NodeMetaInfo::isQtQuick3DParticles3DAttractor3D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Particles3D.Attractor3D", category(), keyValue("type id", m_typeId), @@ -3854,7 +3762,6 @@ bool NodeMetaInfo::isQtQuick3DParticlesAbstractShape(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Particles3D.AbstractShape", category(), keyValue("type id", m_typeId), @@ -3874,7 +3781,6 @@ bool NodeMetaInfo::isQtQuickItem(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Item", category(), keyValue("type id", m_typeId), @@ -3893,7 +3799,6 @@ bool NodeMetaInfo::isQtQuickPath(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Path", category(), keyValue("type id", m_typeId), @@ -3912,7 +3817,6 @@ bool NodeMetaInfo::isQtQuickPauseAnimation(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.PauseAnimation", category(), keyValue("type id", m_typeId), @@ -3931,7 +3835,6 @@ bool NodeMetaInfo::isQtQuickTransition(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Transition", category(), keyValue("type id", m_typeId), @@ -3950,7 +3853,6 @@ bool NodeMetaInfo::isQtQuickWindowWindow(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Window.Window", category(), keyValue("type id", m_typeId), @@ -3969,7 +3871,6 @@ bool NodeMetaInfo::isQtQuickLoader(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Loader", category(), keyValue("type id", m_typeId), @@ -3988,7 +3889,6 @@ bool NodeMetaInfo::isQtQuickState(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.State", category(), keyValue("type id", m_typeId), @@ -4007,7 +3907,6 @@ bool NodeMetaInfo::isQtQuickStateGroup(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.StateGroup", category(), keyValue("type id", m_typeId), @@ -4026,7 +3925,6 @@ bool NodeMetaInfo::isQtQuickStateOperation(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.StateOperation", category(), keyValue("type id", m_typeId), @@ -4046,7 +3944,6 @@ bool NodeMetaInfo::isQtQuickStudioComponentsArcItem(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Studio.Components.ArcItem", category(), keyValue("type id", m_typeId), @@ -4065,7 +3962,6 @@ bool NodeMetaInfo::isQtQuickText(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Text", category(), keyValue("type id", m_typeId), @@ -4084,7 +3980,6 @@ bool NodeMetaInfo::isQtMultimediaSoundEffect(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtMultimedia.SoundEffect", category(), keyValue("type id", m_typeId), @@ -4103,7 +3998,6 @@ bool NodeMetaInfo::isFlowViewItem(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is FlowView.ViewItem", category(), keyValue("type id", m_typeId), @@ -4127,7 +4021,6 @@ bool NodeMetaInfo::isFlowViewFlowItem(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is FlowView.FlowItem", category(), keyValue("type id", m_typeId), @@ -4146,7 +4039,6 @@ bool NodeMetaInfo::isFlowViewFlowView(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is FlowView.FlowView", category(), keyValue("type id", m_typeId), @@ -4175,7 +4067,6 @@ bool NodeMetaInfo::isFlowViewFlowTransition(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is FlowView.FlowTransition", category(), keyValue("type id", m_typeId), @@ -4194,7 +4085,6 @@ bool NodeMetaInfo::isFlowViewFlowDecision(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is FlowView.FlowDecision", category(), keyValue("type id", m_typeId), @@ -4213,7 +4103,6 @@ bool NodeMetaInfo::isFlowViewFlowWildcard(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is FlowView.FlowWildcard", category(), keyValue("type id", m_typeId), @@ -4232,7 +4121,6 @@ bool NodeMetaInfo::isQtQuickStudioComponentsGroupItem(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Studio.Components.GroupItem", category(), keyValue("type id", m_typeId), @@ -4251,7 +4139,6 @@ bool NodeMetaInfo::isQtQuickStudioComponentsSvgPathItem(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Studio.Components.SvgPathItem", category(), keyValue("type id", m_typeId), @@ -4270,7 +4157,6 @@ bool NodeMetaInfo::isQtQuickStudioUtilsJsonListModel(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick.Studio.Utils.JsonListModel", category(), keyValue("type id", m_typeId), @@ -4290,7 +4176,6 @@ bool NodeMetaInfo::isQmlComponent([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QML.Component", category(), keyValue("type id", m_typeId), @@ -4314,7 +4199,6 @@ bool NodeMetaInfo::isFont([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is font", category(), keyValue("type id", m_typeId), @@ -4333,7 +4217,6 @@ bool NodeMetaInfo::isColor([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is color", category(), keyValue("type id", m_typeId), @@ -4357,7 +4240,6 @@ bool NodeMetaInfo::isBool([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is bool", category(), keyValue("type id", m_typeId), @@ -4381,7 +4263,6 @@ bool NodeMetaInfo::isInteger([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is integer", category(), keyValue("type id", m_typeId), @@ -4405,7 +4286,6 @@ bool NodeMetaInfo::isFloat([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is float", category(), keyValue("type id", m_typeId), @@ -4432,7 +4312,6 @@ bool NodeMetaInfo::isVariant([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is variant", category(), keyValue("type id", m_typeId), @@ -4456,7 +4335,6 @@ bool NodeMetaInfo::isString([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is string", category(), keyValue("type id", m_typeId), @@ -4480,7 +4358,6 @@ bool NodeMetaInfo::isUrl([[maybe_unused]] SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is url", category(), keyValue("type id", m_typeId), @@ -4504,7 +4381,6 @@ bool NodeMetaInfo::isQtQuick3DTexture(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Texture", category(), keyValue("type id", m_typeId), @@ -4524,7 +4400,6 @@ bool NodeMetaInfo::isQtQuick3DShader(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Shader", category(), keyValue("type id", m_typeId), @@ -4543,7 +4418,6 @@ bool NodeMetaInfo::isQtQuick3DPass(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Pass", category(), keyValue("type id", m_typeId), @@ -4562,7 +4436,6 @@ bool NodeMetaInfo::isQtQuick3DCommand(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Command", category(), keyValue("type id", m_typeId), @@ -4581,7 +4454,6 @@ bool NodeMetaInfo::isQtQuick3DDefaultMaterial(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.DefaultMaterial", category(), keyValue("type id", m_typeId), @@ -4610,7 +4482,6 @@ bool NodeMetaInfo::isQtQuick3DModel(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Model", category(), keyValue("type id", m_typeId), @@ -4629,7 +4500,6 @@ bool NodeMetaInfo::isQtQuick3DNode(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Node", category(), keyValue("type id", m_typeId), @@ -4648,7 +4518,6 @@ bool NodeMetaInfo::isQtQuick3DObject3D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is QtQuick3D.Object3D", category(), keyValue("type id", m_typeId), @@ -4667,7 +4536,6 @@ bool NodeMetaInfo::isQtQuick3DParticles3DAffector3D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Particles3D.Affector3D", category(), keyValue("type id", m_typeId), @@ -4686,7 +4554,6 @@ bool NodeMetaInfo::isQtQuick3DView3D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.View3D", category(), keyValue("type id", m_typeId), @@ -4705,7 +4572,6 @@ bool NodeMetaInfo::isQtQuick3DPrincipledMaterial(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.PrincipledMaterial", category(), keyValue("type id", m_typeId), @@ -4724,7 +4590,6 @@ bool NodeMetaInfo::isQtQuick3DSpecularGlossyMaterial(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.SpecularGlossyMaterial", category(), keyValue("type id", m_typeId), @@ -4743,7 +4608,6 @@ bool NodeMetaInfo::isQtQuick3DParticles3DSpriteParticle3D(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Particles3D.SpriteParticle3D", category(), keyValue("type id", m_typeId), @@ -4763,7 +4627,6 @@ bool NodeMetaInfo::isQtQuick3DTextureInput(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.TextureInput", category(), keyValue("type id", m_typeId), @@ -4782,7 +4645,6 @@ bool NodeMetaInfo::isQtQuick3DCubeMapTexture(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.CubeMapTexture", category(), keyValue("type id", m_typeId), @@ -4803,7 +4665,6 @@ bool NodeMetaInfo::isQtQuick3DSceneEnvironment(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.SceneEnvironment", category(), keyValue("type id", m_typeId), @@ -4822,7 +4683,6 @@ bool NodeMetaInfo::isQtQuick3DEffect(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is QtQuick3D.Effect", category(), keyValue("type id", m_typeId), @@ -4841,7 +4701,6 @@ bool NodeMetaInfo::isEnumeration(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is enumeration", category(), keyValue("type id", m_typeId), @@ -4876,7 +4735,6 @@ NodeMetaInfo PropertyMetaInfo::propertyType() const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get property type", category(), keyValue("property declaration id", m_id)}; @@ -4899,7 +4757,6 @@ NodeMetaInfo PropertyMetaInfo::type() const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get property owner type ", category(), keyValue("property declaration id", m_id)}; @@ -4916,7 +4773,6 @@ PropertyName PropertyMetaInfo::name() const return {}; if constexpr (useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info get property name", category(), keyValue("property declaration id", m_id)}; @@ -4933,7 +4789,6 @@ bool PropertyMetaInfo::isWritable() const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is property writable", category(), keyValue("property declaration id", m_id)}; @@ -4950,7 +4805,6 @@ bool PropertyMetaInfo::isReadOnly() const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is property read only", category(), keyValue("property declaration id", m_id)}; @@ -4967,7 +4821,6 @@ bool PropertyMetaInfo::isListProperty() const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is list property", category(), keyValue("property declaration id", m_id)}; @@ -4984,7 +4837,6 @@ bool PropertyMetaInfo::isEnumType() const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is enum type", category(), keyValue("property has enumeration type", m_id)}; @@ -5001,7 +4853,6 @@ bool PropertyMetaInfo::isPrivate() const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is private property", category(), keyValue("property declaration id", m_id)}; @@ -5018,7 +4869,6 @@ bool PropertyMetaInfo::isPointer() const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info is pointer property", category(), keyValue("property declaration id", m_id)}; @@ -5043,7 +4893,6 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &value) const return {}; if constexpr (!useProjectStorage()) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"node meta info cast value", category(), keyValue("property declaration id", m_id)}; diff --git a/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp index 65b96a17ccb..41b01ac9be7 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/modelnode.cpp @@ -20,6 +20,7 @@ namespace QmlDesigner { using namespace QmlDesigner::Internal; +using NanotraceHR::keyValue; static auto category = ModelTracing::category; @@ -68,7 +69,6 @@ QString ModelNode::id(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node id", category(), keyValue("model node", *this), @@ -137,7 +137,6 @@ bool ModelNode::hasId(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has id", category(), keyValue("model node", *this), @@ -151,7 +150,6 @@ void ModelNode::setIdWithRefactoring(const QString &id, SL sl) const if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set id with refactoring", category(), keyValue("model node", *this), @@ -171,7 +169,6 @@ void ModelNode::setIdWithoutRefactoring(const QString &id, SL sl) const if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set id without refactoring", category(), keyValue("model node", *this), @@ -197,7 +194,6 @@ TypeName ModelNode::type(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node type", category(), keyValue("model node", *this), @@ -214,7 +210,6 @@ int ModelNode::minorVersion(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node minor version", category(), keyValue("model node", *this), @@ -231,7 +226,6 @@ int ModelNode::majorVersion(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node major version", category(), keyValue("model node", *this), @@ -246,7 +240,6 @@ QString ModelNode::simplifiedTypeName(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node simplified type name", category(), keyValue("model node", *this), @@ -289,7 +282,6 @@ bool ModelNode::isInHierarchy(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node is in hierarchy", category(), keyValue("model node", *this), @@ -316,7 +308,6 @@ NodeAbstractProperty ModelNode::parentProperty(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node parent property", category(), keyValue("model node", *this), @@ -354,7 +345,6 @@ void ModelNode::setParentProperty(NodeAbstractProperty parent, SL sl) if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set parent property", category(), keyValue("model node", *this), @@ -377,7 +367,6 @@ void ModelNode::changeType(const TypeName &typeName, int majorVersion, int minor if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node change type", category(), keyValue("model node", *this), @@ -405,7 +394,6 @@ bool ModelNode::hasParentProperty(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has parent property", category(), keyValue("model node", *this), @@ -445,7 +433,6 @@ SignalHandlerProperty ModelNode::signalHandlerProperty(PropertyNameView name, SL if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node signal handler property", category(), keyValue("model node", *this), @@ -459,7 +446,6 @@ SignalDeclarationProperty ModelNode::signalDeclarationProperty(PropertyNameView if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node signal declaration property", category(), keyValue("model node", *this), @@ -483,7 +469,6 @@ NodeProperty ModelNode::nodeProperty(PropertyNameView name, SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node node property", category(), keyValue("model node", *this), @@ -507,7 +492,6 @@ NodeListProperty ModelNode::nodeListProperty(PropertyNameView name, SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node node list property", category(), keyValue("model node", *this), @@ -521,7 +505,6 @@ NodeAbstractProperty ModelNode::nodeAbstractProperty(PropertyNameView name, SL s if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node node abstract property", category(), keyValue("model node", *this), @@ -588,7 +571,6 @@ AbstractProperty ModelNode::property(PropertyNameView name, SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node property", category(), keyValue("model node", *this), @@ -617,7 +599,6 @@ QList ModelNode::properties(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node properties", category(), keyValue("model node", *this), @@ -642,7 +623,6 @@ The list of all properties containing just an atomic value. */ QList ModelNode::variantProperties(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node variant property", category(), keyValue("model node", *this), @@ -653,7 +633,6 @@ QList ModelNode::variantProperties(SL sl) const QList ModelNode::nodeAbstractProperties(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node node abstract property", category(), keyValue("model node", *this), @@ -664,7 +643,6 @@ QList ModelNode::nodeAbstractProperties(SL sl) const QList ModelNode::nodeProperties(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node node property", category(), keyValue("model node", *this), @@ -675,7 +653,6 @@ QList ModelNode::nodeProperties(SL sl) const QList ModelNode::nodeListProperties(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node node list property", category(), keyValue("model node", *this), @@ -692,7 +669,6 @@ The list of all properties containing an expression. */ QList ModelNode::bindingProperties(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node binding property", category(), keyValue("model node", *this), @@ -703,7 +679,6 @@ QList ModelNode::bindingProperties(SL sl) const QList ModelNode::signalProperties(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node signal handler property", category(), keyValue("model node", *this), @@ -717,7 +692,6 @@ QList ModelNode::dynamicProperties(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node dynamic property", category(), keyValue("model node", *this), @@ -748,7 +722,6 @@ void ModelNode::removeProperty(PropertyNameView name, SL sl) const if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node remove property", category(), keyValue("model node", *this), @@ -795,7 +768,6 @@ void ModelNode::destroy(SL sl) if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node destroy", category(), keyValue("model node", *this), @@ -840,7 +812,6 @@ QList ModelNode::directSubModelNodes(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node direct sub model nodes", category(), keyValue("model node", *this), @@ -851,7 +822,6 @@ QList ModelNode::directSubModelNodes(SL sl) const QList ModelNode::directSubModelNodesOfType(const NodeMetaInfo &type, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node direct sub model nodes of type", category(), keyValue("model node", *this), @@ -864,7 +834,6 @@ QList ModelNode::directSubModelNodesOfType(const NodeMetaInfo &type, QList ModelNode::subModelNodesOfType(const NodeMetaInfo &type, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node sub model nodes of type", category(), keyValue("model node", *this), @@ -887,7 +856,6 @@ QList ModelNode::allSubModelNodes(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node all sub model nodes", category(), keyValue("model node", *this), @@ -898,7 +866,6 @@ QList ModelNode::allSubModelNodes(SL sl) const QList ModelNode::allSubModelNodesAndThisNode(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node all sub model nodes and this node", category(), keyValue("model node", *this), @@ -919,7 +886,6 @@ QList ModelNode::allSubModelNodesAndThisNode(SL sl) const bool ModelNode::hasAnySubModelNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has any sub model nodes", category(), keyValue("model node", *this), @@ -934,7 +900,7 @@ NodeMetaInfo ModelNode::metaInfo([[maybe_unused]] SL sl) const return {}; #ifdef QDS_USE_PROJECTSTORAGE - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"model node meta info", category(), keyValue("model node", *this), @@ -954,7 +920,6 @@ bool ModelNode::hasMetaInfo(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has meta info", category(), keyValue("model node", *this), @@ -971,7 +936,6 @@ bool ModelNode::isSelected(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node is selected", category(), keyValue("model node", *this), @@ -988,7 +952,6 @@ bool ModelNode::isRootNode(SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node is root node", category(), keyValue("model node", *this), @@ -1009,7 +972,6 @@ PropertyNameList ModelNode::propertyNames(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node property names", category(), keyValue("model node", *this), @@ -1045,7 +1007,6 @@ QList ModelNode::properties(PropertyType... type) const */ bool ModelNode::hasProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has property", category(), keyValue("model node", *this), @@ -1056,7 +1017,6 @@ bool ModelNode::hasProperty(PropertyNameView name, SL sl) const bool ModelNode::hasVariantProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has variant property", category(), keyValue("model node", *this), @@ -1067,7 +1027,6 @@ bool ModelNode::hasVariantProperty(PropertyNameView name, SL sl) const bool ModelNode::hasBindingProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has binding property", category(), keyValue("model node", *this), @@ -1078,7 +1037,6 @@ bool ModelNode::hasBindingProperty(PropertyNameView name, SL sl) const bool ModelNode::hasSignalHandlerProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has signal handler property", category(), keyValue("model node", *this), @@ -1092,7 +1050,6 @@ bool ModelNode::hasNodeAbstractProperty(PropertyNameView name, SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has node abstract property", category(), keyValue("model node", *this), @@ -1106,7 +1063,6 @@ bool ModelNode::hasNodeAbstractProperty(PropertyNameView name, SL sl) const bool ModelNode::hasDefaultNodeAbstractProperty(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has default node abstract property", category(), keyValue("model node", *this), @@ -1118,7 +1074,6 @@ bool ModelNode::hasDefaultNodeAbstractProperty(SL sl) const bool ModelNode::hasDefaultNodeListProperty(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has default node list property", category(), keyValue("model node", *this), @@ -1130,7 +1085,6 @@ bool ModelNode::hasDefaultNodeListProperty(SL sl) const bool ModelNode::hasDefaultNodeProperty(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has default node property", category(), keyValue("model node", *this), @@ -1142,7 +1096,6 @@ bool ModelNode::hasDefaultNodeProperty(SL sl) const bool ModelNode::hasNodeProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has node property", category(), keyValue("model node", *this), @@ -1153,7 +1106,6 @@ bool ModelNode::hasNodeProperty(PropertyNameView name, SL sl) const bool ModelNode::hasNodeListProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has node list property", category(), keyValue("model node", *this), @@ -1167,7 +1119,6 @@ bool ModelNode::hasProperty(PropertyNameView name, PropertyType propertyType, SL if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has property", category(), keyValue("model node", *this), @@ -1195,7 +1146,6 @@ static bool recursiveAncestor(const ModelNode &possibleAncestor, const ModelNode bool ModelNode::isAncestorOf(const ModelNode &node, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node is ancestor of", category(), keyValue("model node", *this), @@ -1234,7 +1184,6 @@ void ModelNode::selectNode(SL sl) if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node select node", category(), keyValue("model node", *this), @@ -1251,7 +1200,6 @@ void ModelNode::deselectNode(SL sl) if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node deselect node", category(), keyValue("model node", *this), @@ -1269,7 +1217,6 @@ int ModelNode::variantTypeId() QVariant ModelNode::toVariant(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node to variant", category(), keyValue("model node", *this), @@ -1283,7 +1230,6 @@ std::optional ModelNode::auxiliaryData(AuxiliaryDataKeyView key, SL sl if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node auxiliary data", category(), keyValue("model node", *this), @@ -1299,7 +1245,6 @@ std::optional ModelNode::auxiliaryData(AuxiliaryDataType type, if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node auxiliary data with name", category(), keyValue("model node", *this), @@ -1315,7 +1260,6 @@ QVariant ModelNode::auxiliaryDataWithDefault(AuxiliaryDataType type, if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node auxiliary data with default 1", category(), keyValue("model node", *this), @@ -1329,7 +1273,6 @@ QVariant ModelNode::auxiliaryDataWithDefault(AuxiliaryDataKeyView key, SL sl) co if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node auxiliary data with default 2", category(), keyValue("model node", *this), @@ -1348,7 +1291,6 @@ QVariant ModelNode::auxiliaryDataWithDefault(AuxiliaryDataKeyDefaultValue key, S if (!isValid()) return toQVariant(key.defaultValue); - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node auxiliary data with default 3", category(), keyValue("model node", *this), @@ -1367,7 +1309,6 @@ void ModelNode::setAuxiliaryData(AuxiliaryDataType type, const QVariant &data, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set auxiliary data with type", category(), keyValue("model node", *this), @@ -1381,7 +1322,6 @@ void ModelNode::setAuxiliaryData(AuxiliaryDataKeyView key, const QVariant &data, if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set auxiliary data with key", category(), keyValue("model node", *this), @@ -1398,7 +1338,6 @@ void ModelNode::setAuxiliaryDataWithoutLock(AuxiliaryDataKeyView key, const QVar if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set auxiliary data without lock with key", category(), keyValue("model node", *this), @@ -1418,7 +1357,6 @@ void ModelNode::setAuxiliaryDataWithoutLock(AuxiliaryDataType type, if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set auxiliary data without lock with type", category(), keyValue("model node", *this), @@ -1435,7 +1373,6 @@ void ModelNode::removeAuxiliaryData(AuxiliaryDataKeyView key, SL sl) const if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node remove auxiliary data with key", category(), keyValue("model node", *this), @@ -1450,7 +1387,6 @@ void ModelNode::removeAuxiliaryData(AuxiliaryDataKeyView key, SL sl) const void ModelNode::removeAuxiliaryData(AuxiliaryDataType type, Utils::SmallStringView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node remove auxiliary data with type", category(), keyValue("model node", *this), @@ -1464,7 +1400,6 @@ bool ModelNode::hasAuxiliaryData(AuxiliaryDataKeyView key, SL sl) const if (!isValid()) return false; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has auxiliary data with key", category(), keyValue("model node", *this), @@ -1475,7 +1410,6 @@ bool ModelNode::hasAuxiliaryData(AuxiliaryDataKeyView key, SL sl) const bool ModelNode::hasAuxiliaryData(AuxiliaryDataType type, Utils::SmallStringView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has auxiliary data with type", category(), keyValue("model node", *this), @@ -1489,7 +1423,7 @@ bool ModelNode::hasAuxiliaryData(AuxiliaryDataType type) const if (!isValid()) return false; - // using NanotraceHR::keyValue; + // // NanotraceHR::Tracer tracer{"model node has auxiliary data with type", // category(), // keyValue("model node", *this), @@ -1503,7 +1437,6 @@ AuxiliaryDatasForType ModelNode::auxiliaryData(AuxiliaryDataType type, SL sl) co if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node auxiliary data with type", category(), keyValue("model node", *this), @@ -1517,7 +1450,6 @@ AuxiliaryDatasView ModelNode::auxiliaryData(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node auxiliary data with sl", category(), keyValue("model node", *this), @@ -1530,7 +1462,6 @@ QString ModelNode::customId(SL sl) const { auto data = auxiliaryData(customIdProperty); - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node custom id", category(), keyValue("model node", *this), @@ -1544,7 +1475,6 @@ QString ModelNode::customId(SL sl) const bool ModelNode::hasCustomId(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has custom id", category(), keyValue("model node", *this), @@ -1555,7 +1485,6 @@ bool ModelNode::hasCustomId(SL sl) const void ModelNode::setCustomId(const QString &str, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set custom id", category(), keyValue("model node", *this), @@ -1566,7 +1495,6 @@ void ModelNode::setCustomId(const QString &str, SL sl) void ModelNode::removeCustomId(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node remove custom id", category(), keyValue("model node", *this), @@ -1577,7 +1505,6 @@ void ModelNode::removeCustomId(SL sl) QVector ModelNode::comments(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node comments", category(), keyValue("model node", *this), @@ -1588,7 +1515,6 @@ QVector ModelNode::comments(SL sl) const bool ModelNode::hasComments(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has comments", category(), keyValue("model node", *this), @@ -1599,7 +1525,6 @@ bool ModelNode::hasComments(SL sl) const void ModelNode::setComments(const QVector &coms, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set comments", category(), keyValue("model node", *this), @@ -1613,7 +1538,6 @@ void ModelNode::setComments(const QVector &coms, SL sl) void ModelNode::addComment(const Comment &com, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node add comment", category(), keyValue("model node", *this), @@ -1627,7 +1551,6 @@ void ModelNode::addComment(const Comment &com, SL sl) bool ModelNode::updateComment(const Comment &com, int position, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node update comment", category(), keyValue("model node", *this), @@ -1648,7 +1571,6 @@ bool ModelNode::updateComment(const Comment &com, int position, SL sl) Annotation ModelNode::annotation(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node annotation", category(), keyValue("model node", *this), @@ -1664,7 +1586,6 @@ Annotation ModelNode::annotation(SL sl) const bool ModelNode::hasAnnotation(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has annotation", category(), keyValue("model node", *this), @@ -1675,7 +1596,6 @@ bool ModelNode::hasAnnotation(SL sl) const void ModelNode::setAnnotation(const Annotation &annotation, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set annotation", category(), keyValue("model node", *this), @@ -1686,7 +1606,6 @@ void ModelNode::setAnnotation(const Annotation &annotation, SL sl) void ModelNode::removeAnnotation(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node remove annotation", category(), keyValue("model node", *this), @@ -1697,7 +1616,6 @@ void ModelNode::removeAnnotation(SL sl) Annotation ModelNode::globalAnnotation(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node global annotation", category(), keyValue("model node", *this), @@ -1716,7 +1634,6 @@ Annotation ModelNode::globalAnnotation(SL sl) const bool ModelNode::hasGlobalAnnotation(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has global annotation", category(), keyValue("model node", *this), @@ -1727,7 +1644,6 @@ bool ModelNode::hasGlobalAnnotation(SL sl) const void ModelNode::setGlobalAnnotation(const Annotation &annotation, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set global annotation", category(), keyValue("model node", *this), @@ -1738,7 +1654,6 @@ void ModelNode::setGlobalAnnotation(const Annotation &annotation, SL sl) void ModelNode::removeGlobalAnnotation(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node remove global annotation", category(), keyValue("model node", *this), @@ -1749,7 +1664,6 @@ void ModelNode::removeGlobalAnnotation(SL sl) GlobalAnnotationStatus ModelNode::globalStatus(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node global status", category(), keyValue("model node", *this), @@ -1768,7 +1682,6 @@ GlobalAnnotationStatus ModelNode::globalStatus(SL sl) const bool ModelNode::hasGlobalStatus(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has global status", category(), keyValue("model node", *this), @@ -1779,7 +1692,6 @@ bool ModelNode::hasGlobalStatus(SL sl) const void ModelNode::setGlobalStatus(const GlobalAnnotationStatus &status, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set global status", category(), keyValue("model node", *this), @@ -1791,7 +1703,6 @@ void ModelNode::setGlobalStatus(const GlobalAnnotationStatus &status, SL sl) void ModelNode::removeGlobalStatus(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node remove global status", category(), keyValue("model node", *this), @@ -1804,7 +1715,6 @@ void ModelNode::removeGlobalStatus(SL sl) bool ModelNode::locked(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node locked", category(), keyValue("model node", *this), @@ -1820,7 +1730,6 @@ bool ModelNode::locked(SL sl) const bool ModelNode::hasLocked(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node has locked", category(), keyValue("model node", *this), @@ -1831,7 +1740,6 @@ bool ModelNode::hasLocked(SL sl) const void ModelNode::setLocked(bool value, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set locked", category(), keyValue("model node", *this), @@ -1855,7 +1763,6 @@ void ModelNode::setScriptFunctions(const QStringList &scriptFunctionList, SL sl) if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set script functions", category(), keyValue("model node", *this), @@ -1869,7 +1776,6 @@ QStringList ModelNode::scriptFunctions(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node script functions", category(), keyValue("model node", *this), @@ -1883,7 +1789,6 @@ qint32 ModelNode::internalId(SL sl) const if (!m_internalNode) return -1; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node internal id", category(), keyValue("model node", *this), @@ -1899,7 +1804,6 @@ void ModelNode::setNodeSource(const QString &newNodeSource, SL sl) if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set node source", category(), keyValue("model node", *this), @@ -1918,7 +1822,6 @@ void ModelNode::setNodeSource(const QString &newNodeSource, NodeSourceType type, if (!isValid()) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node set node source with type", category(), keyValue("model node", *this), @@ -1936,7 +1839,6 @@ QString ModelNode::nodeSource(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node node source", category(), keyValue("model node", *this), @@ -1950,7 +1852,6 @@ QString ModelNode::convertTypeToImportAlias(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node convert type to import alias", category(), keyValue("model node", *this), @@ -1967,7 +1868,6 @@ ModelNode::NodeSourceType ModelNode::nodeSourceType(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node node source type", category(), keyValue("model node", *this), @@ -1981,7 +1881,6 @@ bool ModelNode::isComponent(SL sl) const if (!isValid()) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node is component", category(), keyValue("model node", *this), @@ -2044,7 +1943,6 @@ QIcon ModelNode::typeIcon([[maybe_unused]] SL sl) const if (!isValid()) return QIcon(QStringLiteral(":/ItemLibrary/images/item-invalid-icon.png")); - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node type icon", category(), keyValue("model node", *this), @@ -2076,7 +1974,6 @@ QString ModelNode::behaviorPropertyName(SL sl) const if (!m_internalNode) return {}; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"model node behavior property name", category(), keyValue("model node", *this), diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp index 15598ca45ed..1a39ea02e6e 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp @@ -10,6 +10,7 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; using Storage::Synchronization::EnumerationDeclaration; using Storage::Synchronization::Type; using Storage::Synchronization::TypeAnnotation; @@ -1390,7 +1391,6 @@ void ProjectStorage::synchronize(Storage::Synchronization::SynchronizationPackag void ProjectStorage::synchronizeDocumentImports(Storage::Imports imports, SourceId sourceId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"synchronize document imports", projectStorageCategory(), keyValue("imports", imports), @@ -1432,7 +1432,6 @@ void ProjectStorage::removeObserver(ProjectStorageObserver *observer) ModuleId ProjectStorage::moduleId(Utils::SmallStringView moduleName, Storage::ModuleKind kind) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get module id", projectStorageCategory(), keyValue("module name", moduleName), @@ -1451,7 +1450,6 @@ ModuleId ProjectStorage::moduleId(Utils::SmallStringView moduleName, Storage::Mo SmallModuleIds<128> ProjectStorage::moduleIdsStartsWith(Utils::SmallStringView startsWith, Storage::ModuleKind kind) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get module ids that starts with", projectStorageCategory(), keyValue("module name starts with", startsWith), @@ -1471,7 +1469,6 @@ SmallModuleIds<128> ProjectStorage::moduleIdsStartsWith(Utils::SmallStringView s Storage::Module ProjectStorage::module(ModuleId moduleId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get module name", projectStorageCategory(), keyValue("module id", moduleId)}; @@ -1491,7 +1488,6 @@ TypeId ProjectStorage::typeId(ModuleId moduleId, Utils::SmallStringView exportedTypeName, Storage::Version version) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get type id by exported name", projectStorageCategory(), keyValue("module id", moduleId), @@ -1520,7 +1516,6 @@ TypeId ProjectStorage::typeId(ModuleId moduleId, TypeId ProjectStorage::typeId(ImportedTypeNameId typeNameId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get type id by imported type name", projectStorageCategory(), keyValue("imported type name id", typeNameId)}; @@ -1534,7 +1529,6 @@ TypeId ProjectStorage::typeId(ImportedTypeNameId typeNameId) const QVarLengthArray ProjectStorage::typeIds(ModuleId moduleId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get type ids by module id", projectStorageCategory(), keyValue("module id", moduleId)}; @@ -1549,7 +1543,6 @@ QVarLengthArray ProjectStorage::typeIds(ModuleId moduleId) const SmallTypeIds<256> ProjectStorage::singletonTypeIds(SourceId sourceId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get singleton type ids by source id", projectStorageCategory(), keyValue("source id", sourceId)}; @@ -1564,7 +1557,6 @@ SmallTypeIds<256> ProjectStorage::singletonTypeIds(SourceId sourceId) const Storage::Info::ExportedTypeNames ProjectStorage::exportedTypeNames(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get exported type names by type id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1579,7 +1571,6 @@ Storage::Info::ExportedTypeNames ProjectStorage::exportedTypeNames(TypeId typeId Storage::Info::ExportedTypeNames ProjectStorage::exportedTypeNames(TypeId typeId, SourceId sourceId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get exported type names by source id", projectStorageCategory(), keyValue("type id", typeId), @@ -1596,7 +1587,6 @@ Storage::Info::ExportedTypeNames ProjectStorage::exportedTypeNames(TypeId typeId ImportId ProjectStorage::importId(const Storage::Import &import) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get import id by import", projectStorageCategory(), keyValue("import", import)}; @@ -1613,7 +1603,6 @@ ImportId ProjectStorage::importId(const Storage::Import &import) const ImportedTypeNameId ProjectStorage::importedTypeNameId(ImportId importId, Utils::SmallStringView typeName) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get imported type name id by import id", projectStorageCategory(), keyValue("import id", importId), @@ -1633,7 +1622,6 @@ ImportedTypeNameId ProjectStorage::importedTypeNameId(ImportId importId, ImportedTypeNameId ProjectStorage::importedTypeNameId(SourceId sourceId, Utils::SmallStringView typeName) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get imported type name id by source id", projectStorageCategory(), keyValue("source id", sourceId), @@ -1652,7 +1640,6 @@ ImportedTypeNameId ProjectStorage::importedTypeNameId(SourceId sourceId, QVarLengthArray ProjectStorage::propertyDeclarationIds(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get property declaration ids", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1670,7 +1657,6 @@ QVarLengthArray ProjectStorage::propertyDeclarationI QVarLengthArray ProjectStorage::localPropertyDeclarationIds(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get local property declaration ids", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1687,7 +1673,6 @@ QVarLengthArray ProjectStorage::localPropertyDeclara PropertyDeclarationId ProjectStorage::propertyDeclarationId(TypeId typeId, Utils::SmallStringView propertyName) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get property declaration id", projectStorageCategory(), keyValue("type id", typeId), @@ -1705,7 +1690,6 @@ PropertyDeclarationId ProjectStorage::propertyDeclarationId(TypeId typeId, PropertyDeclarationId ProjectStorage::localPropertyDeclarationId(TypeId typeId, Utils::SmallStringView propertyName) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get local property declaration id", projectStorageCategory(), keyValue("type id", typeId), @@ -1722,7 +1706,6 @@ PropertyDeclarationId ProjectStorage::localPropertyDeclarationId(TypeId typeId, PropertyDeclarationId ProjectStorage::defaultPropertyDeclarationId(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get default property declaration id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1739,7 +1722,6 @@ PropertyDeclarationId ProjectStorage::defaultPropertyDeclarationId(TypeId typeId std::optional ProjectStorage::propertyDeclaration( PropertyDeclarationId propertyDeclarationId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get property declaration", projectStorageCategory(), keyValue("property declaration id", propertyDeclarationId)}; @@ -1755,7 +1737,6 @@ std::optional ProjectStorage::propertyDeclar std::optional ProjectStorage::type(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get type", projectStorageCategory(), keyValue("type id", typeId)}; auto type = s->selectInfoTypeByTypeIdStatement.optionalValueWithTransaction( @@ -1768,7 +1749,6 @@ std::optional ProjectStorage::type(TypeId typeId) const Utils::PathString ProjectStorage::typeIconPath(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get type icon path", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1782,7 +1762,6 @@ Utils::PathString ProjectStorage::typeIconPath(TypeId typeId) const Storage::Info::TypeHints ProjectStorage::typeHints(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get type hints", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1797,7 +1776,6 @@ Storage::Info::TypeHints ProjectStorage::typeHints(TypeId typeId) const SmallSourceIds<4> ProjectStorage::typeAnnotationSourceIds(DirectoryPathId directoryId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get type annotaion source ids", projectStorageCategory(), keyValue("source id", directoryId)}; @@ -1812,7 +1790,6 @@ SmallSourceIds<4> ProjectStorage::typeAnnotationSourceIds(DirectoryPathId direct SmallDirectoryPathIds<64> ProjectStorage::typeAnnotationDirectoryIds() const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get type annotaion source ids", projectStorageCategory()}; auto sourceIds = s->selectTypeAnnotationDirectoryIdsStatement @@ -1825,7 +1802,6 @@ SmallDirectoryPathIds<64> ProjectStorage::typeAnnotationDirectoryIds() const Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get item library entries by type id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1860,7 +1836,6 @@ Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(TypeId type Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(ImportId importId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get item library entries by import id", projectStorageCategory(), keyValue("import id", importId)}; @@ -1902,7 +1877,6 @@ bool isCapitalLetter(char c) Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(SourceId sourceId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get item library entries by source id", projectStorageCategory(), keyValue("source id", sourceId)}; @@ -1937,7 +1911,6 @@ Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(SourceId so Storage::Info::ItemLibraryEntries ProjectStorage::allItemLibraryEntries() const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get all item library entries", projectStorageCategory()}; using Storage::Info::ItemLibraryProperties; @@ -1970,7 +1943,6 @@ Storage::Info::ItemLibraryEntries ProjectStorage::allItemLibraryEntries() const Storage::Info::ItemLibraryEntries ProjectStorage::directoryImportsItemLibraryEntries(SourceId sourceId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get directory import item library entries", projectStorageCategory(), keyValue("source id", sourceId)}; @@ -2000,7 +1972,6 @@ Storage::Info::ItemLibraryEntries ProjectStorage::directoryImportsItemLibraryEnt std::vector ProjectStorage::signalDeclarationNames(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get signal names", projectStorageCategory(), keyValue("type id", typeId)}; @@ -2015,7 +1986,6 @@ std::vector ProjectStorage::signalDeclarationNames(TypeId ty std::vector ProjectStorage::functionDeclarationNames(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get function names", projectStorageCategory(), keyValue("type id", typeId)}; @@ -2031,7 +2001,6 @@ std::vector ProjectStorage::functionDeclarationNames(TypeId std::optional ProjectStorage::propertyName( PropertyDeclarationId propertyDeclarationId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get property name", projectStorageCategory(), keyValue("property declaration id", propertyDeclarationId)}; @@ -2046,7 +2015,6 @@ std::optional ProjectStorage::propertyName( SmallTypeIds<16> ProjectStorage::prototypeIds(TypeId type) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get prototypes", projectStorageCategory(), keyValue("type id", type)}; auto prototypeIds = s->selectPrototypeIdsStatement.valuesWithTransaction>(type); @@ -2058,7 +2026,6 @@ SmallTypeIds<16> ProjectStorage::prototypeIds(TypeId type) const SmallTypeIds<16> ProjectStorage::prototypeAndSelfIds(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get prototypes and self", projectStorageCategory()}; SmallTypeIds<16> prototypeAndSelfIds; @@ -2073,7 +2040,6 @@ SmallTypeIds<16> ProjectStorage::prototypeAndSelfIds(TypeId typeId) const SmallTypeIds<64> ProjectStorage::heirIds(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"get heirs", projectStorageCategory()}; auto heirIds = s->selectLegitimateHeirTypeIdsStatement.valuesWithTransaction>( @@ -2128,7 +2094,6 @@ TypeId ProjectStorage::basedOn( TypeId ProjectStorage::fetchTypeIdByExportedName(Utils::SmallStringView name) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is based on", projectStorageCategory(), keyValue("exported type name", name)}; @@ -2143,7 +2108,6 @@ TypeId ProjectStorage::fetchTypeIdByExportedName(Utils::SmallStringView name) co TypeId ProjectStorage::fetchTypeIdByModuleIdsAndExportedName(ModuleIds moduleIds, Utils::SmallStringView name) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch type id by module ids and exported name", projectStorageCategory(), keyValue("module ids", NanotraceHR::array(moduleIds)), @@ -2158,7 +2122,6 @@ TypeId ProjectStorage::fetchTypeIdByModuleIdsAndExportedName(ModuleIds moduleIds TypeId ProjectStorage::fetchTypeIdByName(SourceId sourceId, Utils::SmallStringView name) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch type id by name", projectStorageCategory(), keyValue("source id", sourceId), @@ -2174,7 +2137,6 @@ TypeId ProjectStorage::fetchTypeIdByName(SourceId sourceId, Utils::SmallStringVi Storage::Synchronization::Type ProjectStorage::fetchTypeByTypeId(TypeId typeId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch type by type id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -2199,7 +2161,6 @@ Storage::Synchronization::Type ProjectStorage::fetchTypeByTypeId(TypeId typeId) Storage::Synchronization::Types ProjectStorage::fetchTypes() { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch types", projectStorageCategory()}; auto types = Sqlite::withDeferredTransaction(database, [&] { @@ -2230,7 +2191,6 @@ FileStatuses ProjectStorage::fetchAllFileStatuses() const FileStatus ProjectStorage::fetchFileStatus(SourceId sourceId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch file status", projectStorageCategory(), keyValue("source id", sourceId)}; @@ -2245,7 +2205,6 @@ FileStatus ProjectStorage::fetchFileStatus(SourceId sourceId) const std::optional ProjectStorage::fetchDirectoryInfo(SourceId sourceId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch directory info", projectStorageCategory(), keyValue("source id", sourceId)}; @@ -2261,7 +2220,6 @@ std::optional ProjectStorage::fetchDire Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos(DirectoryPathId directoryId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch directory infos by directory id", projectStorageCategory(), keyValue("directory id", directoryId)}; @@ -2278,7 +2236,6 @@ Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos(Dir Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos( DirectoryPathId directoryId, Storage::Synchronization::FileType fileType) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch directory infos by source id and file type", projectStorageCategory(), keyValue("directory id", directoryId), @@ -2296,7 +2253,6 @@ Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos( Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos( const DirectoryPathIds &directoryIds) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch directory infos by source ids", projectStorageCategory(), keyValue("directory ids", directoryIds)}; @@ -2312,7 +2268,6 @@ Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos( SmallDirectoryPathIds<32> ProjectStorage::fetchSubdirectoryIds(DirectoryPathId directoryId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch subdirectory source ids", projectStorageCategory(), keyValue("directory id", directoryId)}; @@ -2341,7 +2296,6 @@ void ProjectStorage::setPropertyEditorPathId(TypeId typeId, SourceId pathId) SourceId ProjectStorage::propertyEditorPathId(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"property editor path id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -2371,7 +2325,6 @@ void ProjectStorage::resetForTestsOnly() ModuleId ProjectStorage::fetchModuleId(Utils::SmallStringView moduleName, Storage::ModuleKind moduleKind) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch module id", projectStorageCategory(), keyValue("module name", moduleName), @@ -2388,7 +2341,6 @@ ModuleId ProjectStorage::fetchModuleId(Utils::SmallStringView moduleName, Storage::Module ProjectStorage::fetchModule(ModuleId id) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch module name", projectStorageCategory(), keyValue("module id", id)}; @@ -2414,7 +2366,6 @@ void ProjectStorage::callRefreshMetaInfoCallback( const Storage::Info::ExportedTypeNames &removedExportedTypeNames, const Storage::Info::ExportedTypeNames &addedExportedTypeNames) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"call refresh meta info callback", projectStorageCategory(), keyValue("type ids", deletedTypeIds)}; @@ -2450,7 +2401,6 @@ SourceIds ProjectStorage::filterSourceIdsWithoutType(const SourceIds &updatedSou TypeIds ProjectStorage::fetchTypeIds(const SourceIds &sourceIds) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch type ids", projectStorageCategory(), keyValue("source ids", sourceIds)}; @@ -2467,7 +2417,6 @@ void ProjectStorage::unique(SourceIds &sourceIds) void ProjectStorage::synchronizeTypeTraits(TypeId typeId, Storage::TypeTraits traits) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"synchronize type traits", projectStorageCategory(), keyValue("type id", typeId), @@ -2507,7 +2456,7 @@ void ProjectStorage::synchronizeTypeAnnotations(Storage::Synchronization::TypeAn throw TypeAnnotationHasInvalidSourceId{}; - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert type annotations", projectStorageCategory(), keyValue("type annotation", annotation)}; @@ -2530,7 +2479,7 @@ void ProjectStorage::synchronizeTypeAnnotations(Storage::Synchronization::TypeAn || annotationFromDatabase.iconPath != annotation.iconPath || annotationFromDatabase.itemLibraryJson != annotation.itemLibraryJson || annotationFromDatabase.hintsJson != annotation.hintsJson) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"update type annotations", projectStorageCategory(), keyValue("type annotation from database", @@ -2554,7 +2503,7 @@ void ProjectStorage::synchronizeTypeAnnotations(Storage::Synchronization::TypeAn }; auto remove = [&](const TypeAnnotationView &annotationFromDatabase) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove type annotations", projectStorageCategory(), keyValue("type annotation", annotationFromDatabase)}; @@ -2661,7 +2610,7 @@ void ProjectStorage::synchronizeDirectoryInfos(Storage::Synchronization::Directo Sqlite::toIntegers(updatedDirectoryInfoDirectoryIds)); auto insert = [&](const Storage::Synchronization::DirectoryInfo &directoryInfo) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert directory info", projectStorageCategory(), keyValue("directory info", directoryInfo)}; @@ -2681,7 +2630,7 @@ void ProjectStorage::synchronizeDirectoryInfos(Storage::Synchronization::Directo const Storage::Synchronization::DirectoryInfo &directoryInfo) { if (directoryInfoFromDatabase.fileType != directoryInfo.fileType || !compareInvalidAreTrue(directoryInfoFromDatabase.moduleId, directoryInfo.moduleId)) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"update directory info", projectStorageCategory(), keyValue("directory info", directoryInfo), @@ -2699,7 +2648,7 @@ void ProjectStorage::synchronizeDirectoryInfos(Storage::Synchronization::Directo }; auto remove = [&](const Storage::Synchronization::DirectoryInfo &directoryInfo) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove directory info", projectStorageCategory(), keyValue("directory info", directoryInfo)}; @@ -2723,7 +2672,7 @@ void ProjectStorage::synchronizeFileStatuses(FileStatuses &fileStatuses, Sqlite::toIntegers(updatedSourceIds)); auto insert = [&](const FileStatus &fileStatus) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert file status", projectStorageCategory(), keyValue("file status", fileStatus)}; @@ -2738,7 +2687,7 @@ void ProjectStorage::synchronizeFileStatuses(FileStatuses &fileStatuses, auto update = [&](const FileStatus &fileStatusFromDatabase, const FileStatus &fileStatus) { if (fileStatusFromDatabase.lastModified != fileStatus.lastModified || fileStatusFromDatabase.size != fileStatus.size) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"update file status", projectStorageCategory(), keyValue("file status", fileStatus), @@ -2754,7 +2703,7 @@ void ProjectStorage::synchronizeFileStatuses(FileStatuses &fileStatuses, }; auto remove = [&](const FileStatus &fileStatus) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove file status", projectStorageCategory(), keyValue("file status", fileStatus)}; @@ -2817,7 +2766,7 @@ void ProjectStorage::synchromizeModuleExportedImports( }; auto insert = [&](const Storage::Synchronization::ModuleExportedImport &import) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert module exported import", projectStorageCategory(), keyValue("module exported import", import), @@ -2848,7 +2797,7 @@ void ProjectStorage::synchromizeModuleExportedImports( }; auto remove = [&](const Storage::Synchronization::ModuleExportedImportView &view) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove module exported import", projectStorageCategory(), keyValue("module exported import view", view), @@ -2864,7 +2813,6 @@ void ProjectStorage::synchromizeModuleExportedImports( ModuleId ProjectStorage::fetchModuleIdUnguarded(Utils::SmallStringView name, Storage::ModuleKind kind) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch module id ungarded", projectStorageCategory(), keyValue("module name", name), @@ -2882,7 +2830,6 @@ ModuleId ProjectStorage::fetchModuleIdUnguarded(Utils::SmallStringView name, Storage::Module ProjectStorage::fetchModuleUnguarded(ModuleId id) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch module ungarded", projectStorageCategory(), keyValue("module id", id)}; @@ -2901,7 +2848,6 @@ Storage::Module ProjectStorage::fetchModuleUnguarded(ModuleId id) const void ProjectStorage::handleAliasPropertyDeclarationsWithPropertyType( TypeId typeId, AliasPropertyDeclarations &relinkableAliasPropertyDeclarations) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle alias property declarations with property type", projectStorageCategory(), keyValue("type id", typeId), @@ -2936,7 +2882,6 @@ void ProjectStorage::handleAliasPropertyDeclarationsWithPropertyType( void ProjectStorage::handlePropertyDeclarationWithPropertyType( TypeId typeId, PropertyDeclarations &relinkablePropertyDeclarations) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle property declarations with property type", projectStorageCategory(), keyValue("type id", typeId), @@ -2952,7 +2897,6 @@ void ProjectStorage::handlePropertyDeclarationsWithExportedTypeNameAndTypeId( TypeId typeId, PropertyDeclarations &relinkablePropertyDeclarations) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle property declarations with exported type name and type id", projectStorageCategory(), keyValue("type name", exportedTypeName), @@ -2970,7 +2914,6 @@ void ProjectStorage::handleAliasPropertyDeclarationsWithExportedTypeNameAndTypeI TypeId typeId, AliasPropertyDeclarations &relinkableAliasPropertyDeclarations) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle alias property declarations with exported type name and type id", projectStorageCategory(), keyValue("type name", exportedTypeName), @@ -3005,7 +2948,6 @@ void ProjectStorage::handleAliasPropertyDeclarationsWithExportedTypeNameAndTypeI void ProjectStorage::handlePrototypes(TypeId prototypeId, Prototypes &relinkablePrototypes) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle prototypes", projectStorageCategory(), keyValue("type id", prototypeId), @@ -3022,7 +2964,6 @@ void ProjectStorage::handlePrototypes(TypeId prototypeId, Prototypes &relinkable void ProjectStorage::handlePrototypesWithExportedTypeNameAndTypeId( Utils::SmallStringView exportedTypeName, TypeId typeId, Prototypes &relinkablePrototypes) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle invalid prototypes", projectStorageCategory(), keyValue("type id", exportedTypeName), @@ -3039,7 +2980,6 @@ void ProjectStorage::handlePrototypesWithExportedTypeNameAndTypeId( void ProjectStorage::handleExtensions(TypeId extensionId, Prototypes &relinkableExtensions) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle extension", projectStorageCategory(), keyValue("type id", extensionId), @@ -3056,7 +2996,6 @@ void ProjectStorage::handleExtensions(TypeId extensionId, Prototypes &relinkable void ProjectStorage::handleExtensionsWithExportedTypeNameAndTypeId( Utils::SmallStringView exportedTypeName, TypeId typeId, Prototypes &relinkableExtensions) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle invalid extensions", projectStorageCategory(), keyValue("type id", exportedTypeName), @@ -3075,7 +3014,6 @@ void ProjectStorage::deleteType(TypeId typeId, Prototypes &relinkablePrototypes, Prototypes &relinkableExtensions) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"delete type", projectStorageCategory(), keyValue("type id", typeId)}; handlePropertyDeclarationWithPropertyType(typeId, relinkablePropertyDeclarations); @@ -3093,7 +3031,6 @@ void ProjectStorage::deleteType(TypeId typeId, void ProjectStorage::relinkAliasPropertyDeclarations(AliasPropertyDeclarations &aliasPropertyDeclarations, const TypeIds &deletedTypeIds) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"relink alias properties", projectStorageCategory(), keyValue("alias property declarations", aliasPropertyDeclarations), @@ -3136,7 +3073,6 @@ void ProjectStorage::relinkAliasPropertyDeclarations(AliasPropertyDeclarations & void ProjectStorage::relinkPropertyDeclarations(PropertyDeclarations &relinkablePropertyDeclaration, const TypeIds &deletedTypeIds) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"relink property declarations", projectStorageCategory(), keyValue("relinkable property declarations", @@ -3173,7 +3109,6 @@ void ProjectStorage::relinkPrototypes(Prototypes &relinkablePrototypes, const TypeIds &deletedTypeIds, Callable updateStatement) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"relink prototypes", projectStorageCategory(), keyValue("relinkable prototypes", relinkablePrototypes), @@ -3209,7 +3144,6 @@ void ProjectStorage::deleteNotUpdatedTypes(const TypeIds &updatedTypeIds, Prototypes &relinkableExtensions, TypeIds &deletedTypeIds) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"delete not updated types", projectStorageCategory(), keyValue("updated type ids", updatedTypeIds), @@ -3256,7 +3190,6 @@ PropertyDeclarationId ProjectStorage::fetchAliasId(TypeId aliasTypeId, Utils::SmallStringView aliasPropertyName, Utils::SmallStringView aliasPropertyNameTail) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch alias id", projectStorageCategory(), keyValue("alias type id", aliasTypeId), @@ -3278,7 +3211,6 @@ PropertyDeclarationId ProjectStorage::fetchAliasId(TypeId aliasTypeId, void ProjectStorage::linkAliasPropertyDeclarationAliasIds( const AliasPropertyDeclarations &aliasDeclarations, RaiseError raiseError) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"link alias property declarations alias ids", projectStorageCategory(), keyValue("alias property declarations", aliasDeclarations)}; @@ -3319,7 +3251,6 @@ void ProjectStorage::linkAliasPropertyDeclarationAliasIds( void ProjectStorage::updateAliasPropertyDeclarationValues(const AliasPropertyDeclarations &aliasDeclarations) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"update alias property declarations", projectStorageCategory(), keyValue("alias property declarations", aliasDeclarations)}; @@ -3334,7 +3265,6 @@ void ProjectStorage::updateAliasPropertyDeclarationValues(const AliasPropertyDec void ProjectStorage::checkAliasPropertyDeclarationCycles(const AliasPropertyDeclarations &aliasDeclarations) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"check alias property declarations cycles", projectStorageCategory(), keyValue("alias property declarations", aliasDeclarations)}; @@ -3345,7 +3275,6 @@ void ProjectStorage::checkAliasPropertyDeclarationCycles(const AliasPropertyDecl void ProjectStorage::linkAliases(const AliasPropertyDeclarations &aliasPropertyDeclarationsToLink, RaiseError raiseError) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"link aliases", projectStorageCategory()}; linkAliasPropertyDeclarationAliasIds(aliasPropertyDeclarationsToLink, raiseError); @@ -3357,7 +3286,6 @@ void ProjectStorage::linkAliases(const AliasPropertyDeclarations &aliasPropertyD void ProjectStorage::repairBrokenAliasPropertyDeclarations() { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"repair broken alias property declarations", projectStorageCategory()}; @@ -3378,7 +3306,6 @@ void ProjectStorage::synchronizeExportedTypes( Storage::Info::ExportedTypeNames &removedExportedTypeNames, Storage::Info::ExportedTypeNames &addedExportedTypeNames) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"synchronize exported types", projectStorageCategory()}; removedExportedTypeNames.reserve(exportedTypes.size()); @@ -3411,7 +3338,7 @@ void ProjectStorage::synchronizeExportedTypes( }; auto insert = [&](const Storage::Synchronization::ExportedType &type) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert exported type", projectStorageCategory(), keyValue("exported type", type), @@ -3511,7 +3438,6 @@ void ProjectStorage::synchronizePropertyDeclarationsInsertAlias( SourceId sourceId, TypeId typeId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"insert property declaration to alias", projectStorageCategory(), keyValue("property declaration", value)}; @@ -3609,7 +3535,6 @@ PropertyDeclarationId ProjectStorage::fetchDefaultPropertyDeclarationId(TypeId t void ProjectStorage::synchronizePropertyDeclarationsInsertProperty( const Storage::Synchronization::PropertyDeclaration &value, SourceId sourceId, TypeId typeId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"insert property declaration", projectStorageCategory(), keyValue("property declaration", value)}; @@ -3642,7 +3567,6 @@ void ProjectStorage::synchronizePropertyDeclarationsUpdateAlias( const Storage::Synchronization::PropertyDeclaration &value, SourceId sourceId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"update property declaration to alias", projectStorageCategory(), keyValue("property declaration", value), @@ -3663,7 +3587,6 @@ Sqlite::UpdateChange ProjectStorage::synchronizePropertyDeclarationsUpdateProper SourceId sourceId, PropertyDeclarationIds &propertyDeclarationIds) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"update property declaration", projectStorageCategory(), keyValue("property declaration", value), @@ -3750,7 +3673,7 @@ void ProjectStorage::synchronizePropertyDeclarations( }; auto remove = [&](const Storage::Synchronization::PropertyDeclarationView &view) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove property declaration", projectStorageCategory(), keyValue("property declaratio viewn", view)}; @@ -3799,7 +3722,7 @@ void ProjectStorage::resetRemovedAliasPropertyDeclarationsToNull( }; auto remove = [&](const AliasPropertyDeclarationView &view) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"reset removed alias property declaration to null", projectStorageCategory(), keyValue("alias property declaration view", view)}; @@ -3832,7 +3755,6 @@ void ProjectStorage::handlePrototypesWithSourceIdAndPrototypeId(SourceId sourceI TypeId prototypeId, Prototypes &relinkablePrototypes) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle prototypes with source id and prototype id", projectStorageCategory(), keyValue("source id", sourceId), @@ -3854,7 +3776,6 @@ void ProjectStorage::handlePrototypesAndExtensionsWithSourceId(SourceId sourceId Prototypes &relinkablePrototypes, Prototypes &relinkableExtensions) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle prototypes with source id", projectStorageCategory(), keyValue("source id", sourceId), @@ -3879,7 +3800,6 @@ void ProjectStorage::handleExtensionsWithSourceIdAndExtensionId(SourceId sourceI TypeId extensionId, Prototypes &relinkableExtensions) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"handle prototypes with source id and prototype id", projectStorageCategory(), keyValue("source id", sourceId), @@ -3962,7 +3882,7 @@ void ProjectStorage::synchronizeDocumentImports(Storage::Imports &imports, }; auto insert = [&](const Storage::Import &import) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert import", projectStorageCategory(), keyValue("import", import), @@ -4016,7 +3936,7 @@ void ProjectStorage::synchronizeDocumentImports(Storage::Imports &imports, }; auto remove = [&](const Storage::Synchronization::ImportView &view) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove import", projectStorageCategory(), keyValue("import", view), @@ -4071,7 +3991,6 @@ Utils::PathString ProjectStorage::createJson(const Storage::Synchronization::Par TypeId ProjectStorage::fetchTypeIdByModuleIdAndExportedName(ModuleId moduleId, Utils::SmallStringView name) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch type id by module id and exported name", projectStorageCategory(), keyValue("module id", moduleId), @@ -4104,7 +4023,7 @@ void ProjectStorage::synchronizePropertyEditorPaths( }; auto insert = [&](const PropertyEditorQmlPath &path) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert property editor paths", projectStorageCategory(), keyValue("property editor qml path", path)}; @@ -4114,7 +4033,7 @@ void ProjectStorage::synchronizePropertyEditorPaths( }; auto update = [&](const PropertyEditorQmlPathView &view, const PropertyEditorQmlPath &value) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"update property editor paths", projectStorageCategory(), keyValue("property editor qml path", value), @@ -4131,7 +4050,7 @@ void ProjectStorage::synchronizePropertyEditorPaths( }; auto remove = [&](const PropertyEditorQmlPathView &view) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove property editor paths", projectStorageCategory(), keyValue("property editor qml path view", view)}; @@ -4185,7 +4104,7 @@ void ProjectStorage::synchronizeFunctionDeclarations( }; auto insert = [&](const Storage::Synchronization::FunctionDeclaration &value) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert function declaration", projectStorageCategory(), keyValue("function declaration", value)}; @@ -4197,7 +4116,7 @@ void ProjectStorage::synchronizeFunctionDeclarations( auto update = [&](const Storage::Synchronization::FunctionDeclarationView &view, const Storage::Synchronization::FunctionDeclaration &value) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"update function declaration", projectStorageCategory(), keyValue("function declaration", value), @@ -4216,7 +4135,7 @@ void ProjectStorage::synchronizeFunctionDeclarations( }; auto remove = [&](const Storage::Synchronization::FunctionDeclarationView &view) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove function declaration", projectStorageCategory(), keyValue("function declaration view", view)}; @@ -4260,7 +4179,7 @@ void ProjectStorage::synchronizeSignalDeclarations( }; auto insert = [&](const Storage::Synchronization::SignalDeclaration &value) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert signal declaration", projectStorageCategory(), keyValue("signal declaration", value)}; @@ -4276,7 +4195,7 @@ void ProjectStorage::synchronizeSignalDeclarations( }; auto remove = [&](const Storage::Synchronization::SignalDeclarationView &view) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove signal declaration", projectStorageCategory(), keyValue("signal declaration view", view)}; @@ -4290,7 +4209,6 @@ void ProjectStorage::synchronizeSignalDeclarations( Utils::PathString ProjectStorage::createJson( const Storage::Synchronization::EnumeratorDeclarations &enumeratorDeclarations) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"create json from enumerator declarations", projectStorageCategory()}; Utils::PathString json; @@ -4332,7 +4250,7 @@ void ProjectStorage::synchronizeEnumerationDeclarations( }; auto insert = [&](const Storage::Synchronization::EnumerationDeclaration &value) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"insert enumeration declaration", projectStorageCategory(), keyValue("enumeration declaration", value)}; @@ -4344,7 +4262,7 @@ void ProjectStorage::synchronizeEnumerationDeclarations( auto update = [&](const Storage::Synchronization::EnumerationDeclarationView &view, const Storage::Synchronization::EnumerationDeclaration &value) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"update enumeration declaration", projectStorageCategory(), keyValue("enumeration declaration", value), @@ -4363,7 +4281,7 @@ void ProjectStorage::synchronizeEnumerationDeclarations( }; auto remove = [&](const Storage::Synchronization::EnumerationDeclarationView &view) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"remove enumeration declaration", projectStorageCategory(), keyValue("enumeration declaration view", view)}; @@ -4384,7 +4302,6 @@ void ProjectStorage::extractExportedTypes(TypeId typeId, TypeId ProjectStorage::declareType(Storage::Synchronization::Type &type) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"declare type", projectStorageCategory(), keyValue("source id", type.sourceId), @@ -4462,7 +4379,7 @@ void ProjectStorage::syncDefaultProperties(Storage::Synchronization::Types &type auto update = [&](const TypeWithDefaultPropertyView &view, const Storage::Synchronization::Type &value) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"synchronize default properties by update", projectStorageCategory(), keyValue("type id", value.typeId), @@ -4516,7 +4433,7 @@ void ProjectStorage::resetDefaultPropertiesIfChanged(Storage::Synchronization::T auto update = [&](const TypeWithDefaultPropertyView &view, const Storage::Synchronization::Type &value) { - using NanotraceHR::keyValue; + NanotraceHR::Tracer tracer{"reset changed default properties by update", projectStorageCategory(), keyValue("type id", value.typeId), @@ -4546,7 +4463,6 @@ void ProjectStorage::resetDefaultPropertiesIfChanged(Storage::Synchronization::T void ProjectStorage::checkForPrototypeChainCycle(TypeId typeId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"check for prototype chain cycle", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4561,7 +4477,6 @@ void ProjectStorage::checkForPrototypeChainCycle(TypeId typeId) const void ProjectStorage::checkForAliasChainCycle(PropertyDeclarationId propertyDeclarationId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"check for alias chain cycle", projectStorageCategory(), keyValue("property declaration id", propertyDeclarationId)}; @@ -4577,7 +4492,6 @@ void ProjectStorage::checkForAliasChainCycle(PropertyDeclarationId propertyDecla std::pair ProjectStorage::fetchImportedTypeNameIdAndTypeId( const Storage::Synchronization::ImportedTypeName &importedTypeName, SourceId sourceId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch imported type name id and type id", projectStorageCategory(), keyValue("imported type name", importedTypeName), @@ -4608,7 +4522,6 @@ void ProjectStorage::syncPrototypeAndExtension(Storage::Synchronization::Type &t if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal) return; - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"synchronize prototype and extension", projectStorageCategory(), keyValue("prototype", type.prototype), @@ -4656,7 +4569,6 @@ void ProjectStorage::syncPrototypesAndExtensions(Storage::Synchronization::Types ImportId ProjectStorage::fetchImportId(SourceId sourceId, const Storage::Import &import) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch imported type name id", projectStorageCategory(), keyValue("import", import), @@ -4686,7 +4598,6 @@ ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId( { auto operator()(const Storage::Synchronization::ImportedType &importedType) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch imported type name id", projectStorageCategory(), keyValue("imported type name", importedType.name), @@ -4700,7 +4611,6 @@ ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId( auto operator()(const Storage::Synchronization::QualifiedImportedType &importedType) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch imported type name id", projectStorageCategory(), keyValue("imported type name", importedType.name), @@ -4726,7 +4636,6 @@ ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId( TypeId ProjectStorage::fetchTypeId(ImportedTypeNameId typeNameId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch type id with type name kind", projectStorageCategory(), keyValue("type name id", typeNameId)}; @@ -4754,7 +4663,6 @@ SourceId ProjectStorage::fetchTypeSourceId(TypeId typeId) const TypeId ProjectStorage::fetchTypeId(ImportedTypeNameId typeNameId, Storage::Synchronization::TypeNameKind kind) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch type id", projectStorageCategory(), keyValue("type name id", typeNameId), @@ -4777,7 +4685,6 @@ std::optional ProjectStorage::fetchPropertyDeclarationByTypeIdAndNameUngarded(TypeId typeId, Utils::SmallStringView name) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch optional property declaration by type id and name ungarded", projectStorageCategory(), keyValue("type id", typeId), @@ -4796,7 +4703,6 @@ ProjectStorage::fetchPropertyDeclarationByTypeIdAndNameUngarded(TypeId typeId, PropertyDeclarationId ProjectStorage::fetchPropertyDeclarationIdByTypeIdAndNameUngarded( TypeId typeId, Utils::SmallStringView name) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch property declaration id by type id and name ungarded", projectStorageCategory(), keyValue("type id", typeId), @@ -4811,7 +4717,6 @@ PropertyDeclarationId ProjectStorage::fetchPropertyDeclarationIdByTypeIdAndNameU Storage::Synchronization::ExportedTypes ProjectStorage::fetchExportedTypes(TypeId typeId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch exported type", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4826,7 +4731,6 @@ Storage::Synchronization::ExportedTypes ProjectStorage::fetchExportedTypes(TypeI Storage::Synchronization::PropertyDeclarations ProjectStorage::fetchPropertyDeclarations(TypeId typeId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch property declarations", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4841,7 +4745,6 @@ Storage::Synchronization::PropertyDeclarations ProjectStorage::fetchPropertyDecl Storage::Synchronization::FunctionDeclarations ProjectStorage::fetchFunctionDeclarations(TypeId typeId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch signal declarations", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4866,7 +4769,6 @@ Storage::Synchronization::FunctionDeclarations ProjectStorage::fetchFunctionDecl Storage::Synchronization::SignalDeclarations ProjectStorage::fetchSignalDeclarations(TypeId typeId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch signal declarations", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4889,7 +4791,6 @@ Storage::Synchronization::SignalDeclarations ProjectStorage::fetchSignalDeclarat Storage::Synchronization::EnumerationDeclarations ProjectStorage::fetchEnumerationDeclarations(TypeId typeId) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch enumeration declarations", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4929,7 +4830,6 @@ TypeId findTypeId(auto &&range, TypeIds... baseTypeIds) template TypeId ProjectStorage::basedOn_(TypeId typeId, TypeIds... baseTypeIds) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is based on", projectStorageCategory(), keyValue("type id", typeId), @@ -4956,7 +4856,6 @@ ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId(Storage::Synchronizat Id id, Utils::SmallStringView typeName) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch imported type name id", projectStorageCategory(), keyValue("imported type name", typeName), diff --git a/src/plugins/qmldesigner/libs/designercore/sourcepathstorage/sourcepathstorage.cpp b/src/plugins/qmldesigner/libs/designercore/sourcepathstorage/sourcepathstorage.cpp index f10384467f1..f9cfe846858 100644 --- a/src/plugins/qmldesigner/libs/designercore/sourcepathstorage/sourcepathstorage.cpp +++ b/src/plugins/qmldesigner/libs/designercore/sourcepathstorage/sourcepathstorage.cpp @@ -9,6 +9,8 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + using SourcePathStorageTracing::category; struct SourcePathStorage::Statements @@ -90,7 +92,6 @@ SourcePathStorage::~SourcePathStorage() = default; DirectoryPathId SourcePathStorage::fetchDirectoryPathIdUnguarded(Utils::SmallStringView directoryPath) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch source context id unguarded", category()}; auto directoryPathId = readDirectoryPathId(directoryPath); @@ -100,7 +101,6 @@ DirectoryPathId SourcePathStorage::fetchDirectoryPathIdUnguarded(Utils::SmallStr DirectoryPathId SourcePathStorage::fetchDirectoryPathId(Utils::SmallStringView directoryPath) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch source context id", category(), keyValue("source context path", directoryPath)}; @@ -121,7 +121,6 @@ DirectoryPathId SourcePathStorage::fetchDirectoryPathId(Utils::SmallStringView d Utils::PathString SourcePathStorage::fetchDirectoryPath(DirectoryPathId directoryPathId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch source context path", category(), keyValue("source context id", directoryPathId)}; @@ -150,7 +149,6 @@ Cache::DirectoryPaths SourcePathStorage::fetchAllDirectoryPaths() const FileNameId SourcePathStorage::fetchFileNameId(Utils::SmallStringView fileName) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch source id", category(), keyValue("source name", fileName)}; auto fileNameId = Sqlite::withDeferredTransaction(database, [&] { @@ -164,7 +162,6 @@ FileNameId SourcePathStorage::fetchFileNameId(Utils::SmallStringView fileName) Utils::SmallString SourcePathStorage::fetchFileName(FileNameId fileNameId) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch source name and source context id", category(), keyValue("source name id", fileNameId)}; @@ -197,7 +194,6 @@ Cache::FileNames SourcePathStorage::fetchAllFileNames() const FileNameId SourcePathStorage::fetchFileNameIdUnguarded(Utils::SmallStringView fileName) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"fetch source id unguarded", category(), keyValue("source name", fileName)}; @@ -214,7 +210,6 @@ FileNameId SourcePathStorage::fetchFileNameIdUnguarded(Utils::SmallStringView fi DirectoryPathId SourcePathStorage::readDirectoryPathId(Utils::SmallStringView directoryPath) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"read source context id", category(), keyValue("source context path", directoryPath)}; @@ -229,7 +224,6 @@ DirectoryPathId SourcePathStorage::readDirectoryPathId(Utils::SmallStringView di DirectoryPathId SourcePathStorage::writeDirectoryPathId(Utils::SmallStringView directoryPath) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"write source context id", category(), keyValue("source context path", directoryPath)}; @@ -245,7 +239,6 @@ DirectoryPathId SourcePathStorage::writeDirectoryPathId(Utils::SmallStringView d FileNameId SourcePathStorage::writeFileNameId(Utils::SmallStringView fileName) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"write source id", category(), keyValue("source name", fileName)}; s->insertIntoSourcesStatement.write(fileName); @@ -259,7 +252,6 @@ FileNameId SourcePathStorage::writeFileNameId(Utils::SmallStringView fileName) FileNameId SourcePathStorage::readFileNameId(Utils::SmallStringView fileName) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"read source id", category(), keyValue("source name", fileName)}; auto fileNameId = s->selectFileNameIdFromFileNamesByFileNameStatement.value( diff --git a/src/plugins/qmldesigner/qmltools/qml3dnode.cpp b/src/plugins/qmldesigner/qmltools/qml3dnode.cpp index 473f22d99ff..07ec7d71271 100644 --- a/src/plugins/qmldesigner/qmltools/qml3dnode.cpp +++ b/src/plugins/qmldesigner/qmltools/qml3dnode.cpp @@ -14,6 +14,8 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; bool Qml3DNode::isValid(SL sl) const @@ -23,7 +25,6 @@ bool Qml3DNode::isValid(SL sl) const bool Qml3DNode::isValidQml3DNode(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml 3d node is valid Qml 3D node", category(), keyValue("model node", modelNode), @@ -34,7 +35,6 @@ bool Qml3DNode::isValidQml3DNode(const ModelNode &modelNode, SL sl) bool Qml3DNode::isValidVisualRoot(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml 3d node is valid visual root", category(), keyValue("model node", modelNode), @@ -46,7 +46,6 @@ bool Qml3DNode::isValidVisualRoot(const ModelNode &modelNode, SL sl) bool Qml3DNode::handleEulerRotation(PropertyNameView name, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"1ml 3d node handle euler rotation", category(), keyValue("model node", *this), @@ -64,7 +63,6 @@ bool Qml3DNode::handleEulerRotation(PropertyNameView name, SL sl) bool Qml3DNode::isBlocked(PropertyNameView propName, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml 3d node is blocked", category(), keyValue("model node", *this), @@ -365,7 +363,6 @@ static bool transformHasScalingAndRotation(const QMatrix4x4 &transform) bool Qml3DNode::hasAnimatedTransform(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml 3d node has animated transform", category(), keyValue("model node", *this), @@ -452,7 +449,6 @@ void Qml3DNode::setLocalTransform(const QMatrix4x4 &newParentSceneTransform, void Qml3DNode::reparentWithTransform(NodeAbstractProperty &parentProperty, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml 3d node reparent with transform", category(), keyValue("model node", *this), diff --git a/src/plugins/qmldesigner/qmltools/qmlanchors.cpp b/src/plugins/qmldesigner/qmltools/qmlanchors.cpp index fc1f6b13c32..004bd9f55a2 100644 --- a/src/plugins/qmldesigner/qmltools/qmlanchors.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlanchors.cpp @@ -9,6 +9,8 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; static PropertyName lineTypeToString(AnchorLineType lineType) @@ -118,7 +120,6 @@ QmlItemNode QmlAnchors::qmlItemNode() const bool QmlAnchors::modelHasAnchors(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors has anchors", category(), keyValue("model node", *this), @@ -132,7 +133,6 @@ bool QmlAnchors::modelHasAnchors(SL sl) const bool QmlAnchors::modelHasAnchor(AnchorLineType sourceAnchorLineType, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors has anchor", category(), keyValue("model node", *this), @@ -151,7 +151,6 @@ bool QmlAnchors::modelHasAnchor(AnchorLineType sourceAnchorLineType, SL sl) cons AnchorLine QmlAnchors::modelAnchor(AnchorLineType sourceAnchorLineType, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors get anchor", category(), keyValue("model node", *this), @@ -192,7 +191,6 @@ AnchorLine QmlAnchors::modelAnchor(AnchorLineType sourceAnchorLineType, SL sl) c bool QmlAnchors::isValid(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors is valid", category(), keyValue("model node", *this), @@ -206,7 +204,6 @@ void QmlAnchors::setAnchor(AnchorLineType sourceAnchorLine, AnchorLineType targetAnchorLine, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors set anchor", category(), keyValue("model node", *this), @@ -315,7 +312,6 @@ static bool detectVerticalCycle(const ModelNode &node, QList knownNod bool QmlAnchors::canAnchor(const QmlItemNode &targetModelNode, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors can anchor", category(), keyValue("model node", *this), @@ -337,7 +333,6 @@ AnchorLineType QmlAnchors::possibleAnchorLines(AnchorLineType sourceAnchorLineTy const QmlItemNode &targetQmlItemNode, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors possible anchor lines", category(), keyValue("model node", *this), @@ -361,7 +356,6 @@ AnchorLineType QmlAnchors::possibleAnchorLines(AnchorLineType sourceAnchorLineTy AnchorLine QmlAnchors::instanceAnchor(AnchorLineType sourceAnchorLine, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors get instance anchor", category(), keyValue("model node", *this), @@ -391,7 +385,6 @@ AnchorLine QmlAnchors::instanceAnchor(AnchorLineType sourceAnchorLine, SL sl) co void QmlAnchors::removeAnchor(AnchorLineType sourceAnchorLine, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors remove anchor", category(), keyValue("model node", *this), @@ -422,7 +415,6 @@ void QmlAnchors::removeAnchor(AnchorLineType sourceAnchorLine, SL sl) void QmlAnchors::removeAnchors(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors remove anchors", category(), keyValue("model node", *this), @@ -452,7 +444,6 @@ void QmlAnchors::removeAnchors(SL sl) bool QmlAnchors::instanceHasAnchor(AnchorLineType sourceAnchorLine, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance has anchor", category(), keyValue("model node", *this), @@ -472,7 +463,6 @@ bool QmlAnchors::instanceHasAnchor(AnchorLineType sourceAnchorLine, SL sl) const bool QmlAnchors::instanceHasAnchors(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance has anchors", category(), keyValue("model node", *this), @@ -492,7 +482,6 @@ static QRectF contentRect(const NodeInstance &nodeInstance) double QmlAnchors::instanceLeftAnchorLine(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance left anchor line", category(), keyValue("model node", *this), @@ -503,7 +492,6 @@ double QmlAnchors::instanceLeftAnchorLine(SL sl) const double QmlAnchors::instanceTopAnchorLine(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance top anchor line", category(), keyValue("model node", *this), @@ -514,7 +502,6 @@ double QmlAnchors::instanceTopAnchorLine(SL sl) const double QmlAnchors::instanceRightAnchorLine(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance right anchor line", category(), keyValue("model node", *this), @@ -526,7 +513,6 @@ double QmlAnchors::instanceRightAnchorLine(SL sl) const double QmlAnchors::instanceBottomAnchorLine(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance bottom anchor line", category(), keyValue("model node", *this), @@ -538,7 +524,6 @@ double QmlAnchors::instanceBottomAnchorLine(SL sl) const double QmlAnchors::instanceHorizontalCenterAnchorLine(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance horizontal center anchor line", category(), keyValue("model node", *this), @@ -549,7 +534,6 @@ double QmlAnchors::instanceHorizontalCenterAnchorLine(SL sl) const double QmlAnchors::instanceVerticalCenterAnchorLine(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance vertical center anchor line", category(), keyValue("model node", *this), @@ -560,7 +544,6 @@ double QmlAnchors::instanceVerticalCenterAnchorLine(SL sl) const double QmlAnchors::instanceAnchorLine(AnchorLineType anchorLine, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance anchor line", category(), keyValue("model node", *this), @@ -579,7 +562,6 @@ double QmlAnchors::instanceAnchorLine(AnchorLineType anchorLine, SL sl) const void QmlAnchors::setMargin(AnchorLineType sourceAnchorLineType, double margin, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors set margin", category(), keyValue("model node", *this), @@ -591,7 +573,6 @@ void QmlAnchors::setMargin(AnchorLineType sourceAnchorLineType, double margin, S bool QmlAnchors::instanceHasMargin(AnchorLineType sourceAnchorLineType, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml anchors instance has margin", category(), keyValue("model node", *this), @@ -657,7 +638,6 @@ static bool checkForVerticalCycleRecusive(const QmlAnchors &anchors, QList QmlModelStateOperation::targetProperties(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state operation target properties", category(), keyValue("model node", *this), @@ -112,7 +107,6 @@ bool QmlPropertyChanges::isValid(SL sl) const bool QmlPropertyChanges::isValidQmlPropertyChanges(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is valid qml property changes", category(), keyValue("model node", modelNode), @@ -128,7 +122,6 @@ bool QmlModelStateOperation::isValid(SL sl) const bool QmlModelStateOperation::isValidQmlModelStateOperation(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is valid qml model state operation", category(), keyValue("model node", modelNode), @@ -139,7 +132,6 @@ bool QmlModelStateOperation::isValidQmlModelStateOperation(const ModelNode &mode void QmlPropertyChanges::removeProperty(PropertyNameView name, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml property changes remove property", category(), keyValue("model node", *this), diff --git a/src/plugins/qmldesigner/qmltools/qmlconnections.cpp b/src/plugins/qmldesigner/qmltools/qmlconnections.cpp index 33a7123b3f3..66265457a3a 100644 --- a/src/plugins/qmldesigner/qmltools/qmlconnections.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlconnections.cpp @@ -9,6 +9,8 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; bool QmlConnections::isValid(SL sl) const @@ -18,7 +20,6 @@ bool QmlConnections::isValid(SL sl) const bool QmlConnections::isValidQmlConnections(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml connection is valid qml connections", category(), keyValue("model node", modelNode), @@ -33,7 +34,6 @@ bool QmlConnections::isValidQmlConnections(const ModelNode &modelNode, SL sl) */ void QmlConnections::destroy(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml connection destroy", category(), keyValue("model node", *this), @@ -43,7 +43,6 @@ void QmlConnections::destroy(SL sl) QString QmlConnections::target(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml connections target", category(), keyValue("model node", *this), @@ -60,7 +59,6 @@ QString QmlConnections::target(SL sl) const void QmlConnections::setTarget(const QString &target, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml connections set target", category(), keyValue("model node", *this), @@ -72,7 +70,6 @@ void QmlConnections::setTarget(const QString &target, SL sl) ModelNode QmlConnections::getTargetNode(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml connections get target node", category(), keyValue("model node", *this), @@ -111,7 +108,6 @@ ModelNode QmlConnections::getTargetNode(SL sl) const QList QmlConnections::signalProperties(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml connections signal properties", category(), keyValue("model node", *this), @@ -122,7 +118,6 @@ QList QmlConnections::signalProperties(SL sl) const ModelNode QmlConnections::createQmlConnections(AbstractView *view, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml connections create qml connections", category(), keyValue("view", view), diff --git a/src/plugins/qmldesigner/qmltools/qmlitemnode.cpp b/src/plugins/qmldesigner/qmltools/qmlitemnode.cpp index 87dae92129e..00bde856ebb 100644 --- a/src/plugins/qmldesigner/qmltools/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlitemnode.cpp @@ -28,11 +28,12 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; bool QmlItemNode::isItemOrWindow(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is item or window", category(), keyValue("model node", modelNode), @@ -88,7 +89,6 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, QmlItemNode parentQmlItemNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node create qml item node", category(), keyValue("caller location", sl)}; @@ -103,7 +103,6 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, bool executeInTransaction, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node create qml item node from image", category(), keyValue("caller location", sl)}; @@ -127,7 +126,6 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, bool executeInTransaction, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node create qml item node from image", category(), keyValue("caller location", sl)}; @@ -195,7 +193,6 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromFont(AbstractView *view, bool executeInTransaction, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node create qml item node from font", category(), keyValue("caller location", sl)}; @@ -216,7 +213,6 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromFont(AbstractView *view, bool executeInTransaction, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node create qml item node from font", category(), keyValue("caller location", sl)}; @@ -260,7 +256,6 @@ QmlItemNode QmlItemNode::createQmlItemNodeForEffect(AbstractView *view, bool isLayerEffect, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node create qml item node for effect", category(), keyValue("caller location", sl)}; @@ -281,7 +276,6 @@ QmlItemNode QmlItemNode::createQmlItemNodeForEffect(AbstractView *view, bool isLayerEffect, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node create qml item node for effect", category(), keyValue("caller location", sl)}; @@ -317,7 +311,6 @@ void QmlItemNode::placeEffectNode(NodeAbstractProperty &parentProperty, bool isLayerEffect, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node place effect node", category(), keyValue("caller location", sl)}; @@ -349,7 +342,6 @@ void QmlItemNode::placeEffectNode(NodeAbstractProperty &parentProperty, bool QmlItemNode::isValid(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is valid", category(), keyValue("model node", *this), @@ -360,7 +352,6 @@ bool QmlItemNode::isValid(SL sl) const bool QmlItemNode::isValidQmlItemNode(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is valid qml item node", category(), keyValue("model node", modelNode), @@ -372,7 +363,6 @@ bool QmlItemNode::isValidQmlItemNode(const ModelNode &modelNode, SL sl) QList QmlItemNode::children(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node children", category(), keyValue("model node", *this), @@ -399,7 +389,6 @@ QList QmlItemNode::children(SL sl) const QList QmlItemNode::resources(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node resources", category(), keyValue("model node", *this), @@ -426,7 +415,6 @@ QList QmlItemNode::resources(SL sl) const QList QmlItemNode::allDirectSubNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node all direct sub nodes", category(), keyValue("model node", *this), @@ -437,7 +425,6 @@ QList QmlItemNode::allDirectSubNodes(SL sl) const QmlAnchors QmlItemNode::anchors(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node anchors", category(), keyValue("model node", *this), @@ -448,7 +435,6 @@ QmlAnchors QmlItemNode::anchors(SL sl) const bool QmlItemNode::hasChildren(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node has children", category(), keyValue("model node", *this), @@ -462,7 +448,6 @@ bool QmlItemNode::hasChildren(SL sl) const bool QmlItemNode::hasResources(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node has resources", category(), keyValue("model node", *this), @@ -476,7 +461,6 @@ bool QmlItemNode::hasResources(SL sl) const bool QmlItemNode::instanceHasAnchor(AnchorLineType sourceAnchorLineType, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance has anchor", category(), keyValue("model node", *this), @@ -487,7 +471,6 @@ bool QmlItemNode::instanceHasAnchor(AnchorLineType sourceAnchorLineType, SL sl) bool QmlItemNode::instanceHasAnchors(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance has anchors", category(), keyValue("model node", *this), @@ -498,7 +481,6 @@ bool QmlItemNode::instanceHasAnchors(SL sl) const bool QmlItemNode::instanceHasShowContent(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance has show content", category(), keyValue("model node", *this), @@ -509,7 +491,6 @@ bool QmlItemNode::instanceHasShowContent(SL sl) const bool QmlItemNode::instanceCanReparent(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance can reparent", category(), keyValue("model node", *this), @@ -520,7 +501,6 @@ bool QmlItemNode::instanceCanReparent(SL sl) const bool QmlItemNode::instanceIsAnchoredBySibling(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance is anchored by sibling", category(), keyValue("model node", *this), @@ -531,7 +511,6 @@ bool QmlItemNode::instanceIsAnchoredBySibling(SL sl) const bool QmlItemNode::instanceIsAnchoredByChildren(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance is anchored by children", category(), keyValue("model node", *this), @@ -542,7 +521,6 @@ bool QmlItemNode::instanceIsAnchoredByChildren(SL sl) const bool QmlItemNode::instanceIsMovable(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance is movable", category(), keyValue("model node", *this), @@ -558,7 +536,6 @@ bool QmlItemNode::instanceIsMovable(SL sl) const bool QmlItemNode::instanceIsResizable(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance is resizable", category(), keyValue("model node", *this), @@ -569,7 +546,6 @@ bool QmlItemNode::instanceIsResizable(SL sl) const bool QmlItemNode::instanceIsInLayoutable(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance is in layoutable", category(), keyValue("model node", *this), @@ -580,7 +556,6 @@ bool QmlItemNode::instanceIsInLayoutable(SL sl) const bool QmlItemNode::instanceHasScaleOrRotationTransform(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance has scale or rotation transform", category(), keyValue("model node", *this), @@ -607,7 +582,6 @@ static bool itemIsResizable(const ModelNode &modelNode) bool QmlItemNode::modelIsMovable(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node model is movable", category(), keyValue("model node", *this), @@ -619,7 +593,6 @@ bool QmlItemNode::modelIsMovable(SL sl) const bool QmlItemNode::modelIsResizable(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node model is resizable", category(), keyValue("model node", *this), @@ -631,7 +604,6 @@ bool QmlItemNode::modelIsResizable(SL sl) const bool QmlItemNode::modelIsInLayout(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node model is in layout", category(), keyValue("model node", *this), @@ -651,7 +623,6 @@ bool QmlItemNode::modelIsInLayout(SL sl) const bool QmlItemNode::hasFormEditorItem(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node has form editor item", category(), keyValue("model node", *this), @@ -662,7 +633,6 @@ bool QmlItemNode::hasFormEditorItem(SL sl) const QRectF QmlItemNode::instanceBoundingRect(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance bounding rect", category(), keyValue("model node", *this), @@ -673,7 +643,6 @@ QRectF QmlItemNode::instanceBoundingRect(SL sl) const QRectF QmlItemNode::instanceSceneBoundingRect(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance scene bounding rect", category(), keyValue("model node", *this), @@ -684,7 +653,6 @@ QRectF QmlItemNode::instanceSceneBoundingRect(SL sl) const QRectF QmlItemNode::instancePaintedBoundingRect(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance painted bounding rect", category(), keyValue("model node", *this), @@ -695,7 +663,6 @@ QRectF QmlItemNode::instancePaintedBoundingRect(SL sl) const QRectF QmlItemNode::instanceContentItemBoundingRect(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance content item bounding rect", category(), keyValue("model node", *this), @@ -706,7 +673,6 @@ QRectF QmlItemNode::instanceContentItemBoundingRect(SL sl) const QTransform QmlItemNode::instanceTransform(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance transform", category(), keyValue("model node", *this), @@ -717,7 +683,6 @@ QTransform QmlItemNode::instanceTransform(SL sl) const QTransform QmlItemNode::instanceTransformWithContentTransform(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance transform with content transform", category(), keyValue("model node", *this), @@ -728,7 +693,6 @@ QTransform QmlItemNode::instanceTransformWithContentTransform(SL sl) const QTransform QmlItemNode::instanceTransformWithContentItemTransform(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance transform with content item transform", category(), keyValue("model node", *this), @@ -739,7 +703,6 @@ QTransform QmlItemNode::instanceTransformWithContentItemTransform(SL sl) const QTransform QmlItemNode::instanceSceneTransform(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance scene transform", category(), keyValue("model node", *this), @@ -750,7 +713,6 @@ QTransform QmlItemNode::instanceSceneTransform(SL sl) const QTransform QmlItemNode::instanceSceneContentItemTransform(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance scene content item transform", category(), keyValue("model node", *this), @@ -761,7 +723,6 @@ QTransform QmlItemNode::instanceSceneContentItemTransform(SL sl) const QPointF QmlItemNode::instanceScenePosition(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance scene position", category(), keyValue("model node", *this), @@ -777,7 +738,6 @@ QPointF QmlItemNode::instanceScenePosition(SL sl) const QPointF QmlItemNode::instancePosition(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance position", category(), keyValue("model node", *this), @@ -788,7 +748,6 @@ QPointF QmlItemNode::instancePosition(SL sl) const QSizeF QmlItemNode::instanceSize(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance size", category(), keyValue("model node", *this), @@ -799,7 +758,6 @@ QSizeF QmlItemNode::instanceSize(SL sl) const int QmlItemNode::instancePenWidth(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance pen width", category(), keyValue("model node", *this), @@ -810,7 +768,6 @@ int QmlItemNode::instancePenWidth(SL sl) const bool QmlItemNode::instanceIsRenderPixmapNull(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance is render pixmap null", category(), keyValue("model node", *this), @@ -821,7 +778,6 @@ bool QmlItemNode::instanceIsRenderPixmapNull(SL sl) const bool QmlItemNode::instanceIsVisible(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance is visible", category(), keyValue("model node", *this), @@ -832,7 +788,6 @@ bool QmlItemNode::instanceIsVisible(SL sl) const QPixmap QmlItemNode::instanceRenderPixmap(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance render pixmap", category(), keyValue("model node", *this), @@ -843,7 +798,6 @@ QPixmap QmlItemNode::instanceRenderPixmap(SL sl) const QPixmap QmlItemNode::instanceBlurredRenderPixmap(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node instance blurred render pixmap", category(), keyValue("model node", *this), @@ -887,7 +841,6 @@ QList toQmlItemNodeListKeppInvalid(const QList &modelNod const QList QmlItemNode::allDirectSubModelNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node all direct sub model nodes", category(), keyValue("model node", *this), @@ -898,7 +851,6 @@ const QList QmlItemNode::allDirectSubModelNodes(SL sl) const const QList QmlItemNode::allSubModelNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node all sub model nodes", category(), keyValue("model node", *this), @@ -909,7 +861,6 @@ const QList QmlItemNode::allSubModelNodes(SL sl) const bool QmlItemNode::hasAnySubModelNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node has any sub model nodes", category(), keyValue("model node", *this), @@ -920,7 +871,6 @@ bool QmlItemNode::hasAnySubModelNodes(SL sl) const void QmlItemNode::setPosition(const QPointF &position, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node set position", category(), keyValue("model node", *this), @@ -938,7 +888,6 @@ void QmlItemNode::setPosition(const QPointF &position, SL sl) void QmlItemNode::setPostionInBaseState(const QPointF &position, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node set position in base state", category(), keyValue("model node", *this), @@ -955,7 +904,6 @@ constexpr AuxiliaryDataKeyView flowYProperty{AuxiliaryDataType::Document, "flowY void QmlItemNode::setFlowItemPosition(const QPointF &position, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node set flow item position", category(), keyValue("model node", *this), @@ -967,7 +915,6 @@ void QmlItemNode::setFlowItemPosition(const QPointF &position, SL sl) QPointF QmlItemNode::flowPosition(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node flow position", category(), keyValue("model node", *this), @@ -982,7 +929,6 @@ QPointF QmlItemNode::flowPosition(SL sl) const bool QmlItemNode::isInLayout(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is in layout", category(), keyValue("model node", *this), @@ -1000,7 +946,6 @@ bool QmlItemNode::isInLayout(SL sl) const bool QmlItemNode::canBereparentedTo(const ModelNode &potentialParent, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node can be reparented to", category(), keyValue("model node", *this), @@ -1014,7 +959,6 @@ bool QmlItemNode::canBereparentedTo(const ModelNode &potentialParent, SL sl) con bool QmlItemNode::isInStackedContainer(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is in stacked container", category(), keyValue("model node", *this), @@ -1027,7 +971,6 @@ bool QmlItemNode::isInStackedContainer(SL sl) const bool QmlItemNode::isFlowView(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is flow view", category(), keyValue("model node", *this), @@ -1038,7 +981,6 @@ bool QmlItemNode::isFlowView(SL sl) const bool QmlItemNode::isFlowItem(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is flow item", category(), keyValue("model node", *this), @@ -1049,7 +991,6 @@ bool QmlItemNode::isFlowItem(SL sl) const bool QmlItemNode::isFlowActionArea(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is flow action area", category(), keyValue("model node", *this), @@ -1060,7 +1001,6 @@ bool QmlItemNode::isFlowActionArea(SL sl) const ModelNode QmlItemNode::rootModelNode(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node root model node", category(), keyValue("model node", *this), @@ -1073,7 +1013,6 @@ ModelNode QmlItemNode::rootModelNode(SL sl) const bool QmlItemNode::isEffectItem(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node is effect item", category(), keyValue("model node", *this), @@ -1084,7 +1023,6 @@ bool QmlItemNode::isEffectItem(SL sl) const void QmlItemNode::setSize(const QSizeF &size, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node set size", category(), keyValue("model node", *this), @@ -1102,7 +1040,6 @@ void QmlItemNode::setSize(const QSizeF &size, SL sl) void QmlItemNode::setRotation(const qreal &angle, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node set rotation", category(), keyValue("model node", *this), @@ -1114,7 +1051,6 @@ void QmlItemNode::setRotation(const qreal &angle, SL sl) qreal QmlItemNode::rotation(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node rotation", category(), keyValue("model node", *this), @@ -1129,7 +1065,6 @@ qreal QmlItemNode::rotation(SL sl) const QVariant QmlItemNode::transformOrigin(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml item node transform origin", category(), keyValue("model node", *this), diff --git a/src/plugins/qmldesigner/qmltools/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/qmltools/qmlmodelnodefacade.cpp index 849c6e248ca..193c05f9932 100644 --- a/src/plugins/qmldesigner/qmltools/qmlmodelnodefacade.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlmodelnodefacade.cpp @@ -6,6 +6,8 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; AbstractView *QmlModelNodeFacade::view() const @@ -43,7 +45,6 @@ bool QmlModelNodeFacade::hasModelNode() const bool QmlModelNodeFacade::isValid(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is valid qml model node facade", category(), keyValue("model node", m_modelNode), @@ -54,7 +55,6 @@ bool QmlModelNodeFacade::isValid(SL sl) const bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is valid qml model node facade", category(), keyValue("model node", modelNode), @@ -67,7 +67,6 @@ bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode, S bool QmlModelNodeFacade::isRootNode(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is root node", category(), keyValue("model node", m_modelNode), diff --git a/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp b/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp index 3c9ddee2af2..3f41e233780 100644 --- a/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlobjectnode.cpp @@ -29,11 +29,12 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; void QmlObjectNode::setVariantProperty(PropertyNameView name, const QVariant &value, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node set variant property", category(), keyValue("model node", *this), @@ -86,7 +87,6 @@ void QmlObjectNode::setVariantProperty(PropertyNameView name, const QVariant &va void QmlObjectNode::setBindingProperty(PropertyNameView name, const QString &expression, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node set binding property", category(), keyValue("model node", *this), @@ -111,7 +111,6 @@ void QmlObjectNode::setBindingProperty(PropertyNameView name, const QString &exp QmlModelState QmlObjectNode::currentState(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node current state", category(), keyValue("model node", *this), @@ -125,7 +124,6 @@ QmlModelState QmlObjectNode::currentState(SL sl) const QmlTimeline QmlObjectNode::currentTimeline(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node current timeline", category(), keyValue("model node", *this), @@ -139,7 +137,6 @@ QmlTimeline QmlObjectNode::currentTimeline(SL sl) const bool QmlObjectNode::isRootModelNode(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node is root model node", category(), keyValue("model node", *this), @@ -156,7 +153,6 @@ bool QmlObjectNode::isRootModelNode(SL sl) const */ QVariant QmlObjectNode::instanceValue(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance value", category(), keyValue("model node", *this), @@ -167,7 +163,6 @@ QVariant QmlObjectNode::instanceValue(PropertyNameView name, SL sl) const bool QmlObjectNode::hasProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node has property", category(), keyValue("model node", *this), @@ -187,7 +182,6 @@ bool QmlObjectNode::hasProperty(PropertyNameView name, SL sl) const bool QmlObjectNode::hasBindingProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node has binding property", category(), keyValue("model node", *this), @@ -203,7 +197,6 @@ bool QmlObjectNode::hasBindingProperty(PropertyNameView name, SL sl) const NodeAbstractProperty QmlObjectNode::nodeAbstractProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node node abstract property", category(), keyValue("model node", *this), @@ -214,7 +207,6 @@ NodeAbstractProperty QmlObjectNode::nodeAbstractProperty(PropertyNameView name, NodeAbstractProperty QmlObjectNode::defaultNodeAbstractProperty(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node default node abstract property", category(), keyValue("model node", *this), @@ -225,7 +217,6 @@ NodeAbstractProperty QmlObjectNode::defaultNodeAbstractProperty(SL sl) const NodeProperty QmlObjectNode::nodeProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node node property", category(), keyValue("model node", *this), @@ -236,7 +227,6 @@ NodeProperty QmlObjectNode::nodeProperty(PropertyNameView name, SL sl) const NodeListProperty QmlObjectNode::nodeListProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node node list property", category(), keyValue("model node", *this), @@ -247,7 +237,6 @@ NodeListProperty QmlObjectNode::nodeListProperty(PropertyNameView name, SL sl) c bool QmlObjectNode::instanceHasValue(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance has value", category(), keyValue("model node", *this), @@ -258,7 +247,6 @@ bool QmlObjectNode::instanceHasValue(PropertyNameView name, SL sl) const bool QmlObjectNode::propertyAffectedByCurrentState(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node property affected by current state", category(), keyValue("model node", *this), @@ -281,7 +269,6 @@ bool QmlObjectNode::propertyAffectedByCurrentState(PropertyNameView name, SL sl) QVariant QmlObjectNode::modelValue(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node model value", category(), keyValue("model node", *this), @@ -321,7 +308,6 @@ QVariant QmlObjectNode::modelValue(PropertyNameView name, SL sl) const bool QmlObjectNode::isTranslatableText(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node is translatable text", category(), keyValue("model node", *this), @@ -343,7 +329,6 @@ bool QmlObjectNode::isTranslatableText(PropertyNameView name, SL sl) const QString QmlObjectNode::stripedTranslatableText(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node stroped translatable text", category(), keyValue("model node", *this), @@ -363,7 +348,6 @@ QString QmlObjectNode::stripedTranslatableText(PropertyNameView name, SL sl) con BindingProperty QmlObjectNode::bindingProperty(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node binding property", category(), keyValue("model node", *this), @@ -388,7 +372,6 @@ BindingProperty QmlObjectNode::bindingProperty(PropertyNameView name, SL sl) con QString QmlObjectNode::expression(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node expression", category(), keyValue("model node", *this), @@ -402,7 +385,6 @@ QString QmlObjectNode::expression(PropertyNameView name, SL sl) const */ bool QmlObjectNode::isInBaseState(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node is in base state", category(), keyValue("model node", *this), @@ -413,7 +395,6 @@ bool QmlObjectNode::isInBaseState(SL sl) const bool QmlObjectNode::timelineIsActive(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node timeline is active", category(), keyValue("model node", *this), @@ -424,7 +405,6 @@ bool QmlObjectNode::timelineIsActive(SL sl) const bool QmlObjectNode::instanceCanReparent(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance can reparent", category(), keyValue("model node", *this), @@ -438,7 +418,6 @@ bool QmlObjectNode::instanceCanReparent(SL sl) const QmlPropertyChanges QmlObjectNode::propertyChangeForCurrentState(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node property change for current state", category(), keyValue("model node", *this), @@ -463,7 +442,6 @@ QmlPropertyChanges QmlObjectNode::propertyChangeForCurrentState(SL sl) const */ void QmlObjectNode::destroy(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node destroy", category(), keyValue("model node", *this), @@ -474,7 +452,6 @@ void QmlObjectNode::destroy(SL sl) void QmlObjectNode::ensureAliasExport(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node ensure alias export", category(), keyValue("model node", *this), @@ -493,7 +470,6 @@ void QmlObjectNode::ensureAliasExport(SL sl) bool QmlObjectNode::isAliasExported(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node is alias exported", category(), keyValue("model node", *this), @@ -518,7 +494,6 @@ bool QmlObjectNode::isAliasExported(SL sl) const QList QmlObjectNode::allAffectingStates(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node all affecting states", category(), keyValue("model node", *this), @@ -543,7 +518,6 @@ QList QmlObjectNode::allAffectingStates(SL sl) const QList QmlObjectNode::allAffectingStatesOperations(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node all affecting states operations", category(), keyValue("model node", *this), @@ -581,7 +555,6 @@ static QList allQmlVisualNodesRecursive(const QmlVisualNode &qmlI QList QmlObjectNode::allDefinedStates(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node all defined states", category(), keyValue("model node", *this), @@ -611,7 +584,6 @@ QList QmlObjectNode::allDefinedStates(SL sl) const QList QmlObjectNode::allInvalidStateOperations(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node all invalid state operations", category(), keyValue("model node", *this), @@ -627,7 +599,6 @@ QList QmlObjectNode::allInvalidStateOperations(SL sl) co QmlModelStateGroup QmlObjectNode::states(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node states", category(), keyValue("model node", *this), @@ -641,7 +612,6 @@ QmlModelStateGroup QmlObjectNode::states(SL sl) const QList QmlObjectNode::allTimelines(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node all timelines", category(), keyValue("model node", *this), @@ -659,7 +629,6 @@ QList QmlObjectNode::allTimelines(SL sl) const QList QmlObjectNode::getAllConnections(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node get all connections", category(), keyValue("model node", *this), @@ -682,7 +651,6 @@ QList QmlObjectNode::getAllConnections(SL sl) const void QmlObjectNode::removeProperty(PropertyNameView name, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node remove property", category(), keyValue("model node", *this), @@ -724,7 +692,6 @@ QList toQmlObjectNodeList(const QList &modelNodeList) bool QmlObjectNode::isAncestorOf(const QmlObjectNode &objectNode, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node is ancestor of", category(), keyValue("model node", *this), @@ -735,7 +702,6 @@ bool QmlObjectNode::isAncestorOf(const QmlObjectNode &objectNode, SL sl) const QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, PropertyNameView name, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance value", category(), keyValue("caller location", sl)}; @@ -748,7 +714,6 @@ QString QmlObjectNode::generateTranslatableText([[maybe_unused]] const QString & const DesignerSettings &settings, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node generate translatable text", category(), keyValue("caller location", sl)}; @@ -771,7 +736,6 @@ QString QmlObjectNode::generateTranslatableText([[maybe_unused]] const QString & QString QmlObjectNode::stripedTranslatableTextFunction(const QString &text, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node striped translatable text function", category(), keyValue("caller location", sl)}; @@ -788,7 +752,6 @@ QString QmlObjectNode::convertToCorrectTranslatableFunction(const QString &text, const DesignerSettings &designerSettings, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node convert to correct translatable function", category(), keyValue("caller location", sl)}; @@ -798,7 +761,6 @@ QString QmlObjectNode::convertToCorrectTranslatableFunction(const QString &text, TypeName QmlObjectNode::instanceType(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance type", category(), keyValue("model node", *this), @@ -809,7 +771,6 @@ TypeName QmlObjectNode::instanceType(PropertyNameView name, SL sl) const bool QmlObjectNode::instanceHasBinding(PropertyNameView name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance has binding", category(), keyValue("model node", *this), @@ -838,7 +799,6 @@ QmlItemNode QmlObjectNode::itemForInstance(const NodeInstance &instance) const bool QmlObjectNode::isValidQmlObjectNode(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is valid qml object node", category(), keyValue("model node", modelNode), @@ -849,7 +809,6 @@ bool QmlObjectNode::isValidQmlObjectNode(const ModelNode &modelNode, SL sl) bool QmlObjectNode::isValid(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node is valid", category(), keyValue("model node", *this), @@ -876,7 +835,6 @@ QString QmlObjectNode::error() const bool QmlObjectNode::hasNodeParent(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node has node parent", category(), keyValue("model node", *this), @@ -887,7 +845,6 @@ bool QmlObjectNode::hasNodeParent(SL sl) const bool QmlObjectNode::hasInstanceParent(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node has instance parent", category(), keyValue("model node", *this), @@ -899,7 +856,6 @@ bool QmlObjectNode::hasInstanceParent(SL sl) const bool QmlObjectNode::hasInstanceParentItem(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node has instance parent item", category(), keyValue("model node", *this), @@ -912,7 +868,6 @@ bool QmlObjectNode::hasInstanceParentItem(SL sl) const void QmlObjectNode::setParentProperty(const NodeAbstractProperty &parentProeprty, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node set parent property", category(), keyValue("model node", *this), @@ -923,7 +878,6 @@ void QmlObjectNode::setParentProperty(const NodeAbstractProperty &parentProeprty QmlObjectNode QmlObjectNode::instanceParent(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance parent", category(), keyValue("model node", *this), @@ -937,7 +891,6 @@ QmlObjectNode QmlObjectNode::instanceParent(SL sl) const QmlItemNode QmlObjectNode::instanceParentItem(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance parent item", category(), keyValue("model node", *this), @@ -951,7 +904,6 @@ QmlItemNode QmlObjectNode::instanceParentItem(SL sl) const QmlItemNode QmlObjectNode::modelParentItem(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node instance parent item", category(), keyValue("model node", *this), @@ -962,7 +914,6 @@ QmlItemNode QmlObjectNode::modelParentItem(SL sl) const void QmlObjectNode::setId(const QString &id, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node set id", category(), keyValue("model node", *this), @@ -973,7 +924,6 @@ void QmlObjectNode::setId(const QString &id, SL sl) void QmlObjectNode::setNameAndId(const QString &newName, const QString &fallbackId, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node set name and id", category(), keyValue("model node", *this), @@ -998,7 +948,6 @@ void QmlObjectNode::setNameAndId(const QString &newName, const QString &fallback QString QmlObjectNode::id(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node id", category(), keyValue("model node", *this), @@ -1009,7 +958,6 @@ QString QmlObjectNode::id(SL sl) const QString QmlObjectNode::validId(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node valid id", category(), keyValue("model node", *this), @@ -1020,7 +968,6 @@ QString QmlObjectNode::validId(SL sl) bool QmlObjectNode::hasDefaultPropertyName(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node has default property name", category(), keyValue("model node", *this), @@ -1031,7 +978,6 @@ bool QmlObjectNode::hasDefaultPropertyName(SL sl) const PropertyName QmlObjectNode::defaultPropertyName(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node default property name", category(), keyValue("model node", *this), @@ -1042,7 +988,6 @@ PropertyName QmlObjectNode::defaultPropertyName(SL sl) const void QmlObjectNode::setParent(const QmlObjectNode &newParent, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node set parent", category(), keyValue("model node", *this), @@ -1054,7 +999,6 @@ void QmlObjectNode::setParent(const QmlObjectNode &newParent, SL sl) QmlItemNode QmlObjectNode::toQmlItemNode(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node to qml item node", category(), keyValue("model node", *this), @@ -1065,7 +1009,6 @@ QmlItemNode QmlObjectNode::toQmlItemNode(SL sl) const QmlVisualNode QmlObjectNode::toQmlVisualNode(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node to qml visual node", category(), keyValue("model node", *this), @@ -1076,7 +1019,6 @@ QmlVisualNode QmlObjectNode::toQmlVisualNode(SL sl) const QString QmlObjectNode::simplifiedTypeName(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node simplified type name", category(), keyValue("model node", *this), @@ -1087,7 +1029,6 @@ QString QmlObjectNode::simplifiedTypeName(SL sl) const QStringList QmlObjectNode::allStateNames(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model node all state names", category(), keyValue("model node", *this), diff --git a/src/plugins/qmldesigner/qmltools/qmlstate.cpp b/src/plugins/qmldesigner/qmltools/qmlstate.cpp index 2ed06af6585..c8252876d1c 100644 --- a/src/plugins/qmldesigner/qmltools/qmlstate.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlstate.cpp @@ -15,11 +15,12 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; QmlPropertyChanges QmlModelState::propertyChanges(const ModelNode &node, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state property changes", category(), keyValue("model node", *this), @@ -44,7 +45,6 @@ QmlPropertyChanges QmlModelState::propertyChanges(const ModelNode &node, SL sl) QList QmlModelState::stateOperations(const ModelNode &node, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state state operations", category(), keyValue("model node", *this), @@ -70,7 +70,6 @@ QList QmlModelState::stateOperations(const ModelNode &no QList QmlModelState::propertyChanges(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state property changes", category(), keyValue("model node", *this), @@ -92,7 +91,6 @@ QList QmlModelState::propertyChanges(SL sl) const bool QmlModelState::hasPropertyChanges(const ModelNode &node, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state has property changes", category(), keyValue("model node", *this), @@ -112,7 +110,6 @@ bool QmlModelState::hasPropertyChanges(const ModelNode &node, SL sl) const bool QmlModelState::hasStateOperation(const ModelNode &node, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state has state operation", category(), keyValue("model node", *this), @@ -131,7 +128,6 @@ bool QmlModelState::hasStateOperation(const ModelNode &node, SL sl) const QList QmlModelState::stateOperations(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state state operations", category(), keyValue("model node", *this), @@ -154,7 +150,6 @@ QList QmlModelState::stateOperations(SL sl) const QList QmlModelState::allInvalidStateOperations(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state all invalid state operations", category(), keyValue("model node", *this), @@ -196,7 +191,6 @@ void QmlModelState::addChangeSetIfNotExists(const ModelNode &node) void QmlModelState::removePropertyChanges(const ModelNode &node, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state remove property changes", category(), keyValue("model node", *this), @@ -220,7 +214,6 @@ void QmlModelState::removePropertyChanges(const ModelNode &node, SL sl) */ bool QmlModelState::affectsModelNode(const ModelNode &node, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state affects model node", category(), keyValue("model node", *this), @@ -238,7 +231,6 @@ bool QmlModelState::affectsModelNode(const ModelNode &node, SL sl) const QList QmlModelState::allAffectedNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state all affected nodes", category(), keyValue("model node", *this), @@ -258,7 +250,6 @@ QList QmlModelState::allAffectedNodes(SL sl) const QString QmlModelState::name(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state name", category(), keyValue("model node", *this), @@ -272,7 +263,6 @@ QString QmlModelState::name(SL sl) const void QmlModelState::setName(const QString &name, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state set name", category(), keyValue("model node", *this), @@ -290,7 +280,6 @@ bool QmlModelState::isValid(SL sl) const bool QmlModelState::isValidQmlModelState(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is valid qml model state", category(), keyValue("model node", modelNode), @@ -305,7 +294,6 @@ bool QmlModelState::isValidQmlModelState(const ModelNode &modelNode, SL sl) */ void QmlModelState::destroy(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state destroy", category(), keyValue("model node", *this), @@ -320,7 +308,6 @@ void QmlModelState::destroy(SL sl) bool QmlModelState::isBaseState(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state is base state", category(), keyValue("model node", *this), @@ -331,7 +318,6 @@ bool QmlModelState::isBaseState(SL sl) const bool QmlModelState::isBaseState(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"is base state", category(), keyValue("model node", modelNode), @@ -342,7 +328,6 @@ bool QmlModelState::isBaseState(const ModelNode &modelNode, SL sl) QmlModelState QmlModelState::duplicate(const QString &name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state duplicate", category(), keyValue("model node", *this), @@ -387,7 +372,6 @@ QmlModelState QmlModelState::duplicate(const QString &name, SL sl) const QmlModelStateGroup QmlModelState::stateGroup(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state state group", category(), keyValue("model node", *this), @@ -399,7 +383,6 @@ QmlModelStateGroup QmlModelState::stateGroup(SL sl) const ModelNode QmlModelState::createQmlState(AbstractView *view, const PropertyListType &propertyList, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state create", category(), keyValue("view", view), @@ -423,7 +406,6 @@ ModelNode QmlModelState::createQmlState(AbstractView *view, const PropertyListTy void QmlModelState::setAsDefault(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state set as default", category(), keyValue("model node", *this), @@ -436,7 +418,6 @@ void QmlModelState::setAsDefault(SL sl) bool QmlModelState::isDefault(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state is default", category(), keyValue("model node", *this), @@ -453,7 +434,6 @@ bool QmlModelState::isDefault(SL sl) const void QmlModelState::setAnnotation(const Annotation &annotation, const QString &id, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state set annotation", category(), keyValue("model node", *this), @@ -468,7 +448,6 @@ void QmlModelState::setAnnotation(const Annotation &annotation, const QString &i Annotation QmlModelState::annotation(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state annotation", category(), keyValue("model node", *this), @@ -481,7 +460,6 @@ Annotation QmlModelState::annotation(SL sl) const QString QmlModelState::annotationName(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state annotation name", category(), keyValue("model node", *this), @@ -494,7 +472,6 @@ QString QmlModelState::annotationName(SL sl) const bool QmlModelState::hasAnnotation(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state has annotation", category(), keyValue("model node", *this), @@ -507,7 +484,6 @@ bool QmlModelState::hasAnnotation(SL sl) const void QmlModelState::removeAnnotation(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state remove annotation", category(), keyValue("model node", *this), @@ -521,7 +497,6 @@ void QmlModelState::removeAnnotation(SL sl) QString QmlModelState::extend(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state extend", category(), keyValue("model node", *this), @@ -535,7 +510,6 @@ QString QmlModelState::extend(SL sl) const void QmlModelState::setExtend(const QString &name, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state set extend", category(), keyValue("model node", *this), @@ -548,7 +522,6 @@ void QmlModelState::setExtend(const QString &name, SL sl) bool QmlModelState::hasExtend(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state has extend", category(), keyValue("model node", *this), @@ -562,7 +535,6 @@ bool QmlModelState::hasExtend(SL sl) const QmlModelState QmlModelState::createBaseState(const AbstractView *view, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state create base state", category(), keyValue("view", view), diff --git a/src/plugins/qmldesigner/qmltools/qmltimeline.cpp b/src/plugins/qmldesigner/qmltools/qmltimeline.cpp index 84562cd4377..b2aadd5adaf 100644 --- a/src/plugins/qmldesigner/qmltools/qmltimeline.cpp +++ b/src/plugins/qmldesigner/qmltools/qmltimeline.cpp @@ -17,6 +17,8 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; bool QmlTimeline::isValid(SL sl) const @@ -26,7 +28,6 @@ bool QmlTimeline::isValid(SL sl) const bool QmlTimeline::isValidQmlTimeline(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline is valid", category(), keyValue("model node", modelNode), @@ -37,7 +38,6 @@ bool QmlTimeline::isValidQmlTimeline(const ModelNode &modelNode, SL sl) void QmlTimeline::destroy(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline destroy", category(), keyValue("model node", *this), @@ -49,7 +49,6 @@ QmlTimelineKeyframeGroup QmlTimeline::keyframeGroup(const ModelNode &node, PropertyNameView propertyName, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline keyframe group", category(), keyValue("model node", *this), @@ -76,7 +75,6 @@ QmlTimelineKeyframeGroup QmlTimeline::keyframeGroup(const ModelNode &node, bool QmlTimeline::hasTimeline(const ModelNode &node, PropertyNameView propertyName, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline has timeline", category(), keyValue("model node", *this), @@ -102,7 +100,6 @@ bool QmlTimeline::hasTimeline(const ModelNode &node, PropertyNameView propertyNa qreal QmlTimeline::startKeyframe(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline start keyframe", category(), keyValue("model node", *this), @@ -115,7 +112,6 @@ qreal QmlTimeline::startKeyframe(SL sl) const qreal QmlTimeline::endKeyframe(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline end keyframe", category(), keyValue("model node", *this), @@ -128,7 +124,6 @@ qreal QmlTimeline::endKeyframe(SL sl) const qreal QmlTimeline::currentKeyframe(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline current keyframe", category(), keyValue("model node", *this), @@ -141,7 +136,6 @@ qreal QmlTimeline::currentKeyframe(SL sl) const qreal QmlTimeline::duration(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline duration", category(), keyValue("model node", *this), @@ -152,7 +146,6 @@ qreal QmlTimeline::duration(SL sl) const bool QmlTimeline::isEnabled(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline is enabled", category(), keyValue("model node", *this), @@ -163,7 +156,6 @@ bool QmlTimeline::isEnabled(SL sl) const qreal QmlTimeline::minActualKeyframe(const ModelNode &target, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline min actual keyframe", category(), keyValue("model node", *this), @@ -183,7 +175,6 @@ qreal QmlTimeline::minActualKeyframe(const ModelNode &target, SL sl) const qreal QmlTimeline::maxActualKeyframe(const ModelNode &target, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline max actual keyframe", category(), keyValue("model node", *this), @@ -203,7 +194,6 @@ qreal QmlTimeline::maxActualKeyframe(const ModelNode &target, SL sl) const void QmlTimeline::moveAllKeyframes(const ModelNode &target, qreal offset, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline move all keyframes", category(), keyValue("model node", *this), @@ -218,7 +208,6 @@ void QmlTimeline::moveAllKeyframes(const ModelNode &target, qreal offset, SL sl) void QmlTimeline::scaleAllKeyframes(const ModelNode &target, qreal factor, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline scale all keyframes", category(), keyValue("model node", *this), @@ -232,7 +221,6 @@ void QmlTimeline::scaleAllKeyframes(const ModelNode &target, qreal factor, SL sl QList QmlTimeline::allTargets(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline all targets", category(), keyValue("model node", *this), @@ -252,7 +240,6 @@ QList QmlTimeline::allTargets(SL sl) const QList QmlTimeline::keyframeGroupsForTarget(const ModelNode &target, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline keyframe groups for target", category(), keyValue("model node", *this), @@ -274,7 +261,6 @@ QList QmlTimeline::keyframeGroupsForTarget(const Model void QmlTimeline::destroyKeyframesForTarget(const ModelNode &target, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline destroy keyframes for target", category(), keyValue("model node", *this), @@ -289,7 +275,6 @@ void QmlTimeline::removeKeyframesForTargetAndProperty(const ModelNode &target, PropertyNameView propertyName, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline remove keyframes for target and property", category(), keyValue("model node", *this), @@ -305,7 +290,6 @@ void QmlTimeline::removeKeyframesForTargetAndProperty(const ModelNode &target, bool QmlTimeline::hasActiveTimeline(AbstractView *view, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline has active timeline", category(), keyValue("view", view), @@ -323,7 +307,6 @@ bool QmlTimeline::hasActiveTimeline(AbstractView *view, SL sl) bool QmlTimeline::isRecording(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline is recording", category(), keyValue("model node", *this), @@ -336,7 +319,6 @@ bool QmlTimeline::isRecording(SL sl) const void QmlTimeline::toogleRecording(bool record, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline toggle recording", category(), keyValue("model node", *this), @@ -356,7 +338,6 @@ void QmlTimeline::toogleRecording(bool record, SL sl) const void QmlTimeline::resetGroupRecording(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline reset group recording", category(), keyValue("model node", *this), @@ -392,7 +373,6 @@ void QmlTimeline::addKeyframeGroupIfNotExists(const ModelNode &node, PropertyNam bool QmlTimeline::hasKeyframeGroup(const ModelNode &node, PropertyNameView propertyName, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline has keyframe group", category(), keyValue("model node", *this), @@ -412,7 +392,6 @@ bool QmlTimeline::hasKeyframeGroup(const ModelNode &node, PropertyNameView prope bool QmlTimeline::hasKeyframeGroupForTarget(const ModelNode &node, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline has keyframe group for target", category(), keyValue("model node", *this), @@ -432,7 +411,6 @@ bool QmlTimeline::hasKeyframeGroupForTarget(const ModelNode &node, SL sl) const void QmlTimeline::insertKeyframe(const ModelNode &target, PropertyNameView propertyName, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline insert keyframe", category(), keyValue("model node", *this), diff --git a/src/plugins/qmldesigner/qmltools/qmltimelinekeyframegroup.cpp b/src/plugins/qmldesigner/qmltools/qmltimelinekeyframegroup.cpp index a6efa1bc9a4..af2595a14df 100644 --- a/src/plugins/qmldesigner/qmltools/qmltimelinekeyframegroup.cpp +++ b/src/plugins/qmldesigner/qmltools/qmltimelinekeyframegroup.cpp @@ -18,11 +18,12 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; bool QmlTimelineKeyframeGroup::isValid(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group is valid", category(), keyValue("mode node", *this), @@ -33,7 +34,6 @@ bool QmlTimelineKeyframeGroup::isValid(SL sl) const bool QmlTimelineKeyframeGroup::isValidQmlTimelineKeyframeGroup(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group is valid", category(), keyValue("model node", modelNode), @@ -44,7 +44,6 @@ bool QmlTimelineKeyframeGroup::isValidQmlTimelineKeyframeGroup(const ModelNode & void QmlTimelineKeyframeGroup::destroy(SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group destroy", category(), keyValue("model node", *this), @@ -55,7 +54,6 @@ void QmlTimelineKeyframeGroup::destroy(SL sl) ModelNode QmlTimelineKeyframeGroup::target(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group target", category(), keyValue("model node", *this), @@ -66,7 +64,6 @@ ModelNode QmlTimelineKeyframeGroup::target(SL sl) const void QmlTimelineKeyframeGroup::setTarget(const ModelNode &target, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group target", category(), keyValue("model node", *this), @@ -80,7 +77,6 @@ void QmlTimelineKeyframeGroup::setTarget(const ModelNode &target, SL sl) PropertyName QmlTimelineKeyframeGroup::propertyName(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group property name", category(), keyValue("model node", *this), @@ -91,7 +87,6 @@ PropertyName QmlTimelineKeyframeGroup::propertyName(SL sl) const void QmlTimelineKeyframeGroup::setPropertyName(PropertyNameView propertyName, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group property name", category(), keyValue("model node", *this), @@ -103,7 +98,6 @@ void QmlTimelineKeyframeGroup::setPropertyName(PropertyNameView propertyName, SL int QmlTimelineKeyframeGroup::getSupposedTargetIndex(qreal newFrame, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group target index", category(), keyValue("model node", *this), @@ -128,7 +122,6 @@ int QmlTimelineKeyframeGroup::getSupposedTargetIndex(qreal newFrame, SL sl) cons int QmlTimelineKeyframeGroup::indexOfKeyframe(const ModelNode &frame, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group index of key frame", category(), keyValue("model node", *this), @@ -143,7 +136,6 @@ int QmlTimelineKeyframeGroup::indexOfKeyframe(const ModelNode &frame, SL sl) con void QmlTimelineKeyframeGroup::slideKeyframe(int /*sourceIndex*/, int /*targetIndex*/, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group slide key frame", category(), keyValue("model node", *this), @@ -156,7 +148,6 @@ void QmlTimelineKeyframeGroup::slideKeyframe(int /*sourceIndex*/, int /*targetIn bool QmlTimelineKeyframeGroup::isRecording(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group is recording", category(), keyValue("model node", *this), @@ -169,7 +160,6 @@ bool QmlTimelineKeyframeGroup::isRecording(SL sl) const void QmlTimelineKeyframeGroup::toogleRecording(bool record, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group toggle recording", category(), keyValue("model node", *this), @@ -188,7 +178,6 @@ void QmlTimelineKeyframeGroup::toogleRecording(bool record, SL sl) const QmlTimeline QmlTimelineKeyframeGroup::timeline(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group timeline", category(), keyValue("model node", *this), @@ -201,7 +190,6 @@ QmlTimeline QmlTimelineKeyframeGroup::timeline(SL sl) const bool QmlTimelineKeyframeGroup::isDangling(const ModelNode &node, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group is dangling", category(), keyValue("model node", node), @@ -213,7 +201,6 @@ bool QmlTimelineKeyframeGroup::isDangling(const ModelNode &node, SL sl) bool QmlTimelineKeyframeGroup::isDangling(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group is dangling", category(), keyValue("model node", *this), @@ -224,7 +211,6 @@ bool QmlTimelineKeyframeGroup::isDangling(SL sl) const void QmlTimelineKeyframeGroup::setValue(const QVariant &value, qreal currentFrame, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group set value", category(), keyValue("model node", *this), @@ -262,7 +248,6 @@ void QmlTimelineKeyframeGroup::setValue(const QVariant &value, qreal currentFram QVariant QmlTimelineKeyframeGroup::value(qreal frame, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group value", category(), keyValue("model node", *this), @@ -282,7 +267,6 @@ QVariant QmlTimelineKeyframeGroup::value(qreal frame, SL sl) const NodeMetaInfo QmlTimelineKeyframeGroup::valueType(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group value type", category(), keyValue("model node", *this), @@ -300,7 +284,6 @@ NodeMetaInfo QmlTimelineKeyframeGroup::valueType(SL sl) const bool QmlTimelineKeyframeGroup::hasKeyframe(qreal frame, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group has key frame", category(), keyValue("model node", *this), @@ -317,7 +300,6 @@ bool QmlTimelineKeyframeGroup::hasKeyframe(qreal frame, SL sl) ModelNode QmlTimelineKeyframeGroup::keyframe(qreal frame, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group key frame", category(), keyValue("model node", *this), @@ -334,7 +316,6 @@ ModelNode QmlTimelineKeyframeGroup::keyframe(qreal frame, SL sl) const qreal QmlTimelineKeyframeGroup::minActualKeyframe(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group min actual key frame", category(), keyValue("model node", *this), @@ -354,7 +335,6 @@ qreal QmlTimelineKeyframeGroup::minActualKeyframe(SL sl) const qreal QmlTimelineKeyframeGroup::maxActualKeyframe(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group max actual key frame", category(), keyValue("model node", *this), @@ -374,7 +354,6 @@ qreal QmlTimelineKeyframeGroup::maxActualKeyframe(SL sl) const QList QmlTimelineKeyframeGroup::keyframes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group key frames", category(), keyValue("model node", *this), @@ -385,7 +364,6 @@ QList QmlTimelineKeyframeGroup::keyframes(SL sl) const QList QmlTimelineKeyframeGroup::keyframePositions(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group key frame positions", category(), keyValue("model node", *this), @@ -398,7 +376,6 @@ QList QmlTimelineKeyframeGroup::keyframePositions(SL sl) const bool QmlTimelineKeyframeGroup::isValidKeyframe(const ModelNode &node, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group is valid key frame", category(), keyValue("model node", node), @@ -409,7 +386,6 @@ bool QmlTimelineKeyframeGroup::isValidKeyframe(const ModelNode &node, SL sl) bool QmlTimelineKeyframeGroup::checkKeyframesType(const ModelNode &node, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group check keyframes type", category(), keyValue("model node", node), @@ -421,7 +397,6 @@ bool QmlTimelineKeyframeGroup::checkKeyframesType(const ModelNode &node, SL sl) QmlTimelineKeyframeGroup QmlTimelineKeyframeGroup::keyframeGroupForKeyframe(const ModelNode &node, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group for key frame", category(), keyValue("model node", node), @@ -439,7 +414,6 @@ QmlTimelineKeyframeGroup QmlTimelineKeyframeGroup::keyframeGroupForKeyframe(cons QList QmlTimelineKeyframeGroup::allInvalidTimelineKeyframeGroups( AbstractView *view, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group all invalid timeline key frame groups", category(), keyValue("view", view), @@ -461,7 +435,6 @@ QList QmlTimelineKeyframeGroup::allInvalidTimelineKeyf void QmlTimelineKeyframeGroup::moveAllKeyframes(qreal offset, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group move all key frames", category(), keyValue("model node", *this), @@ -477,7 +450,6 @@ void QmlTimelineKeyframeGroup::moveAllKeyframes(qreal offset, SL sl) void QmlTimelineKeyframeGroup::scaleAllKeyframes(qreal factor, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml timeline key frame group scale all key frames", category(), keyValue("model node", *this), diff --git a/src/plugins/qmldesigner/qmltools/qmlvisualnode.cpp b/src/plugins/qmldesigner/qmltools/qmlvisualnode.cpp index 0fffc6de912..6a4674e7ddc 100644 --- a/src/plugins/qmldesigner/qmltools/qmlvisualnode.cpp +++ b/src/plugins/qmldesigner/qmltools/qmlvisualnode.cpp @@ -29,13 +29,14 @@ namespace QmlDesigner { +using NanotraceHR::keyValue; + static auto category = ModelTracing::category; static char imagePlaceHolder[] = "qrc:/qtquickplugin/images/template_image.png"; bool QmlVisualNode::isItemOr3DNode(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node is item or 3D node", category(), keyValue("model node", modelNode), @@ -60,7 +61,6 @@ bool QmlVisualNode::isValid(SL sl) const bool QmlVisualNode::isValidQmlVisualNode(const ModelNode &modelNode, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node is valid", category(), keyValue("model node", modelNode), @@ -79,7 +79,6 @@ bool QmlVisualNode::isValidQmlVisualNode(const ModelNode &modelNode, SL sl) bool QmlVisualNode::isRootNode(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node is root node", category(), keyValue("model node", *this), @@ -90,7 +89,6 @@ bool QmlVisualNode::isRootNode(SL sl) const QList QmlVisualNode::children(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node children", category(), keyValue("model node", *this), @@ -116,7 +114,6 @@ QList QmlVisualNode::children(SL sl) const QList QmlVisualNode::resources(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node resources", category(), keyValue("model node", *this), @@ -142,7 +139,6 @@ QList QmlVisualNode::resources(SL sl) const QList QmlVisualNode::allDirectSubNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node all direct sub nodes", category(), keyValue("model node", *this), @@ -153,7 +149,6 @@ QList QmlVisualNode::allDirectSubNodes(SL sl) const bool QmlVisualNode::hasChildren(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node has children", category(), keyValue("model node", *this), @@ -167,7 +162,6 @@ bool QmlVisualNode::hasChildren(SL sl) const bool QmlVisualNode::hasResources(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node has resources", category(), keyValue("model node", *this), @@ -181,7 +175,6 @@ bool QmlVisualNode::hasResources(SL sl) const const QList QmlVisualNode::allDirectSubModelNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node all direct sub model nodes", category(), keyValue("model node", *this), @@ -192,7 +185,6 @@ const QList QmlVisualNode::allDirectSubModelNodes(SL sl) const const QList QmlVisualNode::allSubModelNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node all sub model nodes", category(), keyValue("model node", *this), @@ -203,7 +195,6 @@ const QList QmlVisualNode::allSubModelNodes(SL sl) const bool QmlVisualNode::hasAnySubModelNodes(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node has any sub model nodes", category(), keyValue("model node", *this), @@ -214,7 +205,6 @@ bool QmlVisualNode::hasAnySubModelNodes(SL sl) const void QmlVisualNode::setVisibilityOverride(bool visible, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node set visibility override", category(), keyValue("model node", *this), @@ -228,7 +218,6 @@ void QmlVisualNode::setVisibilityOverride(bool visible, SL sl) bool QmlVisualNode::visibilityOverride(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node visibility override", category(), keyValue("model node", *this), @@ -241,7 +230,6 @@ bool QmlVisualNode::visibilityOverride(SL sl) const void QmlVisualNode::scatter(const ModelNode &targetNode, const std::optional &offset, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml visual node scatter", category(), keyValue("model node", *this), @@ -289,7 +277,6 @@ void QmlVisualNode::scatter(const ModelNode &targetNode, const std::optional toQmlVisualNodeList(const QList &modelNodeList) QStringList QmlModelStateGroup::names(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state group names", category(), keyValue("model node", m_modelNode), @@ -800,7 +773,6 @@ QStringList QmlModelStateGroup::names(SL sl) const QList QmlModelStateGroup::allStates(SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state group all states", category(), keyValue("model node", m_modelNode), @@ -822,7 +794,6 @@ QList QmlModelStateGroup::allStates(SL sl) const QmlModelState QmlModelStateGroup::addState(const QString &name, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state group add state", category(), keyValue("name", name), @@ -841,7 +812,6 @@ QmlModelState QmlModelStateGroup::addState(const QString &name, SL sl) void QmlModelStateGroup::removeState(const QString &name, SL sl) { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state group remove state", category(), keyValue("name", name), @@ -857,7 +827,6 @@ void QmlModelStateGroup::removeState(const QString &name, SL sl) QmlModelState QmlModelStateGroup::state(const QString &name, SL sl) const { - using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{"qml model state group state", category(), keyValue("name", name),