diff options
21 files changed, 26 insertions, 28 deletions
diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt index 032284a10a..aa3c0ec3da 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 c53974ce0c..4529b4fb62 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 6b76f784af..f2ca80ce55 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 864f44a6d0..3d49694884 100644 --- a/src/libs/clangsupport/clangsupportdebugutils.cpp +++ b/src/libs/clangsupport/clangsupportdebugutils.cpp @@ -27,7 +27,7 @@ #include "filecontainer.h" -#include <utf8string.h> +#include "utf8string.h" #include <QDir> #include <QLoggingCategory> diff --git a/src/libs/clangsupport/codecompletion.h b/src/libs/clangsupport/codecompletion.h index 4a97fe08c1..a8f0e142b2 100644 --- a/src/libs/clangsupport/codecompletion.h +++ b/src/libs/clangsupport/codecompletion.h @@ -29,7 +29,7 @@ #include "codecompletionchunk.h" #include "fixitcontainer.h" -#include <sqlite/utf8string.h> +#include "utf8string.h" #include <QDataStream> #include <QVector> diff --git a/src/libs/clangsupport/codecompletionchunk.h b/src/libs/clangsupport/codecompletionchunk.h index b1a0ba32e7..e04d3351af 100644 --- a/src/libs/clangsupport/codecompletionchunk.h +++ b/src/libs/clangsupport/codecompletionchunk.h @@ -27,7 +27,7 @@ #include "clangsupport_global.h" -#include <utf8string.h> +#include "utf8string.h" #include <QDataStream> #include <QVector> diff --git a/src/libs/clangsupport/filecontainer.h b/src/libs/clangsupport/filecontainer.h index 64180e2141..2c7eb08851 100644 --- a/src/libs/clangsupport/filecontainer.h +++ b/src/libs/clangsupport/filecontainer.h @@ -27,7 +27,7 @@ #include "clangsupport_global.h" -#include <utf8string.h> +#include "utf8string.h" #include <utf8stringvector.h> #include <QDataStream> diff --git a/src/libs/clangsupport/lineprefixer.h b/src/libs/clangsupport/lineprefixer.h index 58439875fa..010a5247ea 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 <QString> #include <QTextStream> -#include <utf8string.h> namespace ClangBackEnd { diff --git a/src/libs/clangsupport/requestcompletionsmessage.h b/src/libs/clangsupport/requestcompletionsmessage.h index fa9bd9aebb..90b492c0f3 100644 --- a/src/libs/clangsupport/requestcompletionsmessage.h +++ b/src/libs/clangsupport/requestcompletionsmessage.h @@ -27,7 +27,7 @@ #include "clangsupport_global.h" -#include <utf8string.h> +#include "utf8string.h" #include <QDataStream> diff --git a/src/libs/clangsupport/sourcelocationcontainer.h b/src/libs/clangsupport/sourcelocationcontainer.h index 1c205755b1..4f13488e21 100644 --- a/src/libs/clangsupport/sourcelocationcontainer.h +++ b/src/libs/clangsupport/sourcelocationcontainer.h @@ -27,7 +27,7 @@ #include "clangsupport_global.h" -#include <sqlite/utf8string.h> +#include "utf8string.h" namespace ClangBackEnd { diff --git a/src/libs/clangsupport/tokeninfocontainer.h b/src/libs/clangsupport/tokeninfocontainer.h index dc2f8ba252..004bdd3cb9 100644 --- a/src/libs/clangsupport/tokeninfocontainer.h +++ b/src/libs/clangsupport/tokeninfocontainer.h @@ -29,7 +29,7 @@ #include "sourcerangecontainer.h" -#include <sqlite/utf8string.h> +#include "utf8string.h" #include <QDataStream> diff --git a/src/libs/clangsupport/tooltipinfo.h b/src/libs/clangsupport/tooltipinfo.h index 31bf313ab1..3d443c5b64 100644 --- a/src/libs/clangsupport/tooltipinfo.h +++ b/src/libs/clangsupport/tooltipinfo.h @@ -25,7 +25,7 @@ #pragma once -#include <utf8string.h> +#include "utf8string.h" #include <utf8stringvector.h> #include <QVariant> diff --git a/src/libs/sqlite/utf8string.cpp b/src/libs/clangsupport/utf8string.cpp index ad7748cfa5..ad7748cfa5 100644 --- a/src/libs/sqlite/utf8string.cpp +++ b/src/libs/clangsupport/utf8string.cpp diff --git a/src/libs/sqlite/utf8string.h b/src/libs/clangsupport/utf8string.h index 28e77be487..ebd9aba0a6 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 <QByteArray> #include <QDataStream> @@ -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 index f892a173db..f892a173db 100644 --- a/src/libs/sqlite/utf8stringvector.cpp +++ b/src/libs/clangsupport/utf8stringvector.cpp diff --git a/src/libs/sqlite/utf8stringvector.h b/src/libs/clangsupport/utf8stringvector.h index fb0fb6469e..31c681ecb9 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 <QDataStream> @@ -33,7 +33,7 @@ #include <ostream> -class SQLITE_EXPORT Utf8StringVector : public QVector<Utf8String> +class CLANGSUPPORT_EXPORT Utf8StringVector : public QVector<Utf8String> { 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<QVector<Utf8String> &>(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 413ecba005..236d35b4c9 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 db797b806e..b7cf42a331 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 09ad15e30f..abb5609b0d 100644 --- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h +++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h @@ -27,7 +27,7 @@ #include <clangsupport/codecompletion.h> -#include <sqlite/utf8string.h> +#include <clangsupport/utf8string.h> #include <QString> diff --git a/src/tools/clangbackend/source/sourcelocation.cpp b/src/tools/clangbackend/source/sourcelocation.cpp index 108173bf94..ad52667dd6 100644 --- a/src/tools/clangbackend/source/sourcelocation.cpp +++ b/src/tools/clangbackend/source/sourcelocation.cpp @@ -31,7 +31,7 @@ #include <clangsupport/sourcelocationcontainer.h> -#include <sqlite/utf8string.h> +#include <clangsupport/utf8string.h> #include <utils/textutils.h> diff --git a/src/tools/clangbackend/source/tokeninfo.h b/src/tools/clangbackend/source/tokeninfo.h index f4d7b903fd..8aa868e05d 100644 --- a/src/tools/clangbackend/source/tokeninfo.h +++ b/src/tools/clangbackend/source/tokeninfo.h @@ -30,7 +30,7 @@ #include <clangsupport/tokeninfocontainer.h> -#include <sqlite/utf8string.h> +#include <clangsupport/utf8string.h> #include <clang-c/Index.h> |