diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2024-03-12 12:00:55 +0100 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2024-03-18 12:59:37 +0000 |
| commit | 27cfd2e240322fcdd60257ab52f1a737d6fe2809 (patch) | |
| tree | 412894f2a19047ece335dc064c810042a6dfb847 /src/libs | |
| parent | 462f46db30eade04b477110b99190cd922d81ca2 (diff) | |
Sqlite: Add convertToString to Sqlite id
Change-Id: I52d9b6860d24d715fdd6b584ffc2f8345f6b99c4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/nanotrace/nanotracehr.cpp | 5 | ||||
| -rw-r--r-- | src/libs/nanotrace/nanotracehr.h | 4 | ||||
| -rw-r--r-- | src/libs/sqlite/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libs/sqlite/sqliteids.h | 8 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/libs/nanotrace/nanotracehr.cpp b/src/libs/nanotrace/nanotracehr.cpp index 07d2ff95ac..2dd1806aaf 100644 --- a/src/libs/nanotrace/nanotracehr.cpp +++ b/src/libs/nanotrace/nanotracehr.cpp @@ -103,7 +103,6 @@ std::string getThreadName() } // namespace -namespace Internal { template<typename String> void convertToString(String &string, const QImage &image) { @@ -132,14 +131,12 @@ void convertToString(String &string, const QImage &image) return "alpha premultiplied"sv; })))); - Internal::convertToString(string, dict); + convertToString(string, dict); } template NANOTRACE_EXPORT void convertToString(std::string &string, const QImage &image); template NANOTRACE_EXPORT void convertToString(ArgumentsString &string, const QImage &image); -} // namespace Internal - template<typename TraceEvent> void flushEvents(const Utils::span<TraceEvent> events, std::thread::id threadId, diff --git a/src/libs/nanotrace/nanotracehr.h b/src/libs/nanotrace/nanotracehr.h index 23e5896df8..9d16b1bb63 100644 --- a/src/libs/nanotrace/nanotracehr.h +++ b/src/libs/nanotrace/nanotracehr.h @@ -80,8 +80,6 @@ struct IsDictonary inline constexpr IsDictonary isDictonary; -namespace Internal { - template<typename String> void convertToString(String &string, std::string_view text) { @@ -251,6 +249,8 @@ void convertToString(String &string, const Container<Arguments...> &container) string.append("]"); } +namespace Internal { + template<typename String, typename... Arguments> String toArguments(Arguments &&...arguments) { diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt index 2c7e1ebbf3..2943d1e77a 100644 --- a/src/libs/sqlite/CMakeLists.txt +++ b/src/libs/sqlite/CMakeLists.txt @@ -31,7 +31,7 @@ endif() add_qtc_library(Sqlite PROPERTIES AUTOMOC OFF AUTOUIC OFF - DEPENDS Qt::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteInternal + DEPENDS Qt::Core Threads::Threads ${CMAKE_DL_LIBS} SqliteInternal Nanotrace INCLUDES ../3rdparty/sqlite PUBLIC_INCLUDES diff --git a/src/libs/sqlite/sqliteids.h b/src/libs/sqlite/sqliteids.h index d64e4d9645..75490ecccd 100644 --- a/src/libs/sqlite/sqliteids.h +++ b/src/libs/sqlite/sqliteids.h @@ -5,6 +5,7 @@ #include <utils/span.h> +#include <nanotrace/nanotracehr.h> #include <type_traits> #include <vector> @@ -77,6 +78,12 @@ auto toIntegers(const Container &container) return Utils::span{data, container.size()}; } +template<typename String, auto Type, typename InternalIntegerType = long long> +void convertToString(String &string, BasicId<Type, InternalIntegerType> id) +{ + NanotraceHR::convertToString(string, id.internalId()); +} + } // namespace Sqlite namespace std { @@ -88,4 +95,5 @@ struct hash<Sqlite::BasicId<Type, InternalIntegerType>> return std::hash<InternalIntegerType>{}(id.internalId()); } }; + } // namespace std |