From 7457d3d8b6945e14124cdd7517767a486af00ff7 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 19 Jan 2022 11:24:39 +0100 Subject: [PATCH] ClangSupport: Break artificial dependency to Sqlite Since the Sqlite library is not used anymore in clang there was only an dependency to the Utf8String in ClangSupport. As we move Utf8String and Utf8StringVector to ClangSupport we can break the dependency to Sqlite. Change-Id: I0012906345bc49a48a7262c1d6e204fb8aff01e1 Reviewed-by: Christian Kandeler Reviewed-by: Eike Ziller --- src/libs/clangsupport/CMakeLists.txt | 4 +++- src/libs/clangsupport/clangsupport-lib.pri | 4 ++++ src/libs/clangsupport/clangsupport.qbs | 2 -- src/libs/clangsupport/clangsupportdebugutils.cpp | 2 +- src/libs/clangsupport/codecompletion.h | 2 +- src/libs/clangsupport/codecompletionchunk.h | 2 +- src/libs/clangsupport/filecontainer.h | 2 +- src/libs/clangsupport/lineprefixer.h | 2 +- src/libs/clangsupport/requestcompletionsmessage.h | 2 +- src/libs/clangsupport/sourcelocationcontainer.h | 2 +- src/libs/clangsupport/tokeninfocontainer.h | 2 +- src/libs/clangsupport/tooltipinfo.h | 2 +- src/libs/{sqlite => clangsupport}/utf8string.cpp | 0 src/libs/{sqlite => clangsupport}/utf8string.h | 8 ++++---- src/libs/{sqlite => clangsupport}/utf8stringvector.cpp | 0 src/libs/{sqlite => clangsupport}/utf8stringvector.h | 6 +++--- src/libs/sqlite/CMakeLists.txt | 2 -- src/libs/sqlite/sqlite-lib.pri | 4 ---- .../clangcodemodel/clangcompletionchunkstotextconverter.h | 2 +- src/tools/clangbackend/source/sourcelocation.cpp | 2 +- src/tools/clangbackend/source/tokeninfo.h | 2 +- 21 files changed, 26 insertions(+), 28 deletions(-) rename src/libs/{sqlite => clangsupport}/utf8string.cpp (100%) rename src/libs/{sqlite => clangsupport}/utf8string.h (96%) rename src/libs/{sqlite => clangsupport}/utf8stringvector.cpp (100%) rename src/libs/{sqlite => clangsupport}/utf8stringvector.h (93%) diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt index 032284a10a4..aa3c0ec3da2 100644 --- a/src/libs/clangsupport/CMakeLists.txt +++ b/src/libs/clangsupport/CMakeLists.txt @@ -2,7 +2,7 @@ set(CLANG_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PAT add_qtc_library(ClangSupport DEPENDS Threads::Threads - PUBLIC_DEPENDS Utils Sqlite Qt5::Core Qt5::Network + PUBLIC_DEPENDS Utils Qt5::Core Qt5::Network PUBLIC_DEFINES CLANG_VERSION="${CLANG_VERSION}" CLANG_INCLUDE_DIR="${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}/include" @@ -63,6 +63,8 @@ add_qtc_library(ClangSupport tooltipmessage.cpp tooltipmessage.h unsavedfilesremovedmessage.cpp unsavedfilesremovedmessage.h unsavedfilesupdatedmessage.cpp unsavedfilesupdatedmessage.h + utf8string.cpp utf8string.h + utf8stringvector.cpp utf8stringvector.h writemessageblock.cpp writemessageblock.h ) diff --git a/src/libs/clangsupport/clangsupport-lib.pri b/src/libs/clangsupport/clangsupport-lib.pri index c53974ce0cf..4529b4fb62d 100644 --- a/src/libs/clangsupport/clangsupport-lib.pri +++ b/src/libs/clangsupport/clangsupport-lib.pri @@ -50,6 +50,8 @@ SOURCES += \ $$PWD/tooltipmessage.cpp \ $$PWD/tooltipinfo.cpp \ $$PWD/unsavedfilesremovedmessage.cpp \ + $$PWD/utf8string.cpp \ + $$PWD/utf8stringvector.cpp \ $$PWD/documentschangedmessage.cpp \ $$PWD/documentvisibilitychangedmessage.cpp \ $$PWD/writemessageblock.cpp \ @@ -104,6 +106,8 @@ HEADERS += \ $$PWD/tooltipmessage.h \ $$PWD/tooltipinfo.h \ $$PWD/unsavedfilesremovedmessage.h \ + $$PWD/utf8string.h \ + $$PWD/utf8stringvector.h \ $$PWD/documentschangedmessage.h \ $$PWD/documentvisibilitychangedmessage.h \ $$PWD/writemessageblock.h \ diff --git a/src/libs/clangsupport/clangsupport.qbs b/src/libs/clangsupport/clangsupport.qbs index 6b76f784aff..f2ca80ce551 100644 --- a/src/libs/clangsupport/clangsupport.qbs +++ b/src/libs/clangsupport/clangsupport.qbs @@ -5,7 +5,6 @@ QtcLibrary { targetName: "Clangbackendipc" Depends { name: "Qt.network" } - Depends { name: "Sqlite" } Depends { name: "Utils" } cpp.defines: base.concat("CLANGSUPPORT_BUILD_LIB") @@ -19,7 +18,6 @@ QtcLibrary { } Export { - Depends { name: "Sqlite" } Depends { name: "Utils" } Depends { name: "Qt.network" } cpp.includePaths: [ diff --git a/src/libs/clangsupport/clangsupportdebugutils.cpp b/src/libs/clangsupport/clangsupportdebugutils.cpp index 864f44a6d0f..3d49694884a 100644 --- a/src/libs/clangsupport/clangsupportdebugutils.cpp +++ b/src/libs/clangsupport/clangsupportdebugutils.cpp @@ -27,7 +27,7 @@ #include "filecontainer.h" -#include +#include "utf8string.h" #include #include diff --git a/src/libs/clangsupport/codecompletion.h b/src/libs/clangsupport/codecompletion.h index 4a97fe08c15..a8f0e142b2f 100644 --- a/src/libs/clangsupport/codecompletion.h +++ b/src/libs/clangsupport/codecompletion.h @@ -29,7 +29,7 @@ #include "codecompletionchunk.h" #include "fixitcontainer.h" -#include +#include "utf8string.h" #include #include diff --git a/src/libs/clangsupport/codecompletionchunk.h b/src/libs/clangsupport/codecompletionchunk.h index b1a0ba32e71..e04d3351af1 100644 --- a/src/libs/clangsupport/codecompletionchunk.h +++ b/src/libs/clangsupport/codecompletionchunk.h @@ -27,7 +27,7 @@ #include "clangsupport_global.h" -#include +#include "utf8string.h" #include #include diff --git a/src/libs/clangsupport/filecontainer.h b/src/libs/clangsupport/filecontainer.h index 64180e21418..2c7eb088513 100644 --- a/src/libs/clangsupport/filecontainer.h +++ b/src/libs/clangsupport/filecontainer.h @@ -27,7 +27,7 @@ #include "clangsupport_global.h" -#include +#include "utf8string.h" #include #include diff --git a/src/libs/clangsupport/lineprefixer.h b/src/libs/clangsupport/lineprefixer.h index 58439875fa4..010a5247ea7 100644 --- a/src/libs/clangsupport/lineprefixer.h +++ b/src/libs/clangsupport/lineprefixer.h @@ -27,9 +27,9 @@ #include "clangsupport_global.h" +#include "utf8string.h" #include #include -#include namespace ClangBackEnd { diff --git a/src/libs/clangsupport/requestcompletionsmessage.h b/src/libs/clangsupport/requestcompletionsmessage.h index fa9bd9aebb9..90b492c0f3f 100644 --- a/src/libs/clangsupport/requestcompletionsmessage.h +++ b/src/libs/clangsupport/requestcompletionsmessage.h @@ -27,7 +27,7 @@ #include "clangsupport_global.h" -#include +#include "utf8string.h" #include diff --git a/src/libs/clangsupport/sourcelocationcontainer.h b/src/libs/clangsupport/sourcelocationcontainer.h index 1c205755b16..4f13488e212 100644 --- a/src/libs/clangsupport/sourcelocationcontainer.h +++ b/src/libs/clangsupport/sourcelocationcontainer.h @@ -27,7 +27,7 @@ #include "clangsupport_global.h" -#include +#include "utf8string.h" namespace ClangBackEnd { diff --git a/src/libs/clangsupport/tokeninfocontainer.h b/src/libs/clangsupport/tokeninfocontainer.h index dc2f8ba2524..004bdd3cb9f 100644 --- a/src/libs/clangsupport/tokeninfocontainer.h +++ b/src/libs/clangsupport/tokeninfocontainer.h @@ -29,7 +29,7 @@ #include "sourcerangecontainer.h" -#include +#include "utf8string.h" #include diff --git a/src/libs/clangsupport/tooltipinfo.h b/src/libs/clangsupport/tooltipinfo.h index 31bf313ab14..3d443c5b640 100644 --- a/src/libs/clangsupport/tooltipinfo.h +++ b/src/libs/clangsupport/tooltipinfo.h @@ -25,7 +25,7 @@ #pragma once -#include +#include "utf8string.h" #include #include diff --git a/src/libs/sqlite/utf8string.cpp b/src/libs/clangsupport/utf8string.cpp similarity index 100% rename from src/libs/sqlite/utf8string.cpp rename to src/libs/clangsupport/utf8string.cpp diff --git a/src/libs/sqlite/utf8string.h b/src/libs/clangsupport/utf8string.h similarity index 96% rename from src/libs/sqlite/utf8string.h rename to src/libs/clangsupport/utf8string.h index 28e77be487a..ebd9aba0a6e 100644 --- a/src/libs/sqlite/utf8string.h +++ b/src/libs/clangsupport/utf8string.h @@ -25,7 +25,7 @@ #pragma once -#include "sqliteglobal.h" +#include "clangsupport_global.h" #include #include @@ -108,7 +108,7 @@ public: byteArray.replace(position, length, after.byteArray); } - SQLITE_EXPORT Utf8StringVector split(char separator) const; + CLANGSUPPORT_EXPORT Utf8StringVector split(char separator) const; void clear() { @@ -317,7 +317,7 @@ private: QByteArray byteArray; }; -SQLITE_EXPORT QDebug operator<<(QDebug debug, const Utf8String &text); -SQLITE_EXPORT std::ostream& operator<<(std::ostream &os, const Utf8String &utf8String); +CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const Utf8String &text); +CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, const Utf8String &utf8String); #define Utf8StringLiteral(str) Utf8String::fromByteArray(QByteArrayLiteral(str)) diff --git a/src/libs/sqlite/utf8stringvector.cpp b/src/libs/clangsupport/utf8stringvector.cpp similarity index 100% rename from src/libs/sqlite/utf8stringvector.cpp rename to src/libs/clangsupport/utf8stringvector.cpp diff --git a/src/libs/sqlite/utf8stringvector.h b/src/libs/clangsupport/utf8stringvector.h similarity index 93% rename from src/libs/sqlite/utf8stringvector.h rename to src/libs/clangsupport/utf8stringvector.h index fb0fb6469ec..31c681ecb95 100644 --- a/src/libs/sqlite/utf8stringvector.h +++ b/src/libs/clangsupport/utf8stringvector.h @@ -25,7 +25,7 @@ #pragma once -#include "sqliteglobal.h" +#include "clangsupport_global.h" #include "utf8string.h" #include @@ -33,7 +33,7 @@ #include -class SQLITE_EXPORT Utf8StringVector : public QVector +class CLANGSUPPORT_EXPORT Utf8StringVector : public QVector { public: Utf8StringVector(); @@ -100,6 +100,6 @@ inline QDataStream &operator<<(QDataStream &s, const Utf8StringVector &v) inline QDataStream &operator>>(QDataStream &s, Utf8StringVector &v) { return s >> static_cast &>(v); } -SQLITE_EXPORT QDebug operator<<(QDebug debug, const Utf8StringVector &textVector); +CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const Utf8StringVector &textVector); Q_DECLARE_METATYPE(Utf8StringVector) diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt index 413ecba005b..236d35b4c96 100644 --- a/src/libs/sqlite/CMakeLists.txt +++ b/src/libs/sqlite/CMakeLists.txt @@ -37,8 +37,6 @@ add_qtc_library(Sqlite sqlstatementbuilder.cpp sqlstatementbuilder.h sqlstatementbuilderexception.h tableconstraints.h - utf8string.cpp utf8string.h - utf8stringvector.cpp utf8stringvector.h sqliteblob.h sqlitetimestamp.h sqlitelibraryinitializer.cpp sqlitelibraryinitializer.h diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri index db797b806ea..b7cf42a331f 100644 --- a/src/libs/sqlite/sqlite-lib.pri +++ b/src/libs/sqlite/sqlite-lib.pri @@ -18,8 +18,6 @@ SOURCES += \ $$PWD/sqlitesessionchangeset.cpp \ $$PWD/sqlitesessions.cpp \ $$PWD/sqlstatementbuilder.cpp \ - $$PWD/utf8string.cpp \ - $$PWD/utf8stringvector.cpp \ $$PWD/sqlitedatabase.cpp \ $$PWD/sqlitebasestatement.cpp HEADERS += \ @@ -44,8 +42,6 @@ HEADERS += \ $$PWD/sqlitewritestatement.h \ $$PWD/sqlstatementbuilder.h \ $$PWD/sqlstatementbuilderexception.h \ - $$PWD/utf8string.h \ - $$PWD/utf8stringvector.h \ $$PWD/sqlitedatabase.h \ $$PWD/sqlitetable.h \ $$PWD/sqlitecolumn.h \ diff --git a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h index 09ad15e30f2..abb5609b0d3 100644 --- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h +++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h @@ -27,7 +27,7 @@ #include -#include +#include #include diff --git a/src/tools/clangbackend/source/sourcelocation.cpp b/src/tools/clangbackend/source/sourcelocation.cpp index 108173bf949..ad52667dd69 100644 --- a/src/tools/clangbackend/source/sourcelocation.cpp +++ b/src/tools/clangbackend/source/sourcelocation.cpp @@ -31,7 +31,7 @@ #include -#include +#include #include diff --git a/src/tools/clangbackend/source/tokeninfo.h b/src/tools/clangbackend/source/tokeninfo.h index f4d7b903fd5..8aa868e05d7 100644 --- a/src/tools/clangbackend/source/tokeninfo.h +++ b/src/tools/clangbackend/source/tokeninfo.h @@ -30,7 +30,7 @@ #include -#include +#include #include