diff --git a/src/libs/nanotrace/nanotracehr.h b/src/libs/nanotrace/nanotracehr.h index cf260adab28..b6a30ec43cd 100644 --- a/src/libs/nanotrace/nanotracehr.h +++ b/src/libs/nanotrace/nanotracehr.h @@ -62,7 +62,6 @@ struct TracerLiteral : text{text} {} - friend consteval TracerLiteral operator""_t(const char *text, size_t size); constexpr operator std::string_view() const { return text; } @@ -74,10 +73,6 @@ private: std::string_view text; }; -consteval TracerLiteral operator""_t(const char *text, size_t size) -{ - return {std::string_view{text, size}}; -} } // namespace Literals using namespace Literals; @@ -333,7 +328,7 @@ template { static_assert( !std::is_same_v, - R"(The arguments type of the tracing event queue is a string view. You can only provide trace token arguments as TracerLiteral (""_t).)"); + R"(The arguments type of the tracing event queue is a string view. You can only provide trace token arguments as TracerLiteral ("").)"); if constexpr (std::is_same_v) eventArguments = {}; diff --git a/src/libs/sqlite/sqlitebasestatement.cpp b/src/libs/sqlite/sqlitebasestatement.cpp index 8557bf6ad2c..3dc7102c24e 100644 --- a/src/libs/sqlite/sqlitebasestatement.cpp +++ b/src/libs/sqlite/sqlitebasestatement.cpp @@ -82,7 +82,7 @@ void BaseStatement::waitForUnlockNotify() const void BaseStatement::reset() const noexcept { - NanotraceHR::Tracer tracer{"reset"_t, + NanotraceHR::Tracer tracer{"reset", sqliteLowLevelCategory(), keyValue("sqlite statement", handle())}; @@ -91,7 +91,7 @@ void BaseStatement::reset() const noexcept bool BaseStatement::next() const { - NanotraceHR::Tracer tracer{"next"_t, + NanotraceHR::Tracer tracer{"next", sqliteLowLevelCategory(), keyValue("sqlite statement", handle())}; int resultCode; @@ -120,7 +120,7 @@ void BaseStatement::step() const void BaseStatement::bindNull(int index) { - NanotraceHR::Tracer tracer{"bind null"_t, + NanotraceHR::Tracer tracer{"bind null", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index)}; @@ -137,7 +137,7 @@ void BaseStatement::bind(int index, NullValue) void BaseStatement::bind(int index, int value) { - NanotraceHR::Tracer tracer{"bind int"_t, + NanotraceHR::Tracer tracer{"bind int", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -150,7 +150,7 @@ void BaseStatement::bind(int index, int value) void BaseStatement::bind(int index, long long value) { - NanotraceHR::Tracer tracer{"bind long long"_t, + NanotraceHR::Tracer tracer{"bind long long", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -163,7 +163,7 @@ void BaseStatement::bind(int index, long long value) void BaseStatement::bind(int index, double value) { - NanotraceHR::Tracer tracer{"bind double"_t, + NanotraceHR::Tracer tracer{"bind double", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -176,7 +176,7 @@ void BaseStatement::bind(int index, double value) void BaseStatement::bind(int index, void *pointer) { - NanotraceHR::Tracer tracer{"bind pointer"_t, + NanotraceHR::Tracer tracer{"bind pointer", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -189,7 +189,7 @@ void BaseStatement::bind(int index, void *pointer) void BaseStatement::bind(int index, Utils::span values) { - NanotraceHR::Tracer tracer{"bind int span"_t, + NanotraceHR::Tracer tracer{"bind int span", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -208,7 +208,7 @@ void BaseStatement::bind(int index, Utils::span values) void BaseStatement::bind(int index, Utils::span values) { - NanotraceHR::Tracer tracer{"bind long long span"_t, + NanotraceHR::Tracer tracer{"bind long long span", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -227,7 +227,7 @@ void BaseStatement::bind(int index, Utils::span values) void BaseStatement::bind(int index, Utils::span values) { - NanotraceHR::Tracer tracer{"bind double span"_t, + NanotraceHR::Tracer tracer{"bind double span", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -246,7 +246,7 @@ void BaseStatement::bind(int index, Utils::span values) void BaseStatement::bind(int index, Utils::span values) { - NanotraceHR::Tracer tracer{"bind const char* span"_t, + NanotraceHR::Tracer tracer{"bind const char* span", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -265,7 +265,7 @@ void BaseStatement::bind(int index, Utils::span values) void BaseStatement::bind(int index, Utils::SmallStringView text) { - NanotraceHR::Tracer tracer{"bind string"_t, + NanotraceHR::Tracer tracer{"bind string", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -282,7 +282,7 @@ void BaseStatement::bind(int index, Utils::SmallStringView text) void BaseStatement::bind(int index, BlobView blobView) { - NanotraceHR::Tracer tracer{"bind blob"_t, + NanotraceHR::Tracer tracer{"bind blob", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("index", index), @@ -308,7 +308,7 @@ void BaseStatement::bind(int index, BlobView blobView) void BaseStatement::bind(int index, const Value &value) { NanotraceHR::Tracer tracer{ - "bind value"_t, + "bind value", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), }; @@ -335,7 +335,7 @@ void BaseStatement::bind(int index, const Value &value) void BaseStatement::bind(int index, ValueView value) { NanotraceHR::Tracer tracer{ - "bind value"_t, + "bind value", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), }; @@ -361,7 +361,7 @@ void BaseStatement::bind(int index, ValueView value) void BaseStatement::prepare(Utils::SmallStringView sqlStatement) { - NanotraceHR::Tracer tracer{"prepare"_t, + NanotraceHR::Tracer tracer{"prepare", sqliteLowLevelCategory(), keyValue("sql statement", sqlStatement)}; @@ -380,7 +380,7 @@ void BaseStatement::prepare(Utils::SmallStringView sqlStatement) m_compiledStatement.reset(sqliteStatement); if (resultCode == SQLITE_LOCKED) { - tracer.tick("wait for unlock"_t); + tracer.tick("wait for unlock"); waitForUnlockNotify(); } @@ -468,7 +468,7 @@ StringType convertToTextForColumn(sqlite3_stmt *sqlStatment, int column) Type BaseStatement::fetchType(int column) const { - NanotraceHR::Tracer tracer{"fetch type"_t, + NanotraceHR::Tracer tracer{"fetch type", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("column", column)}; @@ -493,7 +493,7 @@ Type BaseStatement::fetchType(int column) const int BaseStatement::fetchIntValue(int column) const { - NanotraceHR::Tracer tracer{"fetch int"_t, + NanotraceHR::Tracer tracer{"fetch int", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("column", column)}; @@ -524,7 +524,7 @@ long BaseStatement::fetchValue(int column) const long long BaseStatement::fetchLongLongValue(int column) const { - NanotraceHR::Tracer tracer{"fetch long long"_t, + NanotraceHR::Tracer tracer{"fetch long long", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("column", column)}; @@ -544,7 +544,7 @@ long long BaseStatement::fetchValue(int column) const double BaseStatement::fetchDoubleValue(int column) const { - NanotraceHR::Tracer tracer{"fetch double"_t, + NanotraceHR::Tracer tracer{"fetch double", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("column", column)}; @@ -558,7 +558,7 @@ double BaseStatement::fetchDoubleValue(int column) const BlobView BaseStatement::fetchBlobValue(int column) const { - NanotraceHR::Tracer tracer{"fetch blob"_t, + NanotraceHR::Tracer tracer{"fetch blob", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("column", column)}; @@ -575,7 +575,7 @@ double BaseStatement::fetchValue(int column) const template StringType BaseStatement::fetchValue(int column) const { - NanotraceHR::Tracer tracer{"fetch string value"_t, + NanotraceHR::Tracer tracer{"fetch string value", sqliteLowLevelCategory(), keyValue("sqlite statement", handle()), keyValue("column", column)}; @@ -596,7 +596,7 @@ template SQLITE_EXPORT Utils::PathString BaseStatement::fetchValue(statement)), }; diff --git a/src/libs/sqlite/sqlitebasestatement.h b/src/libs/sqlite/sqlitebasestatement.h index a41be5f4822..306f8bada3d 100644 --- a/src/libs/sqlite/sqlitebasestatement.h +++ b/src/libs/sqlite/sqlitebasestatement.h @@ -154,7 +154,7 @@ public: { using NanotraceHR::keyValue; NanotraceHR::Tracer tracer{ - "execute"_t, + "execute", sqliteHighLevelCategory(), keyValue("sqlite statement", BaseStatement::handle()), }; @@ -167,7 +167,7 @@ public: void bindValues(const ValueType &...values) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"bind"_t, + NanotraceHR::Tracer tracer{"bind", sqliteHighLevelCategory(), keyValue("sqlite statement", BaseStatement::handle())}; @@ -181,7 +181,7 @@ public: void write(const ValueType&... values) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"write"_t, + NanotraceHR::Tracer tracer{"write", sqliteHighLevelCategory(), keyValue("sqlite statement", BaseStatement::handle())}; @@ -218,7 +218,7 @@ public: auto values(const QueryTypes &...queryValues) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"values"_t, + NanotraceHR::Tracer tracer{"values", sqliteHighLevelCategory(), keyValue("sqlite statement", BaseStatement::handle())}; @@ -252,7 +252,7 @@ public: auto value(const QueryTypes &...queryValues) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"value"_t, + NanotraceHR::Tracer tracer{"value", sqliteHighLevelCategory(), keyValue("sqlite statement", BaseStatement::handle())}; @@ -271,7 +271,7 @@ public: auto optionalValue(const QueryTypes &...queryValues) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"optionalValue"_t, + NanotraceHR::Tracer tracer{"optionalValue", sqliteHighLevelCategory(), keyValue("sqlite statement", BaseStatement::handle())}; @@ -290,7 +290,7 @@ public: static auto toValue(Utils::SmallStringView sqlStatement, Database &database) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"toValue"_t, sqliteHighLevelCategory()}; + NanotraceHR::Tracer tracer{"toValue", sqliteHighLevelCategory()}; StatementImplementation statement(sqlStatement, database); @@ -305,7 +305,7 @@ public: void readCallback(Callable &&callable, const QueryTypes &...queryValues) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"readCallback"_t, + NanotraceHR::Tracer tracer{"readCallback", sqliteHighLevelCategory(), keyValue("sqlite statement", BaseStatement::handle())}; @@ -325,7 +325,7 @@ public: void readTo(Container &container, const QueryTypes &...queryValues) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"readTo"_t, + NanotraceHR::Tracer tracer{"readTo", sqliteHighLevelCategory(), keyValue("sqlite statement", BaseStatement::handle())}; @@ -427,7 +427,7 @@ public: using TracerCategory = std::decay_t; StatementImplementation &m_statement; NanotraceHR::Tracer tracer{ - "range"_t, + "range", sqliteHighLevelCategory(), NanotraceHR::keyValue("sqlite statement", m_statement.handle())}; }; diff --git a/src/libs/sqlite/sqliteexception.cpp b/src/libs/sqlite/sqliteexception.cpp index bb4a474adb0..5a54cf94b8f 100644 --- a/src/libs/sqlite/sqliteexception.cpp +++ b/src/libs/sqlite/sqliteexception.cpp @@ -38,7 +38,7 @@ void ExceptionWithMessage::printWarning() const StatementIsBusy::StatementIsBusy(Utils::SmallString &&sqliteErrorMessage) : ExceptionWithMessage{std::move(sqliteErrorMessage)} { - sqliteHighLevelCategory().threadEvent("StatementIsBusy"_t, + sqliteHighLevelCategory().threadEvent("StatementIsBusy", keyValue("error message", std::string_view{what()})); } @@ -55,7 +55,7 @@ const char *DatabaseIsBusy::what() const noexcept StatementHasError::StatementHasError(Utils::SmallString &&sqliteErrorMessage) : ExceptionWithMessage{std::move(sqliteErrorMessage)} { - sqliteHighLevelCategory().threadEvent("StatementHasError"_t, + sqliteHighLevelCategory().threadEvent("StatementHasError", keyValue("error message", std::string_view{what()})); } diff --git a/src/libs/sqlite/sqlitetracing.cpp b/src/libs/sqlite/sqlitetracing.cpp index 700546f1467..709e05b233b 100644 --- a/src/libs/sqlite/sqlitetracing.cpp +++ b/src/libs/sqlite/sqlitetracing.cpp @@ -23,14 +23,14 @@ thread_local NanotraceHR::EventQueue &sqliteLowLevelCategory() { thread_local NanotraceHR::StringViewWithStringArgumentsCategory - sqliteLowLevelCategory_{"sqlite low level"_t, eventQueue, sqliteLowLevelCategory}; + sqliteLowLevelCategory_{"sqlite low level", eventQueue, sqliteLowLevelCategory}; return sqliteLowLevelCategory_; } NanotraceHR::StringViewWithStringArgumentsCategory &sqliteHighLevelCategory() { thread_local NanotraceHR::StringViewWithStringArgumentsCategory - sqliteHighLevelCategory_{"sqlite high level"_t, eventQueue, sqliteHighLevelCategory}; + sqliteHighLevelCategory_{"sqlite high level", eventQueue, sqliteHighLevelCategory}; return sqliteHighLevelCategory_; } diff --git a/src/plugins/qmldesigner/imagecachecollectors/imagecachecollector.cpp b/src/plugins/qmldesigner/imagecachecollectors/imagecachecollector.cpp index 97148e664f1..18ff61a1d0c 100644 --- a/src/plugins/qmldesigner/imagecachecollectors/imagecachecollector.cpp +++ b/src/plugins/qmldesigner/imagecachecollectors/imagecachecollector.cpp @@ -83,7 +83,7 @@ void ImageCacheCollector::start(Utils::SmallStringView name, using namespace NanotraceHR::Literals; auto [collectorTraceToken, flowtoken] = traceToken.beginDurationWithFlow( - "generate image in standard collector"_t); + "generate image in standard collector"); RewriterView rewriterView{m_externalDependencies, RewriterView::Amend}; NodeInstanceView nodeInstanceView{m_connectionManager, m_externalDependencies}; diff --git a/src/plugins/qmldesigner/libs/designercore/imagecache/asynchronousimagecache.cpp b/src/plugins/qmldesigner/libs/designercore/imagecache/asynchronousimagecache.cpp index fdd06d19a16..b9a9001db15 100644 --- a/src/plugins/qmldesigner/libs/designercore/imagecache/asynchronousimagecache.cpp +++ b/src/plugins/qmldesigner/libs/designercore/imagecache/asynchronousimagecache.cpp @@ -20,7 +20,7 @@ using namespace NanotraceHR::Literals; namespace ImageCache { namespace { -thread_local Category category_{"image cache"_t, +thread_local Category category_{"image cache", QmlDesigner::Tracing::eventQueueWithStringArguments(), category}; } // namespace @@ -63,15 +63,15 @@ void AsynchronousImageCache::request(Utils::SmallStringView name, using namespace std::literals::string_view_literals; auto [durationToken, flowToken] = traceToken.beginDurationWithFlow( - "AsynchronousImageCache works on the image request"_t, + "AsynchronousImageCache works on the image request", keyValue("name", name), keyValue("extra id", extraId)); - auto timeStrampToken = durationToken.beginDuration("getting timestamp"_t); + auto timeStrampToken = durationToken.beginDuration("getting timestamp"); const auto timeStamp = timeStampProvider.timeStamp(name); timeStrampToken.end(keyValue("time stamp", timeStamp.value)); - auto storageTraceToken = durationToken.beginDuration("fetching image from storage"_t, + auto storageTraceToken = durationToken.beginDuration("fetching image from storage", keyValue("storage id", id)); auto requestImageFromStorage = [&](RequestType requestType) { switch (requestType) { @@ -92,7 +92,7 @@ void AsynchronousImageCache::request(Utils::SmallStringView name, if (entry) { if (entry->isNull()) { - storageTraceToken.tick("there was an null image in storage"_t); + storageTraceToken.tick("there was an null image in storage"); abortCallback(ImageCache::AbortReason::Failed); } else { captureCallback(*entry); @@ -106,7 +106,7 @@ void AsynchronousImageCache::request(Utils::SmallStringView name, const QImage &midSizeImage, const QImage &smallImage, ImageCache::TraceToken traceToken) { - auto token = traceToken.beginDuration("call capture callback"_t); + auto token = traceToken.beginDuration("call capture callback"); auto selectImage = [](RequestType requestType, const QImage &image, const QImage &midSizeImage, @@ -130,11 +130,11 @@ void AsynchronousImageCache::request(Utils::SmallStringView name, auto imageGenerationAbortedCallback = [abortCallback = std::move(abortCallback)](ImageCache::AbortReason reason, ImageCache::TraceToken traceToken) { - traceToken.tick("image could not be created"_t); + traceToken.tick("image could not be created"); abortCallback(reason); }; - traceToken.tick("call the generator"_t); + traceToken.tick("call the generator"); generator.generateImage(name, extraId, @@ -153,7 +153,7 @@ void AsynchronousImageCache::requestImage(Utils::SmallStringView name, ImageCache::AuxiliaryData auxiliaryData) { auto [trace, flowToken] = ImageCache::category().beginDurationWithFlow( - "request image in asynchronous image cache"_t); + "request image in asynchronous image cache"); m_taskQueue.addTask(trace.createToken(), std::move(name), std::move(extraId), @@ -171,7 +171,7 @@ void AsynchronousImageCache::requestMidSizeImage(Utils::SmallStringView name, ImageCache::AuxiliaryData auxiliaryData) { auto [traceToken, flowToken] = ImageCache::category().beginDurationWithFlow( - "request mid size image in asynchronous image cache"_t); + "request mid size image in asynchronous image cache"); m_taskQueue.addTask(traceToken.createToken(), std::move(name), std::move(extraId), @@ -189,7 +189,7 @@ void AsynchronousImageCache::requestSmallImage(Utils::SmallStringView name, ImageCache::AuxiliaryData auxiliaryData) { auto [traceToken, flowtoken] = ImageCache::category().beginDurationWithFlow( - "request small size image in asynchronous image cache"_t); + "request small size image in asynchronous image cache"); m_taskQueue.addTask(traceToken.createToken(), std::move(name), std::move(extraId), @@ -226,7 +226,7 @@ void AsynchronousImageCache::Clean::operator()(Entry &entry) { using namespace NanotraceHR::Literals; - entry.traceToken.tick("cleaning up in the cache"_t); + entry.traceToken.tick("cleaning up in the cache"); entry.abortCallback(ImageCache::AbortReason::Abort); } diff --git a/src/plugins/qmldesigner/libs/designercore/imagecache/asynchronousimagefactory.cpp b/src/plugins/qmldesigner/libs/designercore/imagecache/asynchronousimagefactory.cpp index 83fd238f1db..fbeb0bab382 100644 --- a/src/plugins/qmldesigner/libs/designercore/imagecache/asynchronousimagefactory.cpp +++ b/src/plugins/qmldesigner/libs/designercore/imagecache/asynchronousimagefactory.cpp @@ -27,7 +27,7 @@ void AsynchronousImageFactory::generate(Utils::SmallStringView name, ImageCache::AuxiliaryData auxiliaryData) { auto [trace, flowToken] = ImageCache::category().beginDurationWithFlow( - "request image in asynchronous image factory"_t); + "request image in asynchronous image factory"); m_taskQueue.addTask(trace.createToken(), name, extraId, @@ -45,7 +45,7 @@ void AsynchronousImageFactory::request(Utils::SmallStringView name, ImageCacheCollectorInterface &collector, ImageCache::TraceToken traceToken) { - auto [storageTracer, flowToken] = traceToken.beginDurationWithFlow("starte image generator"_t); + auto [storageTracer, flowToken] = traceToken.beginDurationWithFlow("starte image generator"); const auto id = extraId.empty() ? Utils::PathString{name} : Utils::PathString::join({name, "+", extraId}); diff --git a/src/plugins/qmldesigner/libs/designercore/imagecache/taskqueue.h b/src/plugins/qmldesigner/libs/designercore/imagecache/taskqueue.h index dc5ed3de23f..19054e947f3 100644 --- a/src/plugins/qmldesigner/libs/designercore/imagecache/taskqueue.h +++ b/src/plugins/qmldesigner/libs/designercore/imagecache/taskqueue.h @@ -124,10 +124,10 @@ private: return; auto [threadCreateToken, flowToken] = traceToken.beginDurationWithFlow( - "thread is created in the task queue"_t); + "thread is created in the task queue"); m_backgroundThread = std::thread{[this](auto traceToken) { auto duration = traceToken.beginDuration( - "thread is ready"_t); + "thread is ready"); while (true) { auto [lock, abort] = waitForTasks(); @@ -137,7 +137,7 @@ private: return; auto getTaskToken = duration.beginDuration( - "get task from queue"_t); + "get task from queue"); if (auto task = getTask(std::move(lock)); task) { getTaskToken.end(); m_dispatchCallback(*task); diff --git a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp index 56836119d06..43bdbcdd875 100644 --- a/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/libs/designercore/metainfo/nodemetainfo.cpp @@ -1504,7 +1504,7 @@ MetaInfoType NodeMetaInfo::type() const if constexpr (useProjectStorage()) { if (isValid()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get type", category(), keyValue("type id", m_typeId)}; auto kind = typeData().traits.kind; tracer.end(keyValue("type kind", kind)); @@ -1531,7 +1531,7 @@ bool NodeMetaInfo::isFileComponent() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is file component"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is file component", category(), keyValue("type id", m_typeId)}; auto isFileComponent = typeData().traits.isFileComponent; @@ -1551,7 +1551,7 @@ FlagIs NodeMetaInfo::canBeContainer() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"can be container"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"can be container", category(), keyValue("type id", m_typeId)}; auto canBeContainer = typeData().traits.canBeContainer; @@ -1570,7 +1570,7 @@ FlagIs NodeMetaInfo::forceClip() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"force clip"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"force clip", category(), keyValue("type id", m_typeId)}; auto forceClip = typeData().traits.forceClip; @@ -1589,7 +1589,7 @@ FlagIs NodeMetaInfo::doesLayoutChildren() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"does layout children"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"does layout children", category(), keyValue("type id", m_typeId)}; auto doesLayoutChildren = typeData().traits.doesLayoutChildren; @@ -1608,7 +1608,7 @@ FlagIs NodeMetaInfo::canBeDroppedInFormEditor() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"can be dropped in form editor"_t, + NanotraceHR::Tracer tracer{"can be dropped in form editor", category(), keyValue("type id", m_typeId)}; @@ -1629,7 +1629,7 @@ FlagIs NodeMetaInfo::canBeDroppedInNavigator() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"can be dropped in navigator"_t, + NanotraceHR::Tracer tracer{"can be dropped in navigator", category(), keyValue("type id", m_typeId)}; @@ -1650,7 +1650,7 @@ FlagIs NodeMetaInfo::canBeDroppedInView3D() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"can be dropped in view3d"_t, + NanotraceHR::Tracer tracer{"can be dropped in view3d", category(), keyValue("type id", m_typeId)}; @@ -1671,7 +1671,7 @@ FlagIs NodeMetaInfo::isMovable() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is movable"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is movable", category(), keyValue("type id", m_typeId)}; auto isMovable = typeData().traits.isMovable; @@ -1690,7 +1690,7 @@ FlagIs NodeMetaInfo::isResizable() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is resizable"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is resizable", category(), keyValue("type id", m_typeId)}; auto isResizable = typeData().traits.isResizable; @@ -1709,7 +1709,7 @@ FlagIs NodeMetaInfo::hasFormEditorItem() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"has form editor item"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"has form editor item", category(), keyValue("type id", m_typeId)}; auto hasFormEditorItem = typeData().traits.hasFormEditorItem; @@ -1728,7 +1728,7 @@ FlagIs NodeMetaInfo::isStackedContainer() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is stacked container"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is stacked container", category(), keyValue("type id", m_typeId)}; auto isStackedContainer = typeData().traits.isStackedContainer; @@ -1747,7 +1747,7 @@ FlagIs NodeMetaInfo::takesOverRenderingOfChildren() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"takes over rendering of children"_t, + NanotraceHR::Tracer tracer{"takes over rendering of children", category(), keyValue("type id", m_typeId)}; @@ -1768,7 +1768,7 @@ FlagIs NodeMetaInfo::visibleInNavigator() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"visible in navigator"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"visible in navigator", category(), keyValue("type id", m_typeId)}; auto visibleInNavigator = typeData().traits.visibleInNavigator; @@ -1799,7 +1799,7 @@ FlagIs NodeMetaInfo::visibleInLibrary() const return FlagIs::False; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"visible in library"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"visible in library", category(), keyValue("type id", m_typeId)}; auto visibleInLibrary = typeData().traits.visibleInLibrary; @@ -1818,7 +1818,7 @@ namespace { Utils::SmallStringView propertyName) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get combound property id"_t, + NanotraceHR::Tracer tracer{"get combound property id", category(), keyValue("type id", typeId), keyValue("property name", propertyName)}; @@ -1858,7 +1858,7 @@ bool NodeMetaInfo::hasProperty(Utils::SmallStringView propertyName) const { if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"has property"_t, + NanotraceHR::Tracer tracer{"has property", category(), keyValue("type id", m_typeId), keyValue("property name", propertyName)}; @@ -1883,7 +1883,7 @@ PropertyMetaInfos NodeMetaInfo::properties() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get properties"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get properties", category(), keyValue("type id", m_typeId)}; return Utils::transform(m_projectStorage->propertyDeclarationIds(m_typeId), PropertyMetaInfo::bind(m_projectStorage)); @@ -1908,7 +1908,7 @@ PropertyMetaInfos NodeMetaInfo::localProperties() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get local properties"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get local properties", category(), keyValue("type id", m_typeId)}; return Utils::transform(m_projectStorage->localPropertyDeclarationIds( m_typeId), @@ -1934,7 +1934,7 @@ PropertyMetaInfo NodeMetaInfo::property(PropertyNameView propertyName) const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property"_t, + NanotraceHR::Tracer tracer{"get property", category(), keyValue("type id", m_typeId), keyValue("property name", propertyName)}; @@ -1955,7 +1955,7 @@ PropertyNameList NodeMetaInfo::signalNames() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get signal names"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get signal names", category(), keyValue("type id", m_typeId)}; return Utils::transform(m_projectStorage->signalDeclarationNames(m_typeId), &Utils::SmallString::toQByteArray); @@ -1972,7 +1972,7 @@ PropertyNameList NodeMetaInfo::slotNames() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get slot names"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get slot names", category(), keyValue("type id", m_typeId)}; return Utils::transform(m_projectStorage->functionDeclarationNames(m_typeId), &Utils::SmallString::toQByteArray); } else { @@ -1987,7 +1987,7 @@ PropertyName NodeMetaInfo::defaultPropertyName() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get default property name"_t, + NanotraceHR::Tracer tracer{"get default property name", category(), keyValue("type id", m_typeId)}; if (auto name = m_projectStorage->propertyName(defaultPropertyDeclarationId())) { @@ -2009,7 +2009,7 @@ PropertyMetaInfo NodeMetaInfo::defaultProperty() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get default property"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get default property", category(), keyValue("type id", m_typeId)}; auto id = defaultPropertyDeclarationId(); @@ -2027,7 +2027,7 @@ bool NodeMetaInfo::hasDefaultProperty() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"has default property"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"has default property", category(), keyValue("type id", m_typeId)}; auto hasDefaultProperty = bool(defaultPropertyDeclarationId()); tracer.end(keyValue("has default property", hasDefaultProperty)); @@ -2044,7 +2044,7 @@ std::vector NodeMetaInfo::selfAndPrototypes() const #ifdef QDS_USE_PROJECTSTORAGE using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get self and prototypes"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get self and prototypes", category(), keyValue("type id", m_typeId)}; return Utils::transform(m_projectStorage->prototypeAndSelfIds(m_typeId), NodeMetaInfo::bind(m_projectStorage)); @@ -2071,7 +2071,7 @@ NodeMetaInfos NodeMetaInfo::prototypes() const #ifdef QDS_USE_PROJECTSTORAGE using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get prototypes"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get prototypes", category(), keyValue("type id", m_typeId)}; return Utils::transform(m_projectStorage->prototypeIds(m_typeId), NodeMetaInfo::bind(m_projectStorage)); @@ -2172,7 +2172,7 @@ Storage::Info::ExportedTypeNames NodeMetaInfo::allExportedTypeNames() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get all exported type names"_t, + NanotraceHR::Tracer tracer{"get all exported type names", category(), keyValue("type id", m_typeId)}; @@ -2189,7 +2189,7 @@ Storage::Info::ExportedTypeNames NodeMetaInfo::exportedTypeNamesForSourceId(Sour if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get exported type names for source id"_t, + NanotraceHR::Tracer tracer{"get exported type names for source id", category(), keyValue("type id", m_typeId), keyValue("source id", sourceId)}; @@ -2207,7 +2207,7 @@ Storage::Info::TypeHints NodeMetaInfo::typeHints() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type hints"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get type hints", category(), keyValue("type id", m_typeId)}; auto hints = m_projectStorage->typeHints(m_typeId); @@ -2226,7 +2226,7 @@ Utils::PathString NodeMetaInfo::iconPath() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get icon path"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get icon path", category(), keyValue("type id", m_typeId)}; auto iconPath = m_projectStorage->typeIconPath(m_typeId); @@ -2245,7 +2245,7 @@ Storage::Info::ItemLibraryEntries NodeMetaInfo::itemLibrariesEntries() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get item library entries"_t, + NanotraceHR::Tracer tracer{"get item library entries", category(), keyValue("type id", m_typeId)}; @@ -2266,7 +2266,7 @@ SourceId NodeMetaInfo::sourceId() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get source id"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"get source id", category(), keyValue("type id", m_typeId)}; auto id = typeData().sourceId; @@ -2323,7 +2323,7 @@ SourceId NodeMetaInfo::propertyEditorPathId() const if (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property editor path id"_t, + NanotraceHR::Tracer tracer{"get property editor path id", category(), keyValue("type id", m_typeId)}; @@ -2398,7 +2398,7 @@ bool NodeMetaInfo::isSuitableForMouseAreaFill() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is suitable for mouse area fill"_t, + NanotraceHR::Tracer tracer{"is suitable for mouse area fill", category(), keyValue("type id", m_typeId)}; @@ -2432,7 +2432,7 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo) const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, + NanotraceHR::Tracer tracer{"is based on", category(), keyValue("type id", m_typeId), keyValue("meta info type id", metaInfo.m_typeId)}; @@ -2454,7 +2454,7 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, const NodeMetaInfo & return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is based on", category(), keyValue("type id", m_typeId)}; return m_projectStorage->isBasedOn(m_typeId, metaInfo1.m_typeId, metaInfo2.m_typeId); #else @@ -2477,7 +2477,7 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is based on", category(), keyValue("type id", m_typeId)}; return m_projectStorage->isBasedOn(m_typeId, metaInfo1.m_typeId, @@ -2506,7 +2506,7 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is based on", category(), keyValue("type id", m_typeId)}; return m_projectStorage->isBasedOn(m_typeId, metaInfo1.m_typeId, @@ -2535,7 +2535,7 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is based on", category(), keyValue("type id", m_typeId)}; return m_projectStorage->isBasedOn(m_typeId, metaInfo1.m_typeId, @@ -2567,7 +2567,7 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is based on", category(), keyValue("type id", m_typeId)}; return m_projectStorage->isBasedOn(m_typeId, metaInfo1.m_typeId, @@ -2602,7 +2602,7 @@ bool NodeMetaInfo::isBasedOn(const NodeMetaInfo &metaInfo1, return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is based on", category(), keyValue("type id", m_typeId)}; return m_projectStorage->isBasedOn(m_typeId, metaInfo1.m_typeId, @@ -2633,7 +2633,7 @@ bool NodeMetaInfo::isGraphicalItem() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is graphical item"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is graphical item", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; auto itemId = m_projectStorage->commonTypeId(); @@ -2657,7 +2657,7 @@ bool NodeMetaInfo::isQtObject() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is Qt object"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is Qt object", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -2673,7 +2673,7 @@ bool NodeMetaInfo::isQtQmlConnections() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is Qt Qml connections"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is Qt Qml connections", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -2689,7 +2689,7 @@ bool NodeMetaInfo::isLayoutable() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is layoutable"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is layoutable", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; auto positionerId = m_projectStorage->commonTypeId(); @@ -2712,7 +2712,7 @@ bool NodeMetaInfo::isQtQuickLayoutsLayout() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Layouts.Layout"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Layouts.Layout", category(), keyValue("type id", m_typeId)}; @@ -2730,7 +2730,7 @@ bool NodeMetaInfo::isView() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is view"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is view", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; auto listViewId = m_projectStorage->commonTypeId(); @@ -2751,7 +2751,7 @@ bool NodeMetaInfo::usesCustomParser() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"uses custom parser"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"uses custom parser", category(), keyValue("type id", m_typeId)}; return typeData().traits.usesCustomParser; #else @@ -2783,7 +2783,7 @@ bool NodeMetaInfo::isVector2D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is vector2d"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is vector2d", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isTypeId(m_typeId, m_projectStorage->commonTypeId()); @@ -2804,7 +2804,7 @@ bool NodeMetaInfo::isVector3D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is vector3d"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is vector3d", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isTypeId(m_typeId, m_projectStorage->commonTypeId()); @@ -2825,7 +2825,7 @@ bool NodeMetaInfo::isVector4D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is vector4d"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is vector4d", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isTypeId(m_typeId, m_projectStorage->commonTypeId()); @@ -2846,7 +2846,7 @@ bool NodeMetaInfo::isQtQuickPropertyChanges() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.PropertyChanges"_t, + NanotraceHR::Tracer tracer{"is QtQuick.PropertyChanges", category(), keyValue("type id", m_typeId)}; @@ -2865,7 +2865,7 @@ bool NodeMetaInfo::isQtSafeRendererSafeRendererPicture() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is Qt.SafeRenderer.SafeRendererPicture"_t, + NanotraceHR::Tracer tracer{"is Qt.SafeRenderer.SafeRendererPicture", category(), keyValue("type id", m_typeId)}; @@ -2883,7 +2883,7 @@ bool NodeMetaInfo::isQtSafeRendererSafePicture() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is Qt.SafeRenderer.SafePicture"_t, + NanotraceHR::Tracer tracer{"is Qt.SafeRenderer.SafePicture", category(), keyValue("type id", m_typeId)}; @@ -2901,7 +2901,7 @@ bool NodeMetaInfo::isQtQuickTimelineKeyframe() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Timeline.Keyframe"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Timeline.Keyframe", category(), keyValue("type id", m_typeId)}; @@ -2920,7 +2920,7 @@ bool NodeMetaInfo::isQtQuickTimelineTimelineAnimation() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Timeline.TimelineAnimation"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Timeline.TimelineAnimation", category(), keyValue("type id", m_typeId)}; @@ -2938,7 +2938,7 @@ bool NodeMetaInfo::isQtQuickTimelineTimeline() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Timeline.Timeline"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Timeline.Timeline", category(), keyValue("type id", m_typeId)}; @@ -2956,7 +2956,7 @@ bool NodeMetaInfo::isQtQuickTimelineKeyframeGroup() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Timeline.KeyframeGroup"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Timeline.KeyframeGroup", category(), keyValue("type id", m_typeId)}; @@ -2974,7 +2974,7 @@ bool NodeMetaInfo::isListOrGridView() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is list or grid view"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is list or grid view", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; auto listViewId = m_projectStorage->commonTypeId(); @@ -2992,7 +2992,7 @@ bool NodeMetaInfo::isNumber() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is number"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is number", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; auto intId = m_projectStorage->builtinTypeId(); @@ -3017,7 +3017,7 @@ bool NodeMetaInfo::isQtQuickExtrasPicture() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Extras.Picture"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Extras.Picture", category(), keyValue("type id", m_typeId)}; @@ -3035,7 +3035,7 @@ bool NodeMetaInfo::isQtQuickImage() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Image"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.Image", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; @@ -3052,7 +3052,7 @@ bool NodeMetaInfo::isQtQuickBorderImage() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.BorderImage"_t, + NanotraceHR::Tracer tracer{"is QtQuick.BorderImage", category(), keyValue("type id", m_typeId)}; @@ -3071,7 +3071,7 @@ bool NodeMetaInfo::isAlias() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is alias"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is alias", category(), keyValue("type id", m_typeId)}; return false; // all types are already resolved } else { @@ -3086,7 +3086,7 @@ bool NodeMetaInfo::isQtQuickPositioner() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Positioner"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Positioner", category(), keyValue("type id", m_typeId)}; @@ -3105,7 +3105,7 @@ bool NodeMetaInfo::isQtQuickPropertyAnimation() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.PropertyAnimation"_t, + NanotraceHR::Tracer tracer{"is QtQuick.PropertyAnimation", category(), keyValue("type id", m_typeId)}; @@ -3124,7 +3124,7 @@ bool NodeMetaInfo::isQtQuickRectangle() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Rectange"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.Rectange", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3140,7 +3140,7 @@ bool NodeMetaInfo::isQtQuickRepeater() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Repeater"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.Repeater", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3156,7 +3156,7 @@ bool NodeMetaInfo::isQtQuickControlsTabBar() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Controls.TabBar"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Controls.TabBar", category(), keyValue("type id", m_typeId)}; @@ -3174,7 +3174,7 @@ bool NodeMetaInfo::isQtQuickControlsLabel() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Controls.SwipeView"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Controls.SwipeView", category(), keyValue("type id", m_typeId)}; @@ -3192,7 +3192,7 @@ bool NodeMetaInfo::isQtQuickControlsSwipeView() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Controls.SwipeView"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Controls.SwipeView", category(), keyValue("type id", m_typeId)}; @@ -3210,7 +3210,7 @@ bool NodeMetaInfo::isQtQuick3DCamera() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Camera"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Camera", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3226,7 +3226,7 @@ bool NodeMetaInfo::isQtQuick3DBakedLightmap() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.BakedLightmap"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.BakedLightmap", category(), keyValue("type id", m_typeId)}; @@ -3244,7 +3244,7 @@ bool NodeMetaInfo::isQtQuick3DBuffer() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Buffer"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Buffer", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3260,7 +3260,7 @@ bool NodeMetaInfo::isQtQuick3DInstanceListEntry() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.InstanceListEntry"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.InstanceListEntry", category(), keyValue("type id", m_typeId)}; @@ -3278,7 +3278,7 @@ bool NodeMetaInfo::isQtQuick3DLight() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Light"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Light", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3294,7 +3294,7 @@ bool NodeMetaInfo::isQtQmlModelsListElement() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQml.Models.ListElement"_t, + NanotraceHR::Tracer tracer{"is QtQml.Models.ListElement", category(), keyValue("type id", m_typeId)}; @@ -3312,7 +3312,7 @@ bool NodeMetaInfo::isQtQuickListModel() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.ListModel"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.ListModel", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3328,7 +3328,7 @@ bool NodeMetaInfo::isQtQuickListView() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.ListView"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.ListView", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3344,7 +3344,7 @@ bool QmlDesigner::NodeMetaInfo::isQtQuickGridView() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.GridView"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.GridView", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3360,7 +3360,7 @@ bool NodeMetaInfo::isQtQuick3DInstanceList() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.InstanceList"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.InstanceList", category(), keyValue("type id", m_typeId)}; @@ -3378,7 +3378,7 @@ bool NodeMetaInfo::isQtQuick3DParticles3DParticle3D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.Particle3D"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.Particle3D", category(), keyValue("type id", m_typeId)}; @@ -3396,7 +3396,7 @@ bool NodeMetaInfo::isQtQuick3DParticles3DParticleEmitter3D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.ParticleEmitter3D"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.ParticleEmitter3D", category(), keyValue("type id", m_typeId)}; @@ -3415,7 +3415,7 @@ bool NodeMetaInfo::isQtQuick3DParticles3DAttractor3D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.Attractor3D"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.Attractor3D", category(), keyValue("type id", m_typeId)}; @@ -3433,7 +3433,7 @@ bool NodeMetaInfo::isQtQuick3DParticlesAbstractShape() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.AbstractShape"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.AbstractShape", category(), keyValue("type id", m_typeId)}; @@ -3452,7 +3452,7 @@ bool NodeMetaInfo::isQtQuickItem() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Item"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.Item", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3468,7 +3468,7 @@ bool NodeMetaInfo::isQtQuickPath() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Path"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.Path", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3484,7 +3484,7 @@ bool NodeMetaInfo::isQtQuickPauseAnimation() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.PauseAnimation"_t, + NanotraceHR::Tracer tracer{"is QtQuick.PauseAnimation", category(), keyValue("type id", m_typeId)}; @@ -3502,7 +3502,7 @@ bool NodeMetaInfo::isQtQuickTransition() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Transition"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Transition", category(), keyValue("type id", m_typeId)}; @@ -3520,7 +3520,7 @@ bool NodeMetaInfo::isQtQuickWindowWindow() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Window.Window"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Window.Window", category(), keyValue("type id", m_typeId)}; @@ -3538,7 +3538,7 @@ bool NodeMetaInfo::isQtQuickLoader() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Loader"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.Loader", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3554,7 +3554,7 @@ bool NodeMetaInfo::isQtQuickState() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.State"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.State", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3570,7 +3570,7 @@ bool NodeMetaInfo::isQtQuickStateOperation() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.StateOperation"_t, + NanotraceHR::Tracer tracer{"is QtQuick.StateOperation", category(), keyValue("type id", m_typeId)}; @@ -3589,7 +3589,7 @@ bool NodeMetaInfo::isQtQuickText() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Text"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick.Text", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3605,7 +3605,7 @@ bool NodeMetaInfo::isQtMultimediaSoundEffect() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtMultimedia.SoundEffect"_t, + NanotraceHR::Tracer tracer{"is QtMultimedia.SoundEffect", category(), keyValue("type id", m_typeId)}; @@ -3623,7 +3623,7 @@ bool NodeMetaInfo::isFlowViewItem() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is FlowView.ViewItem"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is FlowView.ViewItem", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; auto flowItemId = m_projectStorage->commonTypeId(); @@ -3644,7 +3644,7 @@ bool NodeMetaInfo::isFlowViewFlowItem() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is FlowView.FlowItem"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is FlowView.FlowItem", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3660,7 +3660,7 @@ bool NodeMetaInfo::isFlowViewFlowView() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is FlowView.FlowView"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is FlowView.FlowView", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3686,7 +3686,7 @@ bool NodeMetaInfo::isFlowViewFlowTransition() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is FlowView.FlowTransition"_t, + NanotraceHR::Tracer tracer{"is FlowView.FlowTransition", category(), keyValue("type id", m_typeId)}; @@ -3704,7 +3704,7 @@ bool NodeMetaInfo::isFlowViewFlowDecision() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is FlowView.FlowDecision"_t, + NanotraceHR::Tracer tracer{"is FlowView.FlowDecision", category(), keyValue("type id", m_typeId)}; @@ -3722,7 +3722,7 @@ bool NodeMetaInfo::isFlowViewFlowWildcard() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is FlowView.FlowWildcard"_t, + NanotraceHR::Tracer tracer{"is FlowView.FlowWildcard", category(), keyValue("type id", m_typeId)}; @@ -3740,7 +3740,7 @@ bool NodeMetaInfo::isQtQuickStudioComponentsGroupItem() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Studio.Components.GroupItem"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Studio.Components.GroupItem", category(), keyValue("type id", m_typeId)}; @@ -3758,7 +3758,7 @@ bool NodeMetaInfo::isQtQuickStudioUtilsJsonListModel() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick.Studio.Utils.JsonListModel"_t, + NanotraceHR::Tracer tracer{"is QtQuick.Studio.Utils.JsonListModel", category(), keyValue("type id", m_typeId)}; @@ -3777,7 +3777,7 @@ bool NodeMetaInfo::isQmlComponent() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QML.Component"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QML.Component", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3798,7 +3798,7 @@ bool NodeMetaInfo::isFont() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is font"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is font", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isValid() && isTypeId(m_typeId, m_projectStorage->commonTypeId()); @@ -3814,7 +3814,7 @@ bool NodeMetaInfo::isColor() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is color"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is color", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isValid() && isTypeId(m_typeId, m_projectStorage->builtinTypeId()); @@ -3835,7 +3835,7 @@ bool NodeMetaInfo::isBool() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is bool"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is bool", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isValid() && isTypeId(m_typeId, m_projectStorage->builtinTypeId()); @@ -3856,7 +3856,7 @@ bool NodeMetaInfo::isInteger() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is integer"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is integer", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isValid() && isTypeId(m_typeId, m_projectStorage->builtinTypeId()); @@ -3877,7 +3877,7 @@ bool NodeMetaInfo::isFloat() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is float"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is float", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; auto floatId = m_projectStorage->builtinTypeId(); @@ -3901,7 +3901,7 @@ bool NodeMetaInfo::isVariant() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is variant"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is variant", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isValid() && isTypeId(m_typeId, m_projectStorage->builtinTypeId()); @@ -3922,7 +3922,7 @@ bool NodeMetaInfo::isString() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is string"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is string", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isValid() && isTypeId(m_typeId, m_projectStorage->builtinTypeId()); @@ -3943,7 +3943,7 @@ bool NodeMetaInfo::isUrl() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is url"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is url", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isValid() && isTypeId(m_typeId, m_projectStorage->builtinTypeId()); @@ -3964,7 +3964,7 @@ bool NodeMetaInfo::isQtQuick3DTexture() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Texture"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Texture", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3981,7 +3981,7 @@ bool NodeMetaInfo::isQtQuick3DShader() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Shader"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Shader", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -3997,7 +3997,7 @@ bool NodeMetaInfo::isQtQuick3DPass() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Pass"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Pass", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -4013,7 +4013,7 @@ bool NodeMetaInfo::isQtQuick3DCommand() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Command"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Command", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -4029,7 +4029,7 @@ bool NodeMetaInfo::isQtQuick3DDefaultMaterial() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.DefaultMaterial"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.DefaultMaterial", category(), keyValue("type id", m_typeId)}; @@ -4057,7 +4057,7 @@ bool NodeMetaInfo::isQtQuick3DModel() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Model"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Model", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -4073,7 +4073,7 @@ bool NodeMetaInfo::isQtQuick3DNode() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Node"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Node", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -4089,7 +4089,7 @@ bool NodeMetaInfo::isQtQuick3DParticles3DAffector3D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.Affector3D"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.Affector3D", category(), keyValue("type id", m_typeId)}; @@ -4107,7 +4107,7 @@ bool NodeMetaInfo::isQtQuick3DView3D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.View3D"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.View3D", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -4123,7 +4123,7 @@ bool NodeMetaInfo::isQtQuick3DPrincipledMaterial() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.PrincipledMaterial"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.PrincipledMaterial", category(), keyValue("type id", m_typeId)}; @@ -4141,7 +4141,7 @@ bool NodeMetaInfo::isQtQuick3DSpecularGlossyMaterial() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.SpecularGlossyMaterial"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.SpecularGlossyMaterial", category(), keyValue("type id", m_typeId)}; @@ -4159,7 +4159,7 @@ bool NodeMetaInfo::isQtQuick3DParticles3DSpriteParticle3D() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.SpriteParticle3D"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.Particles3D.SpriteParticle3D", category(), keyValue("type id", m_typeId)}; @@ -4178,7 +4178,7 @@ bool NodeMetaInfo::isQtQuick3DTextureInput() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.TextureInput"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.TextureInput", category(), keyValue("type id", m_typeId)}; @@ -4196,7 +4196,7 @@ bool NodeMetaInfo::isQtQuick3DCubeMapTexture() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.CubeMapTexture"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.CubeMapTexture", category(), keyValue("type id", m_typeId)}; @@ -4216,7 +4216,7 @@ bool NodeMetaInfo::isQtQuick3DSceneEnvironment() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.SceneEnvironment"_t, + NanotraceHR::Tracer tracer{"is QtQuick3D.SceneEnvironment", category(), keyValue("type id", m_typeId)}; @@ -4234,7 +4234,7 @@ bool NodeMetaInfo::isQtQuick3DEffect() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is QtQuick3D.Effect"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is QtQuick3D.Effect", category(), keyValue("type id", m_typeId)}; using namespace Storage::Info; return isBasedOnCommonType(m_projectStorage, m_typeId); @@ -4250,7 +4250,7 @@ bool NodeMetaInfo::isEnumeration() const return false; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is enumeration"_t, category(), keyValue("type id", m_typeId)}; + NanotraceHR::Tracer tracer{"is enumeration", category(), keyValue("type id", m_typeId)}; return typeData().traits.isEnum; } @@ -4282,7 +4282,7 @@ NodeMetaInfo PropertyMetaInfo::propertyType() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property type"_t, + NanotraceHR::Tracer tracer{"get property type", category(), keyValue("property declaration id", m_id)}; @@ -4305,7 +4305,7 @@ NodeMetaInfo PropertyMetaInfo::type() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property owner type "_t, + NanotraceHR::Tracer tracer{"get property owner type ", category(), keyValue("property declaration id", m_id)}; @@ -4322,7 +4322,7 @@ PropertyName PropertyMetaInfo::name() const if constexpr (useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property name"_t, + NanotraceHR::Tracer tracer{"get property name", category(), keyValue("property declaration id", m_id)}; @@ -4339,7 +4339,7 @@ bool PropertyMetaInfo::isWritable() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is property writable"_t, + NanotraceHR::Tracer tracer{"is property writable", category(), keyValue("property declaration id", m_id)}; @@ -4356,7 +4356,7 @@ bool PropertyMetaInfo::isReadOnly() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is property read only"_t, + NanotraceHR::Tracer tracer{"is property read only", category(), keyValue("property declaration id", m_id)}; @@ -4373,7 +4373,7 @@ bool PropertyMetaInfo::isListProperty() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is list property"_t, + NanotraceHR::Tracer tracer{"is list property", category(), keyValue("property declaration id", m_id)}; @@ -4390,7 +4390,7 @@ bool PropertyMetaInfo::isEnumType() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is enum type"_t, + NanotraceHR::Tracer tracer{"is enum type", category(), keyValue("property has enumeration type", m_id)}; @@ -4407,7 +4407,7 @@ bool PropertyMetaInfo::isPrivate() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is private property"_t, + NanotraceHR::Tracer tracer{"is private property", category(), keyValue("property declaration id", m_id)}; @@ -4424,7 +4424,7 @@ bool PropertyMetaInfo::isPointer() const return {}; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is pointer property"_t, + NanotraceHR::Tracer tracer{"is pointer property", category(), keyValue("property declaration id", m_id)}; @@ -4449,7 +4449,7 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &value) const if constexpr (!useProjectStorage()) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"cast value"_t, + NanotraceHR::Tracer tracer{"cast value", category(), keyValue("property declaration id", m_id)}; diff --git a/src/plugins/qmldesigner/libs/designercore/model/internalbindingproperty.cpp b/src/plugins/qmldesigner/libs/designercore/model/internalbindingproperty.cpp index 8c99041b08d..44b2dce30ec 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/internalbindingproperty.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/internalbindingproperty.cpp @@ -24,7 +24,7 @@ QString InternalBindingProperty::expression() const void InternalBindingProperty::setExpression(const QString &expression) { - traceToken.tick("expression"_t, keyValue("expression", expression)); + traceToken.tick("expression", keyValue("expression", expression)); m_expression = expression; } diff --git a/src/plugins/qmldesigner/libs/designercore/model/internalnode_p.h b/src/plugins/qmldesigner/libs/designercore/model/internalnode_p.h index a850ead3ae1..8160e149e60 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/internalnode_p.h +++ b/src/plugins/qmldesigner/libs/designercore/model/internalnode_p.h @@ -63,7 +63,7 @@ public: , minorVersion(minorVersion) , isValid(true) , internalId(internalId) - , traceToken(flowTraceToken.beginAsynchronous("InternalNode"_t, + , traceToken(flowTraceToken.beginAsynchronous("InternalNode", keyValue("type", typeName), keyValue("internal id", internalId))) {} diff --git a/src/plugins/qmldesigner/libs/designercore/model/internalnodelistproperty.cpp b/src/plugins/qmldesigner/libs/designercore/model/internalnodelistproperty.cpp index a7ed51b18c3..d99f0116419 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/internalnodelistproperty.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/internalnodelistproperty.cpp @@ -41,8 +41,8 @@ void InternalNodeListProperty::add(const InternalNode::Pointer &internalNode) { Q_ASSERT(!m_nodes.contains(internalNode)); - auto flowToken = traceToken.tickWithFlow("add node"_t); - internalNode->traceToken.tick(flowToken, "node added"_t); + auto flowToken = traceToken.tickWithFlow("add node"); + internalNode->traceToken.tick(flowToken, "node added"); m_nodes.append(internalNode); } @@ -51,8 +51,8 @@ void InternalNodeListProperty::remove(const InternalNodePointer &internalNode) { Q_ASSERT(m_nodes.contains(internalNode)); - auto flowToken = traceToken.tickWithFlow("remove node"_t); - internalNode->traceToken.tick(flowToken, "node removed"_t); + auto flowToken = traceToken.tickWithFlow("remove node"); + internalNode->traceToken.tick(flowToken, "node removed"); m_nodes.removeAll(internalNode); } @@ -64,7 +64,7 @@ const InternalNodeListProperty::FewNodes &InternalNodeListProperty::nodeList() c void InternalNodeListProperty::slide(int from, int to) { - traceToken.tick("slide"_t, keyValue("from", from), keyValue("to", to)); + traceToken.tick("slide", keyValue("from", from), keyValue("to", to)); InternalNode::Pointer internalNode = m_nodes.at(from); m_nodes.remove(from); diff --git a/src/plugins/qmldesigner/libs/designercore/model/internalnodeproperty.cpp b/src/plugins/qmldesigner/libs/designercore/model/internalnodeproperty.cpp index 235f8855fd0..f87d5135672 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/internalnodeproperty.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/internalnodeproperty.cpp @@ -43,8 +43,8 @@ void InternalNodeProperty::remove([[maybe_unused]] const InternalNode::Pointer & { Q_ASSERT(m_node == node); - auto flowToken = traceToken.tickWithFlow("remove node"_t); - node->traceToken.tick(flowToken, "node removed"_t); + auto flowToken = traceToken.tickWithFlow("remove node"); + node->traceToken.tick(flowToken, "node removed"); m_node.reset(); } @@ -54,8 +54,8 @@ void InternalNodeProperty::add(const InternalNode::Pointer &node) Q_ASSERT(node); Q_ASSERT(node->parentProperty()); - auto flowToken = traceToken.tickWithFlow("add node"_t); - node->traceToken.tick(flowToken, "node added"_t); + auto flowToken = traceToken.tickWithFlow("add node"); + node->traceToken.tick(flowToken, "node added"); m_node = node; } diff --git a/src/plugins/qmldesigner/libs/designercore/model/internalproperty.cpp b/src/plugins/qmldesigner/libs/designercore/model/internalproperty.cpp index 7f8417a0ad6..f805e0c019b 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/internalproperty.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/internalproperty.cpp @@ -69,14 +69,14 @@ TypeName InternalProperty::dynamicTypeName() const void InternalProperty::setDynamicTypeName(const TypeName &name) { - traceToken.tick("dynamic type name"_t, keyValue("name", name)); + traceToken.tick("dynamic type name", keyValue("name", name)); m_dynamicType = name; } void InternalProperty::resetDynamicTypeName() { - traceToken.tick("reset dynamic type name"_t); + traceToken.tick("reset dynamic type name"); m_dynamicType.clear(); } diff --git a/src/plugins/qmldesigner/libs/designercore/model/internalsignalhandlerproperty.cpp b/src/plugins/qmldesigner/libs/designercore/model/internalsignalhandlerproperty.cpp index 61197feedb2..0a9753246bb 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/internalsignalhandlerproperty.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/internalsignalhandlerproperty.cpp @@ -23,7 +23,7 @@ QString InternalSignalHandlerProperty::source() const } void InternalSignalHandlerProperty::setSource(const QString &source) { - traceToken.tick("source"_t, keyValue("source", source)); + traceToken.tick("source", keyValue("source", source)); m_source = source; } @@ -40,7 +40,7 @@ QString InternalSignalDeclarationProperty::signature() const void InternalSignalDeclarationProperty::setSignature(const QString &signature) { - traceToken.tick("signature"_t, keyValue("signature", signature)); + traceToken.tick("signature", keyValue("signature", signature)); m_signature = signature; } diff --git a/src/plugins/qmldesigner/libs/designercore/model/internalvariantproperty.cpp b/src/plugins/qmldesigner/libs/designercore/model/internalvariantproperty.cpp index c031f73ba8c..ec7987c38ea 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/internalvariantproperty.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/internalvariantproperty.cpp @@ -18,7 +18,7 @@ QVariant InternalVariantProperty::value() const void InternalVariantProperty::setValue(const QVariant &value) { - traceToken.tick("value"_t, keyValue("value", value)); + traceToken.tick("value", keyValue("value", value)); m_value = value; } diff --git a/src/plugins/qmldesigner/libs/designercore/model/model.cpp b/src/plugins/qmldesigner/libs/designercore/model/model.cpp index 8bd53b8b201..7dcea5e098a 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/libs/designercore/model/model.cpp @@ -152,7 +152,7 @@ ModelPrivate::~ModelPrivate() void ModelPrivate::detachAllViews() { - auto tracer = traceToken.begin("detach all views"_t); + auto tracer = traceToken.begin("detach all views"); for (const QPointer &view : std::as_const(m_viewList)) detachView(view.data(), true); @@ -197,7 +197,7 @@ Storage::Imports createStorageImports(const Imports &imports, void ModelPrivate::changeImports(Imports toBeAddedImports, Imports toBeRemovedImports) { - auto tracer = traceToken.begin("change imports"_t); + auto tracer = traceToken.begin("change imports"); std::sort(toBeAddedImports.begin(), toBeAddedImports.end()); std::sort(toBeRemovedImports.begin(), toBeRemovedImports.end()); @@ -274,7 +274,7 @@ void ModelPrivate::setDocumentMessages(const QList &errors, void ModelPrivate::setFileUrl(const QUrl &fileUrl) { - auto tracer = traceToken.begin("file url"_t); + auto tracer = traceToken.begin("file url"); QUrl oldPath = m_fileUrl; @@ -327,7 +327,7 @@ InternalNodePointer ModelPrivate::createNode(TypeNameView typeName, majorVersion, minorVersion, internalId, - traceToken.tickWithFlow("create node"_t)); + traceToken.tickWithFlow("create node")); setTypeId(newNode.get(), typeName); @@ -538,7 +538,7 @@ void ModelPrivate::changeNodeId(const InternalNodePointer &node, const QString & const QString oldId = node->id; node->id = id; - node->traceToken.tick("id"_t, std::forward_as_tuple("id", id)); + node->traceToken.tick("id", std::forward_as_tuple("id", id)); if (!oldId.isEmpty()) m_idNodeHash.remove(oldId); if (!id.isEmpty()) @@ -1175,7 +1175,7 @@ void ModelPrivate::setSelectedNodes(const FewNodes &selectedNodeList) if (sortedSelectedList == m_selectedInternalNodes) return; - auto flowToken = traceToken.tickWithFlow("selected model nodes"_t); + auto flowToken = traceToken.tickWithFlow("selected model nodes"); if constexpr (decltype(traceToken)::categoryIsActive()) { // the compiler should optimize it away but to be sure std::set_difference(sortedSelectedList.begin(), @@ -1183,7 +1183,7 @@ void ModelPrivate::setSelectedNodes(const FewNodes &selectedNodeList) m_selectedInternalNodes.begin(), m_selectedInternalNodes.end(), Utils::make_iterator([&](const auto &node) { - node->traceToken.tick(flowToken, "select model node"_t); + node->traceToken.tick(flowToken, "select model node"); })); } @@ -1196,7 +1196,7 @@ void ModelPrivate::setSelectedNodes(const FewNodes &selectedNodeList) m_selectedInternalNodes.begin(), m_selectedInternalNodes.end(), Utils::make_iterator([&](const auto &node) { - node->traceToken.tick(flowToken, "deselect model node"_t); + node->traceToken.tick(flowToken, "deselect model node"); })); } @@ -1205,7 +1205,7 @@ void ModelPrivate::setSelectedNodes(const FewNodes &selectedNodeList) void ModelPrivate::clearSelectedNodes() { - auto tracer = traceToken.begin("clear selected model nodes"_t); + auto tracer = traceToken.begin("clear selected model nodes"); auto lastSelectedNodeList = m_selectedInternalNodes; m_selectedInternalNodes.clear(); @@ -1573,7 +1573,7 @@ void ModelPrivate::changeRootNodeType(const TypeName &type, int majorVersion, in { Q_ASSERT(rootNode()); - m_rootInternalNode->traceToken.tick("type name"_t, keyValue("type name", type)); + m_rootInternalNode->traceToken.tick("type name", keyValue("type name", type)); m_rootInternalNode->typeName = type; m_rootInternalNode->majorVersion = majorVersion; @@ -1584,7 +1584,7 @@ void ModelPrivate::changeRootNodeType(const TypeName &type, int majorVersion, in void ModelPrivate::setScriptFunctions(const InternalNodePointer &node, const QStringList &scriptFunctionList) { - m_rootInternalNode->traceToken.tick("script function"_t); + m_rootInternalNode->traceToken.tick("script function"); node->scriptFunctions = scriptFunctionList; @@ -1593,7 +1593,7 @@ void ModelPrivate::setScriptFunctions(const InternalNodePointer &node, const QSt void ModelPrivate::setNodeSource(const InternalNodePointer &node, const QString &nodeSource) { - m_rootInternalNode->traceToken.tick("node source"_t); + m_rootInternalNode->traceToken.tick("node source"); node->nodeSource = nodeSource; notifyNodeSourceChanged(node, nodeSource); @@ -1858,7 +1858,7 @@ void Model::changeImports(Imports importsToBeAdded, Imports importsToBeRemoved) #ifndef QDS_USE_PROJECTSTORAGE void Model::setPossibleImports(Imports possibleImports) { - auto tracer = d->traceToken.begin("possible imports"_t); + auto tracer = d->traceToken.begin("possible imports"); std::sort(possibleImports.begin(), possibleImports.end()); @@ -1872,7 +1872,7 @@ void Model::setPossibleImports(Imports possibleImports) #ifndef QDS_USE_PROJECTSTORAGE void Model::setUsedImports(Imports usedImports) { - auto tracer = d->traceToken.begin("used imports"_t); + auto tracer = d->traceToken.begin("used imports"); std::sort(usedImports.begin(), usedImports.end()); @@ -2847,7 +2847,7 @@ The view is informed that it has been registered within the model by a call to A */ void Model::attachView(AbstractView *view) { - auto traceToken = d->traceToken.begin("attachView"_t, + auto traceToken = d->traceToken.begin("attachView", keyValue("name", std::string_view{view->metaObject()->className()})); @@ -2877,7 +2877,7 @@ void Model::attachView(AbstractView *view) */ void Model::detachView(AbstractView *view, ViewNotification emitDetachNotify) { - auto traceToken = d->traceToken.begin("detachView"_t, + auto traceToken = d->traceToken.begin("detachView", keyValue("name", std::string_view{view->metaObject()->className()})); diff --git a/src/plugins/qmldesigner/libs/designercore/model/model_p.h b/src/plugins/qmldesigner/libs/designercore/model/model_p.h index feb9777e150..38384a416c5 100644 --- a/src/plugins/qmldesigner/libs/designercore/model/model_p.h +++ b/src/plugins/qmldesigner/libs/designercore/model/model_p.h @@ -345,7 +345,7 @@ private: public: NotNullPointer projectStorage = nullptr; NotNullPointer pathCache = nullptr; - ModelTracing::AsynchronousToken traceToken = ModelTracing::category().beginAsynchronous("Model"_t); + ModelTracing::AsynchronousToken traceToken = ModelTracing::category().beginAsynchronous("Model"); private: Model *m_model = nullptr; diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp index 37dc5189379..98c5e6dc8e8 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp @@ -1276,7 +1276,7 @@ ProjectStorage::ProjectStorage(Database &database, , moduleCache{ModuleStorageAdapter{*this}} , s{std::make_unique(database)} { - NanotraceHR::Tracer tracer{"initialize"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"initialize", projectStorageCategory()}; exclusiveTransaction.commit(); @@ -1289,7 +1289,7 @@ ProjectStorage::~ProjectStorage() = default; void ProjectStorage::synchronize(Storage::Synchronization::SynchronizationPackage package) { - NanotraceHR::Tracer tracer{"synchronize"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize", projectStorageCategory()}; TypeIds deletedTypeIds; ExportedTypesChanged exportedTypesChanged = ExportedTypesChanged::No; @@ -1361,7 +1361,7 @@ void ProjectStorage::synchronize(Storage::Synchronization::SynchronizationPackag void ProjectStorage::synchronizeDocumentImports(Storage::Imports imports, SourceId sourceId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"synchronize document imports"_t, + NanotraceHR::Tracer tracer{"synchronize document imports", projectStorageCategory(), keyValue("imports", imports), keyValue("source id", sourceId)}; @@ -1390,20 +1390,20 @@ void ProjectStorage::synchronizeDocumentImports(Storage::Imports imports, Source void ProjectStorage::addObserver(ProjectStorageObserver *observer) { - NanotraceHR::Tracer tracer{"add observer"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"add observer", projectStorageCategory()}; observers.push_back(observer); } void ProjectStorage::removeObserver(ProjectStorageObserver *observer) { - NanotraceHR::Tracer tracer{"remove observer"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"remove observer", projectStorageCategory()}; observers.removeOne(observer); } ModuleId ProjectStorage::moduleId(Utils::SmallStringView moduleName, Storage::ModuleKind kind) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get module id"_t, + NanotraceHR::Tracer tracer{"get module id", projectStorageCategory(), keyValue("module name", moduleName)}; @@ -1417,7 +1417,7 @@ ModuleId ProjectStorage::moduleId(Utils::SmallStringView moduleName, Storage::Mo Storage::Module ProjectStorage::module(ModuleId moduleId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get module name"_t, + NanotraceHR::Tracer tracer{"get module name", projectStorageCategory(), keyValue("module id", moduleId)}; @@ -1437,7 +1437,7 @@ TypeId ProjectStorage::typeId(ModuleId moduleId, Storage::Version version) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type id by exported name"_t, + NanotraceHR::Tracer tracer{"get type id by exported name", projectStorageCategory(), keyValue("module id", moduleId), keyValue("exported type name", exportedTypeName), @@ -1466,7 +1466,7 @@ TypeId ProjectStorage::typeId(ModuleId moduleId, TypeId ProjectStorage::typeId(ImportedTypeNameId typeNameId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type id by imported type name"_t, + NanotraceHR::Tracer tracer{"get type id by imported type name", projectStorageCategory(), keyValue("imported type name id", typeNameId)}; @@ -1480,7 +1480,7 @@ TypeId ProjectStorage::typeId(ImportedTypeNameId typeNameId) const QVarLengthArray ProjectStorage::typeIds(ModuleId moduleId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type ids by module id"_t, + NanotraceHR::Tracer tracer{"get type ids by module id", projectStorageCategory(), keyValue("module id", moduleId)}; @@ -1510,7 +1510,7 @@ 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"_t, + NanotraceHR::Tracer tracer{"get exported type names by type id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1525,7 +1525,7 @@ 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"_t, + NanotraceHR::Tracer tracer{"get exported type names by source id", projectStorageCategory(), keyValue("type id", typeId), keyValue("source id", sourceId)}; @@ -1542,7 +1542,7 @@ 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"_t, + NanotraceHR::Tracer tracer{"get import id by import", projectStorageCategory(), keyValue("import", import)}; @@ -1559,7 +1559,7 @@ ImportedTypeNameId ProjectStorage::importedTypeNameId(ImportId importId, Utils::SmallStringView typeName) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get imported type name id by import id"_t, + NanotraceHR::Tracer tracer{"get imported type name id by import id", projectStorageCategory(), keyValue("import id", importId), keyValue("imported type name", typeName)}; @@ -1579,7 +1579,7 @@ ImportedTypeNameId ProjectStorage::importedTypeNameId(SourceId sourceId, Utils::SmallStringView typeName) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get imported type name id by source id"_t, + NanotraceHR::Tracer tracer{"get imported type name id by source id", projectStorageCategory(), keyValue("source id", sourceId), keyValue("imported type name", typeName)}; @@ -1598,7 +1598,7 @@ ImportedTypeNameId ProjectStorage::importedTypeNameId(SourceId sourceId, QVarLengthArray ProjectStorage::propertyDeclarationIds(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property declaration ids"_t, + NanotraceHR::Tracer tracer{"get property declaration ids", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1616,7 +1616,7 @@ QVarLengthArray ProjectStorage::propertyDeclarationI QVarLengthArray ProjectStorage::localPropertyDeclarationIds(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get local property declaration ids"_t, + NanotraceHR::Tracer tracer{"get local property declaration ids", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1633,7 +1633,7 @@ PropertyDeclarationId ProjectStorage::propertyDeclarationId(TypeId typeId, Utils::SmallStringView propertyName) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property declaration id"_t, + NanotraceHR::Tracer tracer{"get property declaration id", projectStorageCategory(), keyValue("type id", typeId), keyValue("property name", propertyName)}; @@ -1651,7 +1651,7 @@ PropertyDeclarationId ProjectStorage::localPropertyDeclarationId(TypeId typeId, Utils::SmallStringView propertyName) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get local property declaration id"_t, + NanotraceHR::Tracer tracer{"get local property declaration id", projectStorageCategory(), keyValue("type id", typeId), keyValue("property name", propertyName)}; @@ -1668,7 +1668,7 @@ PropertyDeclarationId ProjectStorage::localPropertyDeclarationId(TypeId typeId, PropertyDeclarationId ProjectStorage::defaultPropertyDeclarationId(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get default property declaration id"_t, + NanotraceHR::Tracer tracer{"get default property declaration id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1685,7 +1685,7 @@ std::optional ProjectStorage::propertyDeclar PropertyDeclarationId propertyDeclarationId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property declaration"_t, + NanotraceHR::Tracer tracer{"get property declaration", projectStorageCategory(), keyValue("property declaration id", propertyDeclarationId)}; @@ -1701,7 +1701,7 @@ std::optional ProjectStorage::propertyDeclar std::optional ProjectStorage::type(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type"_t, projectStorageCategory(), keyValue("type id", typeId)}; + NanotraceHR::Tracer tracer{"get type", projectStorageCategory(), keyValue("type id", typeId)}; auto type = s->selectInfoTypeByTypeIdStatement.optionalValueWithTransaction( typeId); @@ -1714,7 +1714,7 @@ std::optional ProjectStorage::type(TypeId typeId) const Utils::PathString ProjectStorage::typeIconPath(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type icon path"_t, + NanotraceHR::Tracer tracer{"get type icon path", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1728,7 +1728,7 @@ Utils::PathString ProjectStorage::typeIconPath(TypeId typeId) const Storage::Info::TypeHints ProjectStorage::typeHints(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type hints"_t, + NanotraceHR::Tracer tracer{"get type hints", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1743,7 +1743,7 @@ Storage::Info::TypeHints ProjectStorage::typeHints(TypeId typeId) const SmallSourceIds<4> ProjectStorage::typeAnnotationSourceIds(SourceId directoryId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type annotaion source ids"_t, + NanotraceHR::Tracer tracer{"get type annotaion source ids", projectStorageCategory(), keyValue("source id", directoryId)}; @@ -1758,7 +1758,7 @@ SmallSourceIds<4> ProjectStorage::typeAnnotationSourceIds(SourceId directoryId) SmallSourceIds<64> ProjectStorage::typeAnnotationDirectorySourceIds() const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type annotaion source ids"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"get type annotaion source ids", projectStorageCategory()}; auto sourceIds = s->selectTypeAnnotationDirectorySourceIdsStatement .valuesWithTransaction>(); @@ -1771,7 +1771,7 @@ SmallSourceIds<64> ProjectStorage::typeAnnotationDirectorySourceIds() const Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get item library entries by type id"_t, + NanotraceHR::Tracer tracer{"get item library entries by type id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1806,7 +1806,7 @@ 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"_t, + NanotraceHR::Tracer tracer{"get item library entries by import id", projectStorageCategory(), keyValue("import id", importId)}; @@ -1841,7 +1841,7 @@ Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(ImportId im Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(SourceId sourceId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get item library entries by source id"_t, + NanotraceHR::Tracer tracer{"get item library entries by source id", projectStorageCategory(), keyValue("source id", sourceId)}; @@ -1876,7 +1876,7 @@ Storage::Info::ItemLibraryEntries ProjectStorage::itemLibraryEntries(SourceId so Storage::Info::ItemLibraryEntries ProjectStorage::allItemLibraryEntries() const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get all item library entries"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"get all item library entries", projectStorageCategory()}; using Storage::Info::ItemLibraryProperties; Storage::Info::ItemLibraryEntries entries; @@ -1909,7 +1909,7 @@ Storage::Info::ItemLibraryEntries ProjectStorage::allItemLibraryEntries() const std::vector ProjectStorage::signalDeclarationNames(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get signal names"_t, + NanotraceHR::Tracer tracer{"get signal names", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1924,7 +1924,7 @@ std::vector ProjectStorage::signalDeclarationNames(TypeId ty std::vector ProjectStorage::functionDeclarationNames(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get function names"_t, + NanotraceHR::Tracer tracer{"get function names", projectStorageCategory(), keyValue("type id", typeId)}; @@ -1940,7 +1940,7 @@ std::optional ProjectStorage::propertyName( PropertyDeclarationId propertyDeclarationId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get property name"_t, + NanotraceHR::Tracer tracer{"get property name", projectStorageCategory(), keyValue("property declaration id", propertyDeclarationId)}; @@ -1955,7 +1955,7 @@ std::optional ProjectStorage::propertyName( SmallTypeIds<16> ProjectStorage::prototypeIds(TypeId type) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get prototypes"_t, projectStorageCategory(), keyValue("type id", type)}; + NanotraceHR::Tracer tracer{"get prototypes", projectStorageCategory(), keyValue("type id", type)}; auto prototypeIds = s->selectPrototypeAndExtensionIdsStatement .valuesWithTransaction>(type); @@ -1968,7 +1968,7 @@ SmallTypeIds<16> ProjectStorage::prototypeIds(TypeId type) const SmallTypeIds<16> ProjectStorage::prototypeAndSelfIds(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get prototypes and self"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"get prototypes and self", projectStorageCategory()}; SmallTypeIds<16> prototypeAndSelfIds; prototypeAndSelfIds.push_back(typeId); @@ -1983,7 +1983,7 @@ SmallTypeIds<16> ProjectStorage::prototypeAndSelfIds(TypeId typeId) const SmallTypeIds<64> ProjectStorage::heirIds(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get heirs"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"get heirs", projectStorageCategory()}; auto heirIds = s->selectHeirTypeIdsStatement.valuesWithTransaction>(typeId); @@ -2037,7 +2037,7 @@ bool ProjectStorage::isBasedOn( TypeId ProjectStorage::fetchTypeIdByExportedName(Utils::SmallStringView name) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, + NanotraceHR::Tracer tracer{"is based on", projectStorageCategory(), keyValue("exported type name", name)}; @@ -2052,7 +2052,7 @@ TypeId ProjectStorage::fetchTypeIdByModuleIdsAndExportedName(ModuleIds moduleIds Utils::SmallStringView name) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch type id by module ids and exported name"_t, + NanotraceHR::Tracer tracer{"fetch type id by module ids and exported name", projectStorageCategory(), keyValue("module ids", NanotraceHR::array(moduleIds)), keyValue("exported type name", name)}; @@ -2067,7 +2067,7 @@ TypeId ProjectStorage::fetchTypeIdByModuleIdsAndExportedName(ModuleIds moduleIds TypeId ProjectStorage::fetchTypeIdByName(SourceId sourceId, Utils::SmallStringView name) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch type id by name"_t, + NanotraceHR::Tracer tracer{"fetch type id by name", projectStorageCategory(), keyValue("source id", sourceId), keyValue("internal type name", name)}; @@ -2083,7 +2083,7 @@ 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"_t, + NanotraceHR::Tracer tracer{"fetch type by type id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -2108,7 +2108,7 @@ Storage::Synchronization::Type ProjectStorage::fetchTypeByTypeId(TypeId typeId) Storage::Synchronization::Types ProjectStorage::fetchTypes() { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch types"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"fetch types", projectStorageCategory()}; auto types = Sqlite::withDeferredTransaction(database, [&] { auto types = s->selectTypesStatement.values(); @@ -2131,7 +2131,7 @@ Storage::Synchronization::Types ProjectStorage::fetchTypes() FileStatuses ProjectStorage::fetchAllFileStatuses() const { - NanotraceHR::Tracer tracer{"fetch all file statuses"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"fetch all file statuses", projectStorageCategory()}; return s->selectAllFileStatusesStatement.valuesWithTransaction(); } @@ -2139,7 +2139,7 @@ FileStatuses ProjectStorage::fetchAllFileStatuses() const FileStatus ProjectStorage::fetchFileStatus(SourceId sourceId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch file status"_t, + NanotraceHR::Tracer tracer{"fetch file status", projectStorageCategory(), keyValue("source id", sourceId)}; @@ -2154,7 +2154,7 @@ FileStatus ProjectStorage::fetchFileStatus(SourceId sourceId) const std::optional ProjectStorage::fetchDirectoryInfo(SourceId sourceId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch directory info"_t, + NanotraceHR::Tracer tracer{"fetch directory info", projectStorageCategory(), keyValue("source id", sourceId)}; @@ -2170,7 +2170,7 @@ std::optional ProjectStorage::fetchDire Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos(SourceId directorySourceId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch directory infos by source id"_t, + NanotraceHR::Tracer tracer{"fetch directory infos by source id", projectStorageCategory(), keyValue("source id", directorySourceId)}; @@ -2187,7 +2187,7 @@ Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos( SourceId directorySourceId, Storage::Synchronization::FileType fileType) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch directory infos by source id and file type"_t, + NanotraceHR::Tracer tracer{"fetch directory infos by source id and file type", projectStorageCategory(), keyValue("source id", directorySourceId), keyValue("file type", fileType)}; @@ -2205,7 +2205,7 @@ Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos( const SourceIds &directorySourceIds) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch directory infos by source ids"_t, + NanotraceHR::Tracer tracer{"fetch directory infos by source ids", projectStorageCategory(), keyValue("source ids", directorySourceIds)}; @@ -2221,7 +2221,7 @@ Storage::Synchronization::DirectoryInfos ProjectStorage::fetchDirectoryInfos( SmallSourceIds<32> ProjectStorage::fetchSubdirectorySourceIds(SourceId directorySourceId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch subdirectory source ids"_t, + NanotraceHR::Tracer tracer{"fetch subdirectory source ids", projectStorageCategory(), keyValue("source id", directorySourceId)}; @@ -2246,7 +2246,7 @@ void ProjectStorage::setPropertyEditorPathId(TypeId typeId, SourceId pathId) SourceId ProjectStorage::propertyEditorPathId(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"property editor path id"_t, + NanotraceHR::Tracer tracer{"property editor path id", projectStorageCategory(), keyValue("type id", typeId)}; @@ -2259,7 +2259,7 @@ SourceId ProjectStorage::propertyEditorPathId(TypeId typeId) const Storage::Imports ProjectStorage::fetchDocumentImports() const { - NanotraceHR::Tracer tracer{"fetch document imports"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"fetch document imports", projectStorageCategory()}; return s->selectAllDocumentImportForSourceIdStatement.valuesWithTransaction(); } @@ -2276,7 +2276,7 @@ ModuleId ProjectStorage::fetchModuleId(Utils::SmallStringView moduleName, Storage::ModuleKind moduleKind) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch module id"_t, + NanotraceHR::Tracer tracer{"fetch module id", projectStorageCategory(), keyValue("module name", moduleName), keyValue("module kind", moduleKind)}; @@ -2293,7 +2293,7 @@ ModuleId ProjectStorage::fetchModuleId(Utils::SmallStringView moduleName, Storage::Module ProjectStorage::fetchModule(ModuleId id) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch module name"_t, + NanotraceHR::Tracer tracer{"fetch module name", projectStorageCategory(), keyValue("module id", id)}; @@ -2307,7 +2307,7 @@ Storage::Module ProjectStorage::fetchModule(ModuleId id) ProjectStorage::ModuleCacheEntries ProjectStorage::fetchAllModules() const { - NanotraceHR::Tracer tracer{"fetch all modules"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"fetch all modules", projectStorageCategory()}; return s->selectAllModulesStatement.valuesWithTransaction(); } @@ -2316,7 +2316,7 @@ void ProjectStorage::callRefreshMetaInfoCallback(TypeIds &deletedTypeIds, ExportedTypesChanged &exportedTypesChanged) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"call refresh meta info callback"_t, + NanotraceHR::Tracer tracer{"call refresh meta info callback", projectStorageCategory(), keyValue("type ids", deletedTypeIds)}; @@ -2352,7 +2352,7 @@ SourceIds ProjectStorage::filterSourceIdsWithoutType(const SourceIds &updatedSou TypeIds ProjectStorage::fetchTypeIds(const SourceIds &sourceIds) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch type ids"_t, + NanotraceHR::Tracer tracer{"fetch type ids", projectStorageCategory(), keyValue("source ids", sourceIds)}; @@ -2369,7 +2369,7 @@ void ProjectStorage::unique(SourceIds &sourceIds) void ProjectStorage::synchronizeTypeTraits(TypeId typeId, Storage::TypeTraits traits) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"synchronize type traits"_t, + NanotraceHR::Tracer tracer{"synchronize type traits", projectStorageCategory(), keyValue("type id", typeId), keyValue("type traits", traits)}; @@ -2379,7 +2379,7 @@ void ProjectStorage::synchronizeTypeTraits(TypeId typeId, Storage::TypeTraits tr void ProjectStorage::updateTypeIdInTypeAnnotations(Storage::Synchronization::TypeAnnotations &typeAnnotations) { - NanotraceHR::Tracer tracer{"update type id in type annotations"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"update type id in type annotations", projectStorageCategory()}; for (auto &annotation : typeAnnotations) { annotation.typeId = fetchTypeIdByModuleIdAndExportedName(annotation.moduleId, @@ -2392,7 +2392,7 @@ void ProjectStorage::updateTypeIdInTypeAnnotations(Storage::Synchronization::Typ void ProjectStorage::synchronizeTypeAnnotations(Storage::Synchronization::TypeAnnotations &typeAnnotations, const SourceIds &updatedTypeAnnotationSourceIds) { - NanotraceHR::Tracer tracer{"synchronize type annotations"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize type annotations", projectStorageCategory()}; updateTypeIdInTypeAnnotations(typeAnnotations); @@ -2410,7 +2410,7 @@ void ProjectStorage::synchronizeTypeAnnotations(Storage::Synchronization::TypeAn using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert type annotations"_t, + NanotraceHR::Tracer tracer{"insert type annotations", projectStorageCategory(), keyValue("type annotation", annotation)}; @@ -2433,7 +2433,7 @@ void ProjectStorage::synchronizeTypeAnnotations(Storage::Synchronization::TypeAn || annotationFromDatabase.itemLibraryJson != annotation.itemLibraryJson || annotationFromDatabase.hintsJson != annotation.hintsJson) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"update type annotations"_t, + NanotraceHR::Tracer tracer{"update type annotations", projectStorageCategory(), keyValue("type annotation from database", annotationFromDatabase), @@ -2457,7 +2457,7 @@ void ProjectStorage::synchronizeTypeAnnotations(Storage::Synchronization::TypeAn auto remove = [&](const TypeAnnotationView &annotationFromDatabase) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove type annotations"_t, + NanotraceHR::Tracer tracer{"remove type annotations", projectStorageCategory(), keyValue("type annotation", annotationFromDatabase)}; @@ -2490,7 +2490,7 @@ void ProjectStorage::synchronizeTypes(Storage::Synchronization::Types &types, ExportedTypesChanged &exportedTypesChanged, const SourceIds &updatedSourceIds) { - NanotraceHR::Tracer tracer{"synchronize types"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize types", projectStorageCategory()}; Storage::Synchronization::ExportedTypes exportedTypes; exportedTypes.reserve(types.size() * 3); @@ -2542,7 +2542,7 @@ void ProjectStorage::synchronizeTypes(Storage::Synchronization::Types &types, void ProjectStorage::synchronizeDirectoryInfos(Storage::Synchronization::DirectoryInfos &directoryInfos, const SourceIds &updatedDirectoryInfoSourceIds) { - NanotraceHR::Tracer tracer{"synchronize directory infos"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize directory infos", projectStorageCategory()}; auto compareKey = [](auto &&first, auto &&second) { return std::tie(first.directorySourceId, first.sourceId) @@ -2559,7 +2559,7 @@ void ProjectStorage::synchronizeDirectoryInfos(Storage::Synchronization::Directo auto insert = [&](const Storage::Synchronization::DirectoryInfo &directoryInfo) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert directory info"_t, + NanotraceHR::Tracer tracer{"insert directory info", projectStorageCategory(), keyValue("directory info", directoryInfo)}; @@ -2579,7 +2579,7 @@ void ProjectStorage::synchronizeDirectoryInfos(Storage::Synchronization::Directo if (directoryInfoFromDatabase.fileType != directoryInfo.fileType || !compareInvalidAreTrue(directoryInfoFromDatabase.moduleId, directoryInfo.moduleId)) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"update directory info"_t, + NanotraceHR::Tracer tracer{"update directory info", projectStorageCategory(), keyValue("directory info", directoryInfo), keyValue("directory info from database", @@ -2597,7 +2597,7 @@ void ProjectStorage::synchronizeDirectoryInfos(Storage::Synchronization::Directo auto remove = [&](const Storage::Synchronization::DirectoryInfo &directoryInfo) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove directory info"_t, + NanotraceHR::Tracer tracer{"remove directory info", projectStorageCategory(), keyValue("directory info", directoryInfo)}; @@ -2610,7 +2610,7 @@ void ProjectStorage::synchronizeDirectoryInfos(Storage::Synchronization::Directo void ProjectStorage::synchronizeFileStatuses(FileStatuses &fileStatuses, const SourceIds &updatedSourceIds) { - NanotraceHR::Tracer tracer{"synchronize file statuses"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize file statuses", projectStorageCategory()}; auto compareKey = [](auto &&first, auto &&second) { return first.sourceId <=> second.sourceId; }; @@ -2621,7 +2621,7 @@ void ProjectStorage::synchronizeFileStatuses(FileStatuses &fileStatuses, auto insert = [&](const FileStatus &fileStatus) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert file status"_t, + NanotraceHR::Tracer tracer{"insert file status", projectStorageCategory(), keyValue("file status", fileStatus)}; @@ -2636,7 +2636,7 @@ void ProjectStorage::synchronizeFileStatuses(FileStatuses &fileStatuses, if (fileStatusFromDatabase.lastModified != fileStatus.lastModified || fileStatusFromDatabase.size != fileStatus.size) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"update file status"_t, + NanotraceHR::Tracer tracer{"update file status", projectStorageCategory(), keyValue("file status", fileStatus), keyValue("file status from database", fileStatusFromDatabase)}; @@ -2652,7 +2652,7 @@ void ProjectStorage::synchronizeFileStatuses(FileStatuses &fileStatuses, auto remove = [&](const FileStatus &fileStatus) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove file status"_t, + NanotraceHR::Tracer tracer{"remove file status", projectStorageCategory(), keyValue("file status", fileStatus)}; @@ -2671,10 +2671,10 @@ void ProjectStorage::synchronizeImports(Storage::Imports &imports, Prototypes &relinkablePrototypes, Prototypes &relinkableExtensions) { - NanotraceHR::Tracer tracer{"synchronize imports"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize imports", projectStorageCategory()}; synchromizeModuleExportedImports(moduleExportedImports, updatedModuleIds); - NanotraceHR::Tracer importTracer{"synchronize qml document imports"_t, projectStorageCategory()}; + NanotraceHR::Tracer importTracer{"synchronize qml document imports", projectStorageCategory()}; synchronizeDocumentImports(imports, updatedSourceIds, Storage::Synchronization::ImportKind::Import, @@ -2682,7 +2682,7 @@ void ProjectStorage::synchronizeImports(Storage::Imports &imports, relinkablePrototypes, relinkableExtensions); importTracer.end(); - NanotraceHR::Tracer moduleDependenciesTracer{"synchronize module depdencies"_t, + NanotraceHR::Tracer moduleDependenciesTracer{"synchronize module depdencies", projectStorageCategory()}; synchronizeDocumentImports(moduleDependencies, updatedModuleDependencySourceIds, @@ -2697,7 +2697,7 @@ void ProjectStorage::synchromizeModuleExportedImports( Storage::Synchronization::ModuleExportedImports &moduleExportedImports, const ModuleIds &updatedModuleIds) { - NanotraceHR::Tracer tracer{"synchronize module exported imports"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize module exported imports", projectStorageCategory()}; std::ranges::sort(moduleExportedImports, [](auto &&first, auto &&second) { return std::tie(first.moduleId, first.exportedModuleId) < std::tie(second.moduleId, second.exportedModuleId); @@ -2715,11 +2715,11 @@ void ProjectStorage::synchromizeModuleExportedImports( auto insert = [&](const Storage::Synchronization::ModuleExportedImport &import) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert module exported import"_t, + NanotraceHR::Tracer tracer{"insert module exported import", projectStorageCategory(), keyValue("module exported import", import), keyValue("module id", import.moduleId)}; - tracer.tick("exported module"_t, keyValue("module id", import.exportedModuleId)); + tracer.tick("exported module", keyValue("module id", import.exportedModuleId)); if (import.version.minor) { s->insertModuleExportedImportWithVersionStatement.write(import.moduleId, @@ -2746,11 +2746,11 @@ void ProjectStorage::synchromizeModuleExportedImports( auto remove = [&](const Storage::Synchronization::ModuleExportedImportView &view) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove module exported import"_t, + NanotraceHR::Tracer tracer{"remove module exported import", projectStorageCategory(), keyValue("module exported import view", view), keyValue("module id", view.moduleId)}; - tracer.tick("exported module"_t, keyValue("module id", view.exportedModuleId)); + tracer.tick("exported module", keyValue("module id", view.exportedModuleId)); s->deleteModuleExportedImportStatement.write(view.moduleExportedImportId); }; @@ -2762,7 +2762,7 @@ ModuleId ProjectStorage::fetchModuleIdUnguarded(Utils::SmallStringView name, Storage::ModuleKind kind) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch module id ungarded"_t, + NanotraceHR::Tracer tracer{"fetch module id ungarded", projectStorageCategory(), keyValue("module name", name), keyValue("module kind", kind)}; @@ -2780,7 +2780,7 @@ ModuleId ProjectStorage::fetchModuleIdUnguarded(Utils::SmallStringView name, Storage::Module ProjectStorage::fetchModuleUnguarded(ModuleId id) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch module ungarded"_t, + NanotraceHR::Tracer tracer{"fetch module ungarded", projectStorageCategory(), keyValue("module id", id)}; @@ -2799,7 +2799,7 @@ void ProjectStorage::handleAliasPropertyDeclarationsWithPropertyType( TypeId typeId, AliasPropertyDeclarations &relinkableAliasPropertyDeclarations) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle alias property declarations with property type"_t, + NanotraceHR::Tracer tracer{"handle alias property declarations with property type", projectStorageCategory(), keyValue("type id", typeId), keyValue("relinkable alias property declarations", @@ -2834,7 +2834,7 @@ void ProjectStorage::handlePropertyDeclarationWithPropertyType( TypeId typeId, PropertyDeclarations &relinkablePropertyDeclarations) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle property declarations with property type"_t, + NanotraceHR::Tracer tracer{"handle property declarations with property type", projectStorageCategory(), keyValue("type id", typeId), keyValue("relinkable property declarations", @@ -2850,7 +2850,7 @@ void ProjectStorage::handlePropertyDeclarationsWithExportedTypeNameAndTypeId( PropertyDeclarations &relinkablePropertyDeclarations) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle property declarations with exported type name and type id"_t, + NanotraceHR::Tracer tracer{"handle property declarations with exported type name and type id", projectStorageCategory(), keyValue("type name", exportedTypeName), keyValue("type id", typeId), @@ -2868,7 +2868,7 @@ void ProjectStorage::handleAliasPropertyDeclarationsWithExportedTypeNameAndTypeI AliasPropertyDeclarations &relinkableAliasPropertyDeclarations) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle alias property declarations with exported type name and type id"_t, + NanotraceHR::Tracer tracer{"handle alias property declarations with exported type name and type id", projectStorageCategory(), keyValue("type name", exportedTypeName), keyValue("type id", typeId), @@ -2903,7 +2903,7 @@ void ProjectStorage::handleAliasPropertyDeclarationsWithExportedTypeNameAndTypeI void ProjectStorage::handlePrototypes(TypeId prototypeId, Prototypes &relinkablePrototypes) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle prototypes"_t, + NanotraceHR::Tracer tracer{"handle prototypes", projectStorageCategory(), keyValue("type id", prototypeId), keyValue("relinkable prototypes", relinkablePrototypes)}; @@ -2920,7 +2920,7 @@ void ProjectStorage::handlePrototypesWithExportedTypeNameAndTypeId( Utils::SmallStringView exportedTypeName, TypeId typeId, Prototypes &relinkablePrototypes) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle invalid prototypes"_t, + NanotraceHR::Tracer tracer{"handle invalid prototypes", projectStorageCategory(), keyValue("type id", exportedTypeName), keyValue("relinkable prototypes", relinkablePrototypes)}; @@ -2937,7 +2937,7 @@ void ProjectStorage::handlePrototypesWithExportedTypeNameAndTypeId( void ProjectStorage::handleExtensions(TypeId extensionId, Prototypes &relinkableExtensions) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle extension"_t, + NanotraceHR::Tracer tracer{"handle extension", projectStorageCategory(), keyValue("type id", extensionId), keyValue("relinkable extensions", relinkableExtensions)}; @@ -2954,7 +2954,7 @@ void ProjectStorage::handleExtensionsWithExportedTypeNameAndTypeId( Utils::SmallStringView exportedTypeName, TypeId typeId, Prototypes &relinkableExtensions) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle invalid extensions"_t, + NanotraceHR::Tracer tracer{"handle invalid extensions", projectStorageCategory(), keyValue("type id", exportedTypeName), keyValue("relinkable extensions", relinkableExtensions)}; @@ -2973,7 +2973,7 @@ void ProjectStorage::deleteType(TypeId typeId, Prototypes &relinkableExtensions) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"delete type"_t, projectStorageCategory(), keyValue("type id", typeId)}; + NanotraceHR::Tracer tracer{"delete type", projectStorageCategory(), keyValue("type id", typeId)}; handlePropertyDeclarationWithPropertyType(typeId, relinkablePropertyDeclarations); handleAliasPropertyDeclarationsWithPropertyType(typeId, relinkableAliasPropertyDeclarations); @@ -2991,7 +2991,7 @@ void ProjectStorage::relinkAliasPropertyDeclarations(AliasPropertyDeclarations & const TypeIds &deletedTypeIds) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"relink alias properties"_t, + NanotraceHR::Tracer tracer{"relink alias properties", projectStorageCategory(), keyValue("alias property declarations", aliasPropertyDeclarations), keyValue("deleted type ids", deletedTypeIds)}; @@ -3034,7 +3034,7 @@ void ProjectStorage::relinkPropertyDeclarations(PropertyDeclarations &relinkable const TypeIds &deletedTypeIds) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"relink property declarations"_t, + NanotraceHR::Tracer tracer{"relink property declarations", projectStorageCategory(), keyValue("relinkable property declarations", relinkablePropertyDeclaration), @@ -3071,7 +3071,7 @@ void ProjectStorage::relinkPrototypes(Prototypes &relinkablePrototypes, Callable updateStatement) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"relink prototypes"_t, + NanotraceHR::Tracer tracer{"relink prototypes", projectStorageCategory(), keyValue("relinkable prototypes", relinkablePrototypes), keyValue("deleted type ids", deletedTypeIds)}; @@ -3107,7 +3107,7 @@ void ProjectStorage::deleteNotUpdatedTypes(const TypeIds &updatedTypeIds, TypeIds &deletedTypeIds) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"delete not updated types"_t, + NanotraceHR::Tracer tracer{"delete not updated types", projectStorageCategory(), keyValue("updated type ids", updatedTypeIds), keyValue("updated source ids", updatedSourceIds), @@ -3135,7 +3135,7 @@ void ProjectStorage::relink(AliasPropertyDeclarations &relinkableAliasPropertyDe Prototypes &relinkableExtensions, TypeIds &deletedTypeIds) { - NanotraceHR::Tracer tracer{"relink"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"relink", projectStorageCategory()}; std::ranges::sort(deletedTypeIds); @@ -3154,7 +3154,7 @@ PropertyDeclarationId ProjectStorage::fetchAliasId(TypeId aliasTypeId, Utils::SmallStringView aliasPropertyNameTail) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch alias id"_t, + NanotraceHR::Tracer tracer{"fetch alias id", projectStorageCategory(), keyValue("alias type id", aliasTypeId), keyValue("alias property name", aliasPropertyName), @@ -3176,7 +3176,7 @@ void ProjectStorage::linkAliasPropertyDeclarationAliasIds( const AliasPropertyDeclarations &aliasDeclarations, RaiseError raiseError) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"link alias property declarations alias ids"_t, + NanotraceHR::Tracer tracer{"link alias property declarations alias ids", projectStorageCategory(), keyValue("alias property declarations", aliasDeclarations)}; @@ -3217,7 +3217,7 @@ void ProjectStorage::linkAliasPropertyDeclarationAliasIds( void ProjectStorage::updateAliasPropertyDeclarationValues(const AliasPropertyDeclarations &aliasDeclarations) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"update alias property declarations"_t, + NanotraceHR::Tracer tracer{"update alias property declarations", projectStorageCategory(), keyValue("alias property declarations", aliasDeclarations)}; @@ -3232,7 +3232,7 @@ void ProjectStorage::updateAliasPropertyDeclarationValues(const AliasPropertyDec void ProjectStorage::checkAliasPropertyDeclarationCycles(const AliasPropertyDeclarations &aliasDeclarations) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"check alias property declarations cycles"_t, + NanotraceHR::Tracer tracer{"check alias property declarations cycles", projectStorageCategory(), keyValue("alias property declarations", aliasDeclarations)}; for (const auto &aliasDeclaration : aliasDeclarations) @@ -3243,7 +3243,7 @@ void ProjectStorage::linkAliases(const AliasPropertyDeclarations &aliasPropertyD RaiseError raiseError) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"link aliases"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"link aliases", projectStorageCategory()}; linkAliasPropertyDeclarationAliasIds(aliasPropertyDeclarationsToLink, raiseError); @@ -3255,7 +3255,7 @@ void ProjectStorage::linkAliases(const AliasPropertyDeclarations &aliasPropertyD void ProjectStorage::repairBrokenAliasPropertyDeclarations() { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"repair broken alias property declarations"_t, + NanotraceHR::Tracer tracer{"repair broken alias property declarations", projectStorageCategory()}; auto brokenAliasPropertyDeclarations = s->selectBrokenAliasPropertyDeclarationsStatement @@ -3273,7 +3273,7 @@ void ProjectStorage::synchronizeExportedTypes(const TypeIds &updatedTypeIds, ExportedTypesChanged &exportedTypesChanged) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"synchronize exported types"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize exported types", projectStorageCategory()}; std::ranges::sort(exportedTypes, [](auto &&first, auto &&second) { if (first.moduleId < second.moduleId) @@ -3302,7 +3302,7 @@ void ProjectStorage::synchronizeExportedTypes(const TypeIds &updatedTypeIds, auto insert = [&](const Storage::Synchronization::ExportedType &type) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert exported type"_t, + NanotraceHR::Tracer tracer{"insert exported type", projectStorageCategory(), keyValue("exported type", type), keyValue("type id", type.typeId), @@ -3347,7 +3347,7 @@ void ProjectStorage::synchronizeExportedTypes(const TypeIds &updatedTypeIds, auto update = [&](const Storage::Synchronization::ExportedTypeView &view, const Storage::Synchronization::ExportedType &type) { if (view.typeId != type.typeId) { - NanotraceHR::Tracer tracer{"update exported type"_t, + NanotraceHR::Tracer tracer{"update exported type", projectStorageCategory(), keyValue("exported type", type), keyValue("exported type view", view), @@ -3368,7 +3368,7 @@ void ProjectStorage::synchronizeExportedTypes(const TypeIds &updatedTypeIds, }; auto remove = [&](const Storage::Synchronization::ExportedTypeView &view) { - NanotraceHR::Tracer tracer{"remove exported type"_t, + NanotraceHR::Tracer tracer{"remove exported type", projectStorageCategory(), keyValue("exported type", view), keyValue("type id", view.typeId), @@ -3395,7 +3395,7 @@ void ProjectStorage::synchronizePropertyDeclarationsInsertAlias( TypeId typeId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert property declaration to alias"_t, + NanotraceHR::Tracer tracer{"insert property declaration to alias", projectStorageCategory(), keyValue("property declaration", value)}; @@ -3493,7 +3493,7 @@ void ProjectStorage::synchronizePropertyDeclarationsInsertProperty( const Storage::Synchronization::PropertyDeclaration &value, SourceId sourceId, TypeId typeId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert property declaration"_t, + NanotraceHR::Tracer tracer{"insert property declaration", projectStorageCategory(), keyValue("property declaration", value)}; @@ -3526,7 +3526,7 @@ void ProjectStorage::synchronizePropertyDeclarationsUpdateAlias( SourceId sourceId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"update property declaration to alias"_t, + NanotraceHR::Tracer tracer{"update property declaration to alias", projectStorageCategory(), keyValue("property declaration", value), keyValue("property declaration view", view)}; @@ -3547,7 +3547,7 @@ Sqlite::UpdateChange ProjectStorage::synchronizePropertyDeclarationsUpdateProper PropertyDeclarationIds &propertyDeclarationIds) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"update property declaration"_t, + NanotraceHR::Tracer tracer{"update property declaration", projectStorageCategory(), keyValue("property declaration", value), keyValue("property declaration view", view)}; @@ -3589,7 +3589,7 @@ void ProjectStorage::synchronizePropertyDeclarations( AliasPropertyDeclarations &aliasPropertyDeclarationsToLink, PropertyDeclarationIds &propertyDeclarationIds) { - NanotraceHR::Tracer tracer{"synchronize property declaration"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize property declaration", projectStorageCategory()}; std::ranges::sort(propertyDeclarations, [](auto &&first, auto &&second) { return Sqlite::compare(first.name, second.name) < 0; @@ -3634,7 +3634,7 @@ void ProjectStorage::synchronizePropertyDeclarations( auto remove = [&](const Storage::Synchronization::PropertyDeclarationView &view) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove property declaration"_t, + NanotraceHR::Tracer tracer{"remove property declaration", projectStorageCategory(), keyValue("property declaratio viewn", view)}; @@ -3656,7 +3656,7 @@ void ProjectStorage::synchronizePropertyDeclarations( void ProjectStorage::resetRemovedAliasPropertyDeclarationsToNull( Storage::Synchronization::Type &type, PropertyDeclarationIds &propertyDeclarationIds) { - NanotraceHR::Tracer tracer{"reset removed alias property declaration to null"_t, + NanotraceHR::Tracer tracer{"reset removed alias property declaration to null", projectStorageCategory()}; if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal) @@ -3683,7 +3683,7 @@ void ProjectStorage::resetRemovedAliasPropertyDeclarationsToNull( auto remove = [&](const AliasPropertyDeclarationView &view) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"reset removed alias property declaration to null"_t, + NanotraceHR::Tracer tracer{"reset removed alias property declaration to null", projectStorageCategory(), keyValue("alias property declaration view", view)}; @@ -3698,7 +3698,7 @@ void ProjectStorage::resetRemovedAliasPropertyDeclarationsToNull( Storage::Synchronization::Types &types, AliasPropertyDeclarations &relinkableAliasPropertyDeclarations) { - NanotraceHR::Tracer tracer{"reset removed alias properties to null"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"reset removed alias properties to null", projectStorageCategory()}; PropertyDeclarationIds propertyDeclarationIds; propertyDeclarationIds.reserve(types.size()); @@ -3716,7 +3716,7 @@ void ProjectStorage::handlePrototypesWithSourceIdAndPrototypeId(SourceId sourceI Prototypes &relinkablePrototypes) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle prototypes with source id and prototype id"_t, + NanotraceHR::Tracer tracer{"handle prototypes with source id and prototype id", projectStorageCategory(), keyValue("source id", sourceId), keyValue("type id", prototypeId)}; @@ -3738,7 +3738,7 @@ void ProjectStorage::handlePrototypesAndExtensionsWithSourceId(SourceId sourceId Prototypes &relinkableExtensions) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle prototypes with source id"_t, + NanotraceHR::Tracer tracer{"handle prototypes with source id", projectStorageCategory(), keyValue("source id", sourceId), keyValue("prototype id", prototypeId), @@ -3763,7 +3763,7 @@ void ProjectStorage::handleExtensionsWithSourceIdAndExtensionId(SourceId sourceI Prototypes &relinkableExtensions) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"handle prototypes with source id and prototype id"_t, + NanotraceHR::Tracer tracer{"handle prototypes with source id and prototype id", projectStorageCategory(), keyValue("source id", sourceId), keyValue("type id", extensionId)}; @@ -3846,7 +3846,7 @@ void ProjectStorage::synchronizeDocumentImports(Storage::Imports &imports, auto insert = [&](const Storage::Import &import) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert import"_t, + NanotraceHR::Tracer tracer{"insert import", projectStorageCategory(), keyValue("import", import), keyValue("import kind", importKind), @@ -3869,7 +3869,7 @@ void ProjectStorage::synchronizeDocumentImports(Storage::Imports &imports, ? Storage::Synchronization::ImportKind::ModuleExportedImport : Storage::Synchronization::ImportKind::ModuleExportedModuleDependency; - NanotraceHR::Tracer tracer{"insert indirect import"_t, + NanotraceHR::Tracer tracer{"insert indirect import", projectStorageCategory(), keyValue("import", import), keyValue("import kind", exportedImportKind), @@ -3900,7 +3900,7 @@ void ProjectStorage::synchronizeDocumentImports(Storage::Imports &imports, auto remove = [&](const Storage::Synchronization::ImportView &view) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove import"_t, + NanotraceHR::Tracer tracer{"remove import", projectStorageCategory(), keyValue("import", view), keyValue("import id", view.importId), @@ -3923,7 +3923,7 @@ void ProjectStorage::synchronizeDocumentImports(Storage::Imports &imports, Utils::PathString ProjectStorage::createJson(const Storage::Synchronization::ParameterDeclarations ¶meters) { - NanotraceHR::Tracer tracer{"create json from parameter declarations"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"create json from parameter declarations", projectStorageCategory()}; Utils::PathString json; json.append("["); @@ -3955,7 +3955,7 @@ TypeId ProjectStorage::fetchTypeIdByModuleIdAndExportedName(ModuleId moduleId, Utils::SmallStringView name) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch type id by module id and exported name"_t, + NanotraceHR::Tracer tracer{"fetch type id by module id and exported name", projectStorageCategory(), keyValue("module id", moduleId), keyValue("exported name", name)}; @@ -3966,7 +3966,7 @@ TypeId ProjectStorage::fetchTypeIdByModuleIdAndExportedName(ModuleId moduleId, void ProjectStorage::addTypeIdToPropertyEditorQmlPaths( Storage::Synchronization::PropertyEditorQmlPaths &paths) { - NanotraceHR::Tracer tracer{"add type id to property editor qml paths"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"add type id to property editor qml paths", projectStorageCategory()}; for (auto &path : paths) path.typeId = fetchTypeIdByModuleIdAndExportedName(path.moduleId, path.typeName); @@ -3987,7 +3987,7 @@ void ProjectStorage::synchronizePropertyEditorPaths(Storage::Synchronization::Pr auto insert = [&](const PropertyEditorQmlPath &path) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert property editor paths"_t, + NanotraceHR::Tracer tracer{"insert property editor paths", projectStorageCategory(), keyValue("property editor qml path", path)}; @@ -3997,7 +3997,7 @@ void ProjectStorage::synchronizePropertyEditorPaths(Storage::Synchronization::Pr auto update = [&](const PropertyEditorQmlPathView &view, const PropertyEditorQmlPath &value) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"update property editor paths"_t, + NanotraceHR::Tracer tracer{"update property editor paths", projectStorageCategory(), keyValue("property editor qml path", value), keyValue("property editor qml path view", view)}; @@ -4014,7 +4014,7 @@ void ProjectStorage::synchronizePropertyEditorPaths(Storage::Synchronization::Pr auto remove = [&](const PropertyEditorQmlPathView &view) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove property editor paths"_t, + NanotraceHR::Tracer tracer{"remove property editor paths", projectStorageCategory(), keyValue("property editor qml path view", view)}; @@ -4028,7 +4028,7 @@ void ProjectStorage::synchronizePropertyEditorQmlPaths( Storage::Synchronization::PropertyEditorQmlPaths &paths, SourceIds updatedPropertyEditorQmlPathsSourceIds) { - NanotraceHR::Tracer tracer{"synchronize property editor qml paths"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize property editor qml paths", projectStorageCategory()}; addTypeIdToPropertyEditorQmlPaths(paths); synchronizePropertyEditorPaths(paths, updatedPropertyEditorQmlPathsSourceIds); @@ -4037,7 +4037,7 @@ void ProjectStorage::synchronizePropertyEditorQmlPaths( void ProjectStorage::synchronizeFunctionDeclarations( TypeId typeId, Storage::Synchronization::FunctionDeclarations &functionsDeclarations) { - NanotraceHR::Tracer tracer{"synchronize function declaration"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize function declaration", projectStorageCategory()}; std::ranges::sort(functionsDeclarations, [](auto &&first, auto &&second) { auto compare = Sqlite::compare(first.name, second.name); @@ -4068,7 +4068,7 @@ void ProjectStorage::synchronizeFunctionDeclarations( auto insert = [&](const Storage::Synchronization::FunctionDeclaration &value) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert function declaration"_t, + NanotraceHR::Tracer tracer{"insert function declaration", projectStorageCategory(), keyValue("function declaration", value)}; @@ -4080,7 +4080,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"_t, + NanotraceHR::Tracer tracer{"update function declaration", projectStorageCategory(), keyValue("function declaration", value), keyValue("function declaration view", view)}; @@ -4099,7 +4099,7 @@ void ProjectStorage::synchronizeFunctionDeclarations( auto remove = [&](const Storage::Synchronization::FunctionDeclarationView &view) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove function declaration"_t, + NanotraceHR::Tracer tracer{"remove function declaration", projectStorageCategory(), keyValue("function declaration view", view)}; @@ -4112,7 +4112,7 @@ void ProjectStorage::synchronizeFunctionDeclarations( void ProjectStorage::synchronizeSignalDeclarations( TypeId typeId, Storage::Synchronization::SignalDeclarations &signalDeclarations) { - NanotraceHR::Tracer tracer{"synchronize signal declaration"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize signal declaration", projectStorageCategory()}; std::ranges::sort(signalDeclarations, [](auto &&first, auto &&second) { auto compare = Sqlite::compare(first.name, second.name); @@ -4143,7 +4143,7 @@ void ProjectStorage::synchronizeSignalDeclarations( auto insert = [&](const Storage::Synchronization::SignalDeclaration &value) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert signal declaration"_t, + NanotraceHR::Tracer tracer{"insert signal declaration", projectStorageCategory(), keyValue("signal declaration", value)}; @@ -4159,7 +4159,7 @@ void ProjectStorage::synchronizeSignalDeclarations( auto remove = [&](const Storage::Synchronization::SignalDeclarationView &view) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove signal declaration"_t, + NanotraceHR::Tracer tracer{"remove signal declaration", projectStorageCategory(), keyValue("signal declaration view", view)}; @@ -4173,7 +4173,7 @@ Utils::PathString ProjectStorage::createJson( const Storage::Synchronization::EnumeratorDeclarations &enumeratorDeclarations) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"create json from enumerator declarations"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"create json from enumerator declarations", projectStorageCategory()}; Utils::PathString json; json.append("{"); @@ -4201,7 +4201,7 @@ Utils::PathString ProjectStorage::createJson( void ProjectStorage::synchronizeEnumerationDeclarations( TypeId typeId, Storage::Synchronization::EnumerationDeclarations &enumerationDeclarations) { - NanotraceHR::Tracer tracer{"synchronize enumeration declaration"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize enumeration declaration", projectStorageCategory()}; std::ranges::sort(enumerationDeclarations, {}, &EnumerationDeclaration::name); @@ -4215,7 +4215,7 @@ void ProjectStorage::synchronizeEnumerationDeclarations( auto insert = [&](const Storage::Synchronization::EnumerationDeclaration &value) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"insert enumeration declaration"_t, + NanotraceHR::Tracer tracer{"insert enumeration declaration", projectStorageCategory(), keyValue("enumeration declaration", value)}; @@ -4227,7 +4227,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"_t, + NanotraceHR::Tracer tracer{"update enumeration declaration", projectStorageCategory(), keyValue("enumeration declaration", value), keyValue("enumeration declaration view", view)}; @@ -4246,7 +4246,7 @@ void ProjectStorage::synchronizeEnumerationDeclarations( auto remove = [&](const Storage::Synchronization::EnumerationDeclarationView &view) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"remove enumeration declaration"_t, + NanotraceHR::Tracer tracer{"remove enumeration declaration", projectStorageCategory(), keyValue("enumeration declaration view", view)}; @@ -4267,7 +4267,7 @@ void ProjectStorage::extractExportedTypes(TypeId typeId, TypeId ProjectStorage::declareType(Storage::Synchronization::Type &type) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"declare type"_t, + NanotraceHR::Tracer tracer{"declare type", projectStorageCategory(), keyValue("source id", type.sourceId), keyValue("type name", type.typeName)}; @@ -4295,7 +4295,7 @@ void ProjectStorage::syncDeclarations(Storage::Synchronization::Type &type, AliasPropertyDeclarations &aliasPropertyDeclarationsToLink, PropertyDeclarationIds &propertyDeclarationIds) { - NanotraceHR::Tracer tracer{"synchronize declaration per type"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize declaration per type", projectStorageCategory()}; if (type.changeLevel == Storage::Synchronization::ChangeLevel::Minimal) return; @@ -4314,7 +4314,7 @@ void ProjectStorage::syncDeclarations(Storage::Synchronization::Types &types, AliasPropertyDeclarations &aliasPropertyDeclarationsToLink, PropertyDeclarations &relinkablePropertyDeclarations) { - NanotraceHR::Tracer tracer{"synchronize declaration"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize declaration", projectStorageCategory()}; PropertyDeclarationIds propertyDeclarationIds; propertyDeclarationIds.reserve(types.size() * 10); @@ -4329,7 +4329,7 @@ void ProjectStorage::syncDeclarations(Storage::Synchronization::Types &types, void ProjectStorage::syncDefaultProperties(Storage::Synchronization::Types &types) { - NanotraceHR::Tracer tracer{"synchronize default properties"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize default properties", projectStorageCategory()}; auto range = s->selectTypesWithDefaultPropertyStatement.range(); @@ -4345,7 +4345,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"_t, + NanotraceHR::Tracer tracer{"synchronize default properties by update", projectStorageCategory(), keyValue("type id", value.typeId), keyValue("value", value), @@ -4383,7 +4383,7 @@ void ProjectStorage::syncDefaultProperties(Storage::Synchronization::Types &type void ProjectStorage::resetDefaultPropertiesIfChanged(Storage::Synchronization::Types &types) { - NanotraceHR::Tracer tracer{"reset changed default properties"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"reset changed default properties", projectStorageCategory()}; auto range = s->selectTypesWithDefaultPropertyStatement.range(); @@ -4399,7 +4399,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"_t, + NanotraceHR::Tracer tracer{"reset changed default properties by update", projectStorageCategory(), keyValue("type id", value.typeId), keyValue("value", value), @@ -4429,7 +4429,7 @@ void ProjectStorage::resetDefaultPropertiesIfChanged(Storage::Synchronization::T void ProjectStorage::checkForPrototypeChainCycle(TypeId typeId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"check for prototype chain cycle"_t, + NanotraceHR::Tracer tracer{"check for prototype chain cycle", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4444,7 +4444,7 @@ void ProjectStorage::checkForPrototypeChainCycle(TypeId typeId) const void ProjectStorage::checkForAliasChainCycle(PropertyDeclarationId propertyDeclarationId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"check for alias chain cycle"_t, + NanotraceHR::Tracer tracer{"check for alias chain cycle", projectStorageCategory(), keyValue("property declaration id", propertyDeclarationId)}; auto callback = [=](PropertyDeclarationId currentPropertyDeclarationId) { @@ -4460,7 +4460,7 @@ std::pair ProjectStorage::fetchImportedTypeNameIdAnd const Storage::Synchronization::ImportedTypeName &importedTypeName, SourceId sourceId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch imported type name id and type id"_t, + NanotraceHR::Tracer tracer{"fetch imported type name id and type id", projectStorageCategory(), keyValue("imported type name", importedTypeName), keyValue("source id", sourceId)}; @@ -4491,7 +4491,7 @@ void ProjectStorage::syncPrototypeAndExtension(Storage::Synchronization::Type &t return; using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"synchronize prototype and extension"_t, + NanotraceHR::Tracer tracer{"synchronize prototype and extension", projectStorageCategory(), keyValue("prototype", type.prototype), keyValue("extension", type.extension), @@ -4524,7 +4524,7 @@ void ProjectStorage::syncPrototypesAndExtensions(Storage::Synchronization::Types Prototypes &relinkablePrototypes, Prototypes &relinkableExtensions) { - NanotraceHR::Tracer tracer{"synchronize prototypes and extensions"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"synchronize prototypes and extensions", projectStorageCategory()}; TypeIds typeIds; typeIds.reserve(types.size()); @@ -4539,7 +4539,7 @@ 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"_t, + NanotraceHR::Tracer tracer{"fetch imported type name id", projectStorageCategory(), keyValue("import", import), keyValue("source id", sourceId)}; @@ -4569,7 +4569,7 @@ ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId( auto operator()(const Storage::Synchronization::ImportedType &importedType) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch imported type name id"_t, + NanotraceHR::Tracer tracer{"fetch imported type name id", projectStorageCategory(), keyValue("imported type name", importedType.name), keyValue("source id", sourceId), @@ -4583,7 +4583,7 @@ ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId( auto operator()(const Storage::Synchronization::QualifiedImportedType &importedType) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch imported type name id"_t, + NanotraceHR::Tracer tracer{"fetch imported type name id", projectStorageCategory(), keyValue("imported type name", importedType.name), keyValue("import", importedType.import), @@ -4609,7 +4609,7 @@ ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId( TypeId ProjectStorage::fetchTypeId(ImportedTypeNameId typeNameId) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch type id with type name kind"_t, + NanotraceHR::Tracer tracer{"fetch type id with type name kind", projectStorageCategory(), keyValue("type name id", typeNameId)}; @@ -4637,7 +4637,7 @@ TypeId ProjectStorage::fetchTypeId(ImportedTypeNameId typeNameId, Storage::Synchronization::TypeNameKind kind) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch type id"_t, + NanotraceHR::Tracer tracer{"fetch type id", projectStorageCategory(), keyValue("type name id", typeNameId), keyValue("type name kind", kind)}; @@ -4660,7 +4660,7 @@ ProjectStorage::fetchPropertyDeclarationByTypeIdAndNameUngarded(TypeId typeId, Utils::SmallStringView name) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch optional property declaration by type id and name ungarded"_t, + NanotraceHR::Tracer tracer{"fetch optional property declaration by type id and name ungarded", projectStorageCategory(), keyValue("type id", typeId), keyValue("property name", name)}; @@ -4679,7 +4679,7 @@ PropertyDeclarationId ProjectStorage::fetchPropertyDeclarationIdByTypeIdAndNameU TypeId typeId, Utils::SmallStringView name) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch property declaration id by type id and name ungarded"_t, + NanotraceHR::Tracer tracer{"fetch property declaration id by type id and name ungarded", projectStorageCategory(), keyValue("type id", typeId), keyValue("property name", name)}; @@ -4694,7 +4694,7 @@ PropertyDeclarationId ProjectStorage::fetchPropertyDeclarationIdByTypeIdAndNameU Storage::Synchronization::ExportedTypes ProjectStorage::fetchExportedTypes(TypeId typeId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch exported type"_t, + NanotraceHR::Tracer tracer{"fetch exported type", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4709,7 +4709,7 @@ Storage::Synchronization::ExportedTypes ProjectStorage::fetchExportedTypes(TypeI Storage::Synchronization::PropertyDeclarations ProjectStorage::fetchPropertyDeclarations(TypeId typeId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch property declarations"_t, + NanotraceHR::Tracer tracer{"fetch property declarations", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4724,7 +4724,7 @@ Storage::Synchronization::PropertyDeclarations ProjectStorage::fetchPropertyDecl Storage::Synchronization::FunctionDeclarations ProjectStorage::fetchFunctionDeclarations(TypeId typeId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch signal declarations"_t, + NanotraceHR::Tracer tracer{"fetch signal declarations", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4749,7 +4749,7 @@ Storage::Synchronization::FunctionDeclarations ProjectStorage::fetchFunctionDecl Storage::Synchronization::SignalDeclarations ProjectStorage::fetchSignalDeclarations(TypeId typeId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch signal declarations"_t, + NanotraceHR::Tracer tracer{"fetch signal declarations", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4772,7 +4772,7 @@ Storage::Synchronization::SignalDeclarations ProjectStorage::fetchSignalDeclarat Storage::Synchronization::EnumerationDeclarations ProjectStorage::fetchEnumerationDeclarations(TypeId typeId) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch enumeration declarations"_t, + NanotraceHR::Tracer tracer{"fetch enumeration declarations", projectStorageCategory(), keyValue("type id", typeId)}; @@ -4798,7 +4798,7 @@ template bool ProjectStorage::isBasedOn_(TypeId typeId, TypeIds... baseTypeIds) const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"is based on"_t, + NanotraceHR::Tracer tracer{"is based on", projectStorageCategory(), keyValue("type id", typeId), keyValue("base type ids", NanotraceHR::array(baseTypeIds...))}; @@ -4827,7 +4827,7 @@ ImportedTypeNameId ProjectStorage::fetchImportedTypeNameId(Storage::Synchronizat Utils::SmallStringView typeName) { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"fetch imported type name id"_t, + NanotraceHR::Tracer tracer{"fetch imported type name id", projectStorageCategory(), keyValue("imported type name", typeName), keyValue("kind", kind)}; diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.h b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.h index b3723bfa01d..caeb5377c54 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.h +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.h @@ -132,7 +132,7 @@ public: TypeId commonTypeId() const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get type id from common type cache"_t, + NanotraceHR::Tracer tracer{"get type id from common type cache", projectStorageCategory(), keyValue("module name", std::string_view{moduleName}), keyValue("type name", std::string_view{typeName})}; @@ -148,7 +148,7 @@ public: TypeId builtinTypeId() const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get builtin type id from common type cache"_t, + NanotraceHR::Tracer tracer{"get builtin type id from common type cache", projectStorageCategory()}; auto typeId = commonTypeCache_.builtinTypeId(); @@ -162,7 +162,7 @@ public: TypeId builtinTypeId() const { using NanotraceHR::keyValue; - NanotraceHR::Tracer tracer{"get builtin type id from common type cache"_t, + NanotraceHR::Tracer tracer{"get builtin type id from common type cache", projectStorageCategory()}; auto typeId = commonTypeCache_.builtinTypeId(); @@ -837,7 +837,7 @@ private: template void removeRelinkableEntries(std::vector &relinkables, auto &ids, auto projection) { - NanotraceHR::Tracer tracer{"remove relinkable entries"_t, projectStorageCategory()}; + NanotraceHR::Tracer tracer{"remove relinkable entries", projectStorageCategory()}; std::vector newRelinkables; newRelinkables.reserve(relinkables.size()); diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageexceptions.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageexceptions.cpp index 948a8d42d6d..619988510ab 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageexceptions.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageexceptions.cpp @@ -19,7 +19,7 @@ auto &category() TypeHasInvalidSourceId::TypeHasInvalidSourceId() { - category().threadEvent("TypeHasInvalidSourceId"_t); + category().threadEvent("TypeHasInvalidSourceId"); } const char *TypeHasInvalidSourceId::what() const noexcept @@ -29,7 +29,7 @@ const char *TypeHasInvalidSourceId::what() const noexcept ModuleDoesNotExists::ModuleDoesNotExists() { - category().threadEvent("ModuleDoesNotExists"_t); + category().threadEvent("ModuleDoesNotExists"); } const char *ModuleDoesNotExists::what() const noexcept @@ -39,7 +39,7 @@ const char *ModuleDoesNotExists::what() const noexcept ModuleAlreadyExists::ModuleAlreadyExists() { - category().threadEvent("ModuleAlreadyExists"_t); + category().threadEvent("ModuleAlreadyExists"); } const char *ModuleAlreadyExists::what() const noexcept @@ -53,14 +53,14 @@ TypeNameDoesNotExists::TypeNameDoesNotExists(std::string_view typeName, SourceId Utils::SmallString::join( {"type: ", typeName, ", source id: ", Utils::SmallString::number(sourceId.internalId())})} { - category().threadEvent("TypeNameDoesNotExists"_t, + category().threadEvent("TypeNameDoesNotExists", keyValue("type name", typeName), keyValue("source id", sourceId)); } PrototypeChainCycle::PrototypeChainCycle() { - category().threadEvent("PrototypeChainCycle"_t); + category().threadEvent("PrototypeChainCycle"); } const char *PrototypeChainCycle::what() const noexcept @@ -70,7 +70,7 @@ const char *PrototypeChainCycle::what() const noexcept AliasChainCycle::AliasChainCycle() { - category().threadEvent("AliasChainCycle"_t); + category().threadEvent("AliasChainCycle"); } const char *AliasChainCycle::what() const noexcept @@ -80,7 +80,7 @@ const char *AliasChainCycle::what() const noexcept CannotParseQmlTypesFile::CannotParseQmlTypesFile() { - category().threadEvent("CannotParseQmlTypesFile"_t); + category().threadEvent("CannotParseQmlTypesFile"); } const char *CannotParseQmlTypesFile::what() const noexcept @@ -90,7 +90,7 @@ const char *CannotParseQmlTypesFile::what() const noexcept CannotParseQmlDocumentFile::CannotParseQmlDocumentFile() { - category().threadEvent("CannotParseQmlDocumentFile"_t); + category().threadEvent("CannotParseQmlDocumentFile"); } const char *CannotParseQmlDocumentFile::what() const noexcept @@ -100,7 +100,7 @@ const char *CannotParseQmlDocumentFile::what() const noexcept DirectoryInfoHasInvalidProjectSourceId::DirectoryInfoHasInvalidProjectSourceId() { - category().threadEvent("DirectoryInfoHasInvalidProjectSourceId"_t); + category().threadEvent("DirectoryInfoHasInvalidProjectSourceId"); } const char *DirectoryInfoHasInvalidProjectSourceId::what() const noexcept @@ -110,7 +110,7 @@ const char *DirectoryInfoHasInvalidProjectSourceId::what() const noexcept DirectoryInfoHasInvalidSourceId::DirectoryInfoHasInvalidSourceId() { - category().threadEvent("DirectoryInfoHasInvalidSourceId"_t); + category().threadEvent("DirectoryInfoHasInvalidSourceId"); } const char *DirectoryInfoHasInvalidSourceId::what() const noexcept @@ -120,7 +120,7 @@ const char *DirectoryInfoHasInvalidSourceId::what() const noexcept DirectoryInfoHasInvalidModuleId::DirectoryInfoHasInvalidModuleId() { - category().threadEvent("DirectoryInfoHasInvalidModuleId"_t); + category().threadEvent("DirectoryInfoHasInvalidModuleId"); } const char *DirectoryInfoHasInvalidModuleId::what() const noexcept @@ -130,7 +130,7 @@ const char *DirectoryInfoHasInvalidModuleId::what() const noexcept FileStatusHasInvalidSourceId::FileStatusHasInvalidSourceId() { - category().threadEvent("FileStatusHasInvalidSourceId"_t); + category().threadEvent("FileStatusHasInvalidSourceId"); } const char *FileStatusHasInvalidSourceId::what() const noexcept @@ -160,12 +160,12 @@ const char *ProjectStorageErrorWithMessage::what() const noexcept ExportedTypeCannotBeInserted::ExportedTypeCannotBeInserted(std::string_view errorMessage) : ProjectStorageErrorWithMessage{"ExportedTypeCannotBeInserted"sv, errorMessage} { - category().threadEvent("ExportedTypeCannotBeInserted"_t, keyValue("error message", errorMessage)); + category().threadEvent("ExportedTypeCannotBeInserted", keyValue("error message", errorMessage)); } TypeAnnotationHasInvalidSourceId::TypeAnnotationHasInvalidSourceId() { - category().threadEvent("TypeAnnotationHasInvalidSourceId"_t); + category().threadEvent("TypeAnnotationHasInvalidSourceId"); } const char *TypeAnnotationHasInvalidSourceId::what() const noexcept diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp index 6f4fde65f61..542af30805c 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp @@ -183,7 +183,7 @@ void addModuleExportedImport(Storage::Synchronization::ModuleExportedImports &im Storage::ModuleKind moduleKind, std::string_view exportedModuleName) { - NanotraceHR::Tracer tracer{"add module exported imports"_t, + NanotraceHR::Tracer tracer{"add module exported imports", category(), keyValue("module id", moduleId), keyValue("exported module id", exportedModuleId), @@ -208,7 +208,7 @@ void addModuleExportedImports(Storage::Synchronization::ModuleExportedImports &i const QList &qmldirImports, ProjectStorageInterface &projectStorage) { - NanotraceHR::Tracer tracer{"add module exported imports"_t, + NanotraceHR::Tracer tracer{"add module exported imports", category(), keyValue("cpp module id", cppModuleId), keyValue("module id", moduleId)}; @@ -268,7 +268,7 @@ void ProjectStorageUpdater::update(Update update) const QString &propertyEditorResourcesPath = update.propertyEditorResourcesPath; const QStringList &typeAnnotationPaths = update.typeAnnotationPaths; - NanotraceHR::Tracer tracer{"update"_t, + NanotraceHR::Tracer tracer{"update", category(), keyValue("directories", directories), keyValue("qml types paths", qmlTypesPaths)}; @@ -307,14 +307,14 @@ void ProjectStorageUpdater::updateQmlTypes(const QStringList &qmlTypesPaths, if (qmlTypesPaths.empty()) return; - NanotraceHR::Tracer tracer{"update qmltypes file"_t, category()}; + NanotraceHR::Tracer tracer{"update qmltypes file", category()}; ModuleId moduleId = m_projectStorage.moduleId("QML", Storage::ModuleKind::CppLibrary); for (const QString &qmlTypesPath : qmlTypesPaths) { SourceId sourceId = m_pathCache.sourceId(SourcePath{qmlTypesPath}); watchedSourceIdsIds.qmltypesSourceIds.push_back(sourceId); - tracer.tick("append watched qml types source id"_t, + tracer.tick("append watched qml types source id", keyValue("source id", sourceId), keyValue("qml types path", qmlTypesPath)); @@ -327,9 +327,9 @@ void ProjectStorageUpdater::updateQmlTypes(const QStringList &qmlTypesPaths, notUpdatedSourceIds); if (state == FileState::Changed) { - tracer.tick("append project data"_t, keyValue("project data", directoryInfo)); + tracer.tick("append project data", keyValue("project data", directoryInfo)); package.directoryInfos.push_back(std::move(directoryInfo)); - tracer.tick("append updated project source ids"_t, keyValue("source id", sourceId)); + tracer.tick("append updated project source ids", keyValue("source id", sourceId)); package.updatedDirectoryInfoSourceIds.push_back(sourceId); } } @@ -366,7 +366,7 @@ void ProjectStorageUpdater::updateDirectoryChanged(std::string_view directoryPat parser.parse(m_fileSystem.contentAsQString(QString{qmldirSourcePath})); if (qmldirState != FileState::NotChanged) { - tracer.tick("append updated source id"_t, keyValue("module id", qmldirSourceId)); + tracer.tick("append updated source id", keyValue("module id", qmldirSourceId)); package.updatedSourceIds.push_back(qmldirSourceId); } @@ -384,14 +384,14 @@ void ProjectStorageUpdater::updateDirectoryChanged(std::string_view directoryPat moduleName, imports, m_projectStorage); - tracer.tick("append updated module id"_t, keyValue("module id", moduleId)); + tracer.tick("append updated module id", keyValue("module id", moduleId)); package.updatedModuleIds.push_back(moduleId); const auto qmlDirectoryInfos = m_projectStorage.fetchDirectoryInfos(directorySourceId); - addSourceIds(package.updatedSourceIds, qmlDirectoryInfos, "append updated source id"_t, tracer); + addSourceIds(package.updatedSourceIds, qmlDirectoryInfos, "append updated source id", tracer); addSourceIds(package.updatedFileStatusSourceIds, qmlDirectoryInfos, - "append updated file status source id"_t, + "append updated file status source id", tracer); auto qmlTypes = filterMultipleEntries(parser.typeInfos()); @@ -415,7 +415,7 @@ void ProjectStorageUpdater::updateDirectoryChanged(std::string_view directoryPat notUpdatedSourceIds, watchedSourceIdsIds, qmldirState); - tracer.tick("append updated project source id"_t, keyValue("module id", moduleId)); + tracer.tick("append updated project source id", keyValue("module id", moduleId)); package.updatedDirectoryInfoSourceIds.push_back(directorySourceId); } @@ -424,7 +424,7 @@ void ProjectStorageUpdater::updateDirectories(const QStringList &directories, NotUpdatedSourceIds ¬UpdatedSourceIds, WatchedSourceIdsIds &watchedSourceIdsIds) { - NanotraceHR::Tracer tracer{"update directories"_t, category()}; + NanotraceHR::Tracer tracer{"update directories", category()}; for (const QString &directory : directories) updateDirectory({directory}, {}, package, notUpdatedSourceIds, watchedSourceIdsIds); @@ -532,7 +532,7 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa NotUpdatedSourceIds ¬UpdatedSourceIds, WatchedSourceIdsIds &watchedSourceIdsIds) { - NanotraceHR::Tracer tracer{"update directory"_t, category(), keyValue("directory", directoryPath)}; + NanotraceHR::Tracer tracer{"update directory", category(), keyValue("directory", directoryPath)}; SourcePath qmldirSourcePath{directoryPath + "/qmldir"}; auto [directoryId, qmldirSourceId] = m_pathCache.sourceContextAndSourceId(qmldirSourcePath); @@ -549,7 +549,7 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa switch (combineState(directoryState, qmldirState)) { case FileState::Changed: { - tracer.tick("update directory changed"_t); + tracer.tick("update directory changed"); updateDirectoryChanged(directoryPath, qmldirState, qmldirSourcePath, @@ -563,7 +563,7 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa break; } case FileState::NotChanged: { - tracer.tick("update directory not changed"_t); + tracer.tick("update directory not changed"); parseDirectoryInfos(m_projectStorage.fetchDirectoryInfos(directorySourceId), package, @@ -572,7 +572,7 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa break; } case FileState::NotExists: { - tracer.tick("update directory don't exits"_t); + tracer.tick("update directory don't exits"); package.updatedFileStatusSourceIds.push_back(directorySourceId); package.updatedFileStatusSourceIds.push_back(qmldirSourceId); @@ -580,9 +580,9 @@ void ProjectStorageUpdater::updateDirectory(const Utils::PathString &directoryPa package.updatedSourceIds.push_back(qmldirSourceId); auto qmlDirectoryInfos = m_projectStorage.fetchDirectoryInfos(directorySourceId); for (const Storage::Synchronization::DirectoryInfo &directoryInfo : qmlDirectoryInfos) { - tracer.tick("append updated source id"_t, keyValue("source id", directoryInfo.sourceId)); + tracer.tick("append updated source id", keyValue("source id", directoryInfo.sourceId)); package.updatedSourceIds.push_back(directoryInfo.sourceId); - tracer.tick("append updated file status source id"_t, + tracer.tick("append updated file status source id", keyValue("source id", directoryInfo.sourceId)); package.updatedFileStatusSourceIds.push_back(directoryInfo.sourceId); } @@ -613,7 +613,7 @@ void ProjectStorageUpdater::updatePropertyEditorPaths( Storage::Synchronization::SynchronizationPackage &package, NotUpdatedSourceIds ¬UpdatedSourceIds) { - NanotraceHR::Tracer tracer{"update property editor paths"_t, + NanotraceHR::Tracer tracer{"update property editor paths", category(), keyValue("property editor resources path", propertyEditorResourcesPath)}; @@ -661,7 +661,7 @@ void ProjectStorageUpdater::updateTypeAnnotations(const QStringList &directoryPa Storage::Synchronization::SynchronizationPackage &package, NotUpdatedSourceIds ¬UpdatedSourceIds) { - NanotraceHR::Tracer tracer("update type annotations"_t, category()); + NanotraceHR::Tracer tracer("update type annotations", category()); std::map> updatedSourceIdsDictonary; @@ -680,7 +680,7 @@ void ProjectStorageUpdater::updateTypeAnnotations( NotUpdatedSourceIds ¬UpdatedSourceIds, std::map> &updatedSourceIdsDictonary) { - NanotraceHR::Tracer tracer("update type annotation directory"_t, + NanotraceHR::Tracer tracer("update type annotation directory", category(), keyValue("path", rootDirectoryPath)); @@ -753,7 +753,7 @@ void ProjectStorageUpdater::updateTypeAnnotation(const QString &directoryPath, SourceId directorySourceId, Storage::Synchronization::SynchronizationPackage &package) { - NanotraceHR::Tracer tracer{"update type annotation path"_t, + NanotraceHR::Tracer tracer{"update type annotation path", category(), keyValue("path", filePath), keyValue("directory path", directoryPath)}; @@ -776,12 +776,12 @@ void ProjectStorageUpdater::updatePropertyEditorPath( SourceId directorySourceId, long long pathOffset) { - NanotraceHR::Tracer tracer{"update property editor path"_t, + NanotraceHR::Tracer tracer{"update property editor path", category(), keyValue("directory path", directoryPath), keyValue("directory source id", directorySourceId)}; - tracer.tick("append updated property editor qml path source id"_t, + tracer.tick("append updated property editor qml path source id", keyValue("source id", directorySourceId)); package.updatedPropertyEditorQmlPathSourceIds.push_back(directorySourceId); auto dir = QDir{directoryPath}; @@ -796,7 +796,7 @@ void ProjectStorageUpdater::updatePropertyEditorFilePath( SourceId directorySourceId, long long pathOffset) { - NanotraceHR::Tracer tracer{"update property editor file path"_t, + NanotraceHR::Tracer tracer{"update property editor file path", category(), keyValue("directory path", path), keyValue("directory source id", directorySourceId)}; @@ -819,7 +819,7 @@ void ProjectStorageUpdater::updatePropertyEditorFilePath( typeName, pathId, directorySourceId); - tracer.tick("append property editor qml paths"_t, + tracer.tick("append property editor qml paths", keyValue("property editor qml paths", paths)); } } @@ -854,7 +854,7 @@ bool contains(const Container &container, Id id) void ProjectStorageUpdater::pathsWithIdsChanged(const std::vector &changedIdPaths) { - NanotraceHR::Tracer tracer{"paths with ids changed"_t, + NanotraceHR::Tracer tracer{"paths with ids changed", category(), keyValue("id paths", changedIdPaths)}; @@ -954,35 +954,35 @@ void ProjectStorageUpdater::parseTypeInfos(const QStringList &typeInfos, NotUpdatedSourceIds ¬UpdatedSourceIds, WatchedSourceIdsIds &watchedSourceIds) { - NanotraceHR::Tracer tracer{"parse type infos"_t, + NanotraceHR::Tracer tracer{"parse type infos", category(), keyValue("directory source id", directorySourceId), keyValue("directory path", directoryPath), keyValue("module id", moduleId)}; for (const QString &typeInfo : typeInfos) { - NanotraceHR::Tracer tracer{"parse type info"_t, category(), keyValue("type info", typeInfo)}; + NanotraceHR::Tracer tracer{"parse type info", category(), keyValue("type info", typeInfo)}; Utils::PathString qmltypesPath = Utils::PathString::join( {directoryPath, "/", Utils::SmallString{typeInfo}}); SourceId sourceId = m_pathCache.sourceId(SourcePathView{qmltypesPath}); - tracer.tick("append qmltypes source id"_t, keyValue("source id", sourceId)); + tracer.tick("append qmltypes source id", keyValue("source id", sourceId)); watchedSourceIds.qmltypesSourceIds.push_back(sourceId); addDependencies(package.moduleDependencies, sourceId, joinImports(qmldirDependencies, qmldirImports), m_projectStorage, - "append module dependency"_t, + "append module dependency", tracer); - tracer.tick("append module dependenct source source id"_t, keyValue("source id", sourceId)); + tracer.tick("append module dependenct source source id", keyValue("source id", sourceId)); package.updatedModuleDependencySourceIds.push_back(sourceId); const auto &directoryInfo = package.directoryInfos.emplace_back( directorySourceId, sourceId, moduleId, Storage::Synchronization::FileType::QmlTypes); - tracer.tick("append project data"_t, keyValue("source id", sourceId)); + tracer.tick("append project data", keyValue("source id", sourceId)); parseTypeInfo(directoryInfo, qmltypesPath, package, notUpdatedSourceIds); } @@ -994,7 +994,7 @@ void ProjectStorageUpdater::parseDirectoryInfos( NotUpdatedSourceIds ¬UpdatedSourceIds, WatchedSourceIdsIds &watchedSourceIds) { - NanotraceHR::Tracer tracer{"parse project datas"_t, category()}; + NanotraceHR::Tracer tracer{"parse project datas", category()}; for (const Storage::Synchronization::DirectoryInfo &directoryInfo : directoryInfos) { switch (directoryInfo.fileType) { @@ -1022,14 +1022,14 @@ auto ProjectStorageUpdater::parseTypeInfo(const Storage::Synchronization::Direct Storage::Synchronization::SynchronizationPackage &package, NotUpdatedSourceIds ¬UpdatedSourceIds) -> FileState { - NanotraceHR::Tracer tracer{"parse type info"_t, + NanotraceHR::Tracer tracer{"parse type info", category(), keyValue("qmltypes path", qmltypesPath)}; auto state = fileState(directoryInfo.sourceId, package, notUpdatedSourceIds); switch (state) { case FileState::Changed: { - tracer.tick("append updated source ids"_t, keyValue("source id", directoryInfo.sourceId)); + tracer.tick("append updated source ids", keyValue("source id", directoryInfo.sourceId)); package.updatedSourceIds.push_back(directoryInfo.sourceId); const auto content = m_fileSystem.contentAsQString(QString{qmltypesPath}); @@ -1037,7 +1037,7 @@ auto ProjectStorageUpdater::parseTypeInfo(const Storage::Synchronization::Direct break; } case FileState::NotChanged: { - tracer.tick("append not updated source ids"_t, keyValue("source id", directoryInfo.sourceId)); + tracer.tick("append not updated source ids", keyValue("source id", directoryInfo.sourceId)); notUpdatedSourceIds.sourceIds.push_back(directoryInfo.sourceId); break; } @@ -1059,7 +1059,7 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil WatchedSourceIdsIds &watchedSourceIds, FileState qmldirState) { - NanotraceHR::Tracer tracer{"parse qml component"_t, + NanotraceHR::Tracer tracer{"parse qml component", category(), keyValue("relative file path", relativeFilePath), keyValue("directory path", directoryPath), @@ -1076,18 +1076,18 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil Storage::Synchronization::Type type; auto state = fileState(sourceId, package, notUpdatedSourceIds); - tracer.tick("append watched qml source id"_t, keyValue("source id", sourceId)); + tracer.tick("append watched qml source id", keyValue("source id", sourceId)); watchedSourceIds.qmlSourceIds.push_back(sourceId); switch (state) { case FileState::NotChanged: if (qmldirState == FileState::NotExists) { - tracer.tick("append not updated source id"_t, keyValue("source id", sourceId)); + tracer.tick("append not updated source id", keyValue("source id", sourceId)); notUpdatedSourceIds.sourceIds.emplace_back(sourceId); const auto &directoryInfo = package.directoryInfos.emplace_back( directorySourceId, sourceId, ModuleId{}, Storage::Synchronization::FileType::QmlDocument); - tracer.tick("append project data"_t, keyValue("project data", directoryInfo)); + tracer.tick("append project data", keyValue("project data", directoryInfo)); return; } @@ -1103,9 +1103,9 @@ void ProjectStorageUpdater::parseQmlComponent(Utils::SmallStringView relativeFil const auto &directoryInfo = package.directoryInfos.emplace_back( directorySourceId, sourceId, ModuleId{}, Storage::Synchronization::FileType::QmlDocument); - tracer.tick("append project data"_t, keyValue("project data", directoryInfo)); + tracer.tick("append project data", keyValue("project data", directoryInfo)); - tracer.tick("append updated source id"_t, keyValue("source id", sourceId)); + tracer.tick("append updated source id", keyValue("source id", sourceId)); package.updatedSourceIds.push_back(sourceId); type.typeName = SourcePath{qmlFilePath}.name(); @@ -1121,13 +1121,13 @@ void ProjectStorageUpdater::parseQmlComponent(SourceId sourceId, Storage::Synchronization::SynchronizationPackage &package, NotUpdatedSourceIds ¬UpdatedSourceIds) { - NanotraceHR::Tracer tracer{"parse qml component"_t, category(), keyValue("source id", sourceId)}; + NanotraceHR::Tracer tracer{"parse qml component", category(), keyValue("source id", sourceId)}; auto state = fileState(sourceId, package, notUpdatedSourceIds); if (state == FileState::NotChanged) return; - tracer.tick("append updated source id"_t, keyValue("source id", sourceId)); + tracer.tick("append updated source id", keyValue("source id", sourceId)); package.updatedSourceIds.push_back(sourceId); if (state == FileState::NotExists) @@ -1191,7 +1191,7 @@ void ProjectStorageUpdater::parseQmlComponents(Components components, WatchedSourceIdsIds &watchedSourceIdsIds, FileState qmldirState) { - NanotraceHR::Tracer tracer{"parse qml components"_t, + NanotraceHR::Tracer tracer{"parse qml components", category(), keyValue("directory source id", directorySourceId), keyValue("directory id", directoryId), @@ -1224,14 +1224,14 @@ ProjectStorageUpdater::FileState ProjectStorageUpdater::fileState( Storage::Synchronization::SynchronizationPackage &package, NotUpdatedSourceIds ¬UpdatedSourceIds) const { - NanotraceHR::Tracer tracer{"update property editor paths"_t, + NanotraceHR::Tracer tracer{"update property editor paths", category(), keyValue("source id", sourceId)}; auto currentFileStatus = m_fileStatusCache.find(sourceId); if (!currentFileStatus.isValid()) { - tracer.tick("append updated file status source id"_t, keyValue("source id", sourceId)); + tracer.tick("append updated file status source id", keyValue("source id", sourceId)); package.updatedFileStatusSourceIds.push_back(sourceId); tracer.end(keyValue("state", FileState::NotExists)); @@ -1241,17 +1241,17 @@ ProjectStorageUpdater::FileState ProjectStorageUpdater::fileState( auto projectStorageFileStatus = m_projectStorage.fetchFileStatus(sourceId); if (!projectStorageFileStatus.isValid() || projectStorageFileStatus != currentFileStatus) { - tracer.tick("append file status"_t, keyValue("file status", sourceId)); + tracer.tick("append file status", keyValue("file status", sourceId)); package.fileStatuses.push_back(currentFileStatus); - tracer.tick("append updated file status source id"_t, keyValue("source id", sourceId)); + tracer.tick("append updated file status source id", keyValue("source id", sourceId)); package.updatedFileStatusSourceIds.push_back(sourceId); tracer.end(keyValue("state", FileState::Changed)); return FileState::Changed; } - tracer.tick("append not updated file status source id"_t, keyValue("source id", sourceId)); + tracer.tick("append not updated file status source id", keyValue("source id", sourceId)); notUpdatedSourceIds.fileStatusSourceIds.push_back(sourceId); tracer.end(keyValue("state", FileState::NotChanged)); diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/qmldocumentparser.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/qmldocumentparser.cpp index 17aa8ca9617..5dbdb659c14 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/qmldocumentparser.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/qmldocumentparser.cpp @@ -101,7 +101,7 @@ QualifiedImports createQualifiedImports(const QList &qmlImports, Utils::SmallStringView directoryPath, ProjectStorageType &storage) { - NanotraceHR::Tracer tracer{"create qualified imports"_t, + NanotraceHR::Tracer tracer{"create qualified imports", category(), keyValue("sourceId", sourceId), keyValue("directoryPath", directoryPath)}; @@ -324,7 +324,7 @@ Storage::Synchronization::Type QmlDocumentParser::parse(const QString &sourceCon SourceId sourceId, Utils::SmallStringView directoryPath) { - NanotraceHR::Tracer tracer{"qml document parser parse"_t, + NanotraceHR::Tracer tracer{"qml document parser parse", category(), keyValue("sourceId", sourceId), keyValue("directoryPath", directoryPath)}; diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/qmltypesparser.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/qmltypesparser.cpp index 052d38809d2..9b96dde68a6 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/qmltypesparser.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/qmltypesparser.cpp @@ -39,7 +39,7 @@ using Storage::TypeNameString; ComponentWithoutNamespaces createComponentNameWithoutNamespaces(const QList &objects) { - NanotraceHR::Tracer tracer{"parse qmltypes file"_t, category()}; + NanotraceHR::Tracer tracer{"parse qmltypes file", category()}; ComponentWithoutNamespaces componentWithoutNamespaces; @@ -81,7 +81,7 @@ void addImports(Storage::Imports &imports, ModuleId cppModuleId) { NanotraceHR::Tracer tracer{ - "add imports"_t, + "add imports", category(), keyValue("source id", sourceId), keyValue("module id", cppModuleId), @@ -89,16 +89,16 @@ void addImports(Storage::Imports &imports, for (const QString &dependency : dependencies) { const auto &import = appendImports(imports, dependency, sourceId, storage); - tracer.tick("append import"_t, keyValue("import", import), keyValue("dependency", dependency)); + tracer.tick("append import", keyValue("import", import), keyValue("dependency", dependency)); } const auto &import = imports.emplace_back(cppModuleId, Storage::Version{}, sourceId); - tracer.tick("append import"_t, keyValue("import", import)); + tracer.tick("append import", keyValue("import", import)); if (ModuleId qmlCppModuleId = storage.moduleId("QML", ModuleKind::CppLibrary); cppModuleId != qmlCppModuleId) { const auto &import = imports.emplace_back(qmlCppModuleId, Storage::Version{}, sourceId); - tracer.tick("append import"_t, keyValue("import", import)); + tracer.tick("append import", keyValue("import", import)); } } @@ -438,7 +438,7 @@ void addType(Storage::Synchronization::Types &types, QmlTypesParser::ProjectStorage &storage, const ComponentWithoutNamespaces &componentNameWithoutNamespace) { - NanotraceHR::Tracer tracer{"add type"_t, + NanotraceHR::Tracer tracer{"add type", category(), keyValue("source id", sourceId), keyValue("module id", cppModuleId)}; @@ -503,7 +503,7 @@ void addTypes(Storage::Synchronization::Types &types, QmlTypesParser::ProjectStorage &storage, const ComponentWithoutNamespaces &componentNameWithoutNamespaces) { - NanotraceHR::Tracer tracer{"add types"_t, category()}; + NanotraceHR::Tracer tracer{"add types", category()}; types.reserve(Utils::usize(objects) + types.size()); const auto skipList = getSkipList(storage.module(directoryInfo.moduleId)); @@ -528,7 +528,7 @@ void QmlTypesParser::parse(const QString &sourceContent, Storage::Synchronization::Types &types, const Storage::Synchronization::DirectoryInfo &directoryInfo) { - NanotraceHR::Tracer tracer{"qmltypes parser parse"_t, category()}; + NanotraceHR::Tracer tracer{"qmltypes parser parse", category()}; QQmlJSTypeDescriptionReader reader({}, sourceContent); QList components; diff --git a/src/plugins/qmldesigner/libs/designercore/tracing/qmldesignertracing.cpp b/src/plugins/qmldesigner/libs/designercore/tracing/qmldesignertracing.cpp index e0bdcd8c860..bd6592d1f02 100644 --- a/src/plugins/qmldesigner/libs/designercore/tracing/qmldesignertracing.cpp +++ b/src/plugins/qmldesigner/libs/designercore/tracing/qmldesignertracing.cpp @@ -55,7 +55,7 @@ StringEventQueue &stringEventQueue() namespace ModelTracing { namespace { -thread_local Category category_{"model"_t, Tracing::stringEventQueue(), category}; +thread_local Category category_{"model", Tracing::stringEventQueue(), category}; } // namespace @@ -70,7 +70,7 @@ namespace ProjectStorageTracing { Category &projectStorageCategory() { - thread_local Category category{"project storage"_t, + thread_local Category category{"project storage", Tracing::eventQueueWithStringArguments(), projectStorageCategory}; @@ -79,7 +79,7 @@ Category &projectStorageCategory() Category &projectStorageUpdaterCategory() { - thread_local Category category{"project storage updater"_t, + thread_local Category category{"project storage updater", Tracing::eventQueueWithStringArguments(), projectStorageCategory}; @@ -91,7 +91,7 @@ Category &projectStorageUpdaterCategory() namespace SourcePathStorageTracing { Category &category() { - thread_local Category category_{"project storage updater"_t, + thread_local Category category_{"project storage updater", Tracing::eventQueueWithStringArguments(), category}; @@ -102,7 +102,7 @@ Category &category() namespace MetaInfoTracing { Category &category() { - thread_local Category category_{"meta info"_t, Tracing::eventQueueWithStringArguments(), category}; + thread_local Category category_{"meta info", Tracing::eventQueueWithStringArguments(), category}; return category_; }