diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -59,3 +59,4 @@ # set PIC to allow use in static and shared libs set_property(TARGET SyntaxHighlightingData PROPERTY POSITION_INDEPENDENT_CODE 1) +target_link_libraries(SyntaxHighlightingData PRIVATE Qt5::Core) diff --git a/src/lib/abstracthighlighter.h b/src/lib/abstracthighlighter.h --- a/src/lib/abstracthighlighter.h +++ b/src/lib/abstracthighlighter.h @@ -30,7 +30,9 @@ #include +QT_BEGIN_NAMESPACE class QString; +QT_END_NAMESPACE namespace KSyntaxHighlighting { @@ -186,6 +188,8 @@ }; } +QT_BEGIN_NAMESPACE Q_DECLARE_INTERFACE(KSyntaxHighlighting::AbstractHighlighter, "org.kde.SyntaxHighlighting.AbstractHighlighter") +QT_END_NAMESPACE #endif // KSYNTAXHIGHLIGHTING_ABSTRACTHIGHLIGHTERM_H diff --git a/src/lib/abstracthighlighter_p.h b/src/lib/abstracthighlighter_p.h --- a/src/lib/abstracthighlighter_p.h +++ b/src/lib/abstracthighlighter_p.h @@ -27,7 +27,9 @@ #include "definition.h" #include "theme.h" +QT_BEGIN_NAMESPACE class QStringList; +QT_END_NAMESPACE namespace KSyntaxHighlighting { diff --git a/src/lib/context_p.h b/src/lib/context_p.h --- a/src/lib/context_p.h +++ b/src/lib/context_p.h @@ -34,7 +34,9 @@ #include +QT_BEGIN_NAMESPACE class QXmlStreamReader; +QT_END_NAMESPACE namespace KSyntaxHighlighting { diff --git a/src/lib/definition.h b/src/lib/definition.h --- a/src/lib/definition.h +++ b/src/lib/definition.h @@ -31,10 +31,12 @@ #include +QT_BEGIN_NAMESPACE class QChar; class QString; class QStringList; template class QVector; +QT_END_NAMESPACE namespace KSyntaxHighlighting { @@ -391,6 +393,8 @@ } +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(KSyntaxHighlighting::Definition, Q_MOVABLE_TYPE); +QT_END_NAMESPACE #endif diff --git a/src/lib/foldingregion.h b/src/lib/foldingregion.h --- a/src/lib/foldingregion.h +++ b/src/lib/foldingregion.h @@ -101,6 +101,8 @@ } +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(KSyntaxHighlighting::FoldingRegion, Q_PRIMITIVE_TYPE); +QT_END_NAMESPACE #endif diff --git a/src/lib/format.h b/src/lib/format.h --- a/src/lib/format.h +++ b/src/lib/format.h @@ -30,10 +30,11 @@ #include #include - +QT_BEGIN_NAMESPACE class QColor; class QString; class QXmlStreamReader; +QT_END_NAMESPACE namespace KSyntaxHighlighting { @@ -144,6 +145,8 @@ }; } +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(KSyntaxHighlighting::Format, Q_MOVABLE_TYPE); +QT_END_NAMESPACE #endif // KSYNTAXHIGHLIGHTING_FORMAT_H diff --git a/src/lib/htmlhighlighter.h b/src/lib/htmlhighlighter.h --- a/src/lib/htmlhighlighter.h +++ b/src/lib/htmlhighlighter.h @@ -32,8 +32,10 @@ #include +QT_BEGIN_NAMESPACE class QFile; class QTextStream; +QT_END_NAMESPACE namespace KSyntaxHighlighting { diff --git a/src/lib/keywordlist_p.h b/src/lib/keywordlist_p.h --- a/src/lib/keywordlist_p.h +++ b/src/lib/keywordlist_p.h @@ -30,7 +30,9 @@ #include +QT_BEGIN_NAMESPACE class QXmlStreamReader; +QT_END_NAMESPACE namespace KSyntaxHighlighting { diff --git a/src/lib/repository.h b/src/lib/repository.h --- a/src/lib/repository.h +++ b/src/lib/repository.h @@ -29,8 +29,10 @@ #include #include +QT_BEGIN_NAMESPACE class QString; template class QVector; +QT_END_NAMESPACE /** * @namespace KSyntaxHighlighting diff --git a/src/lib/repository_p.h b/src/lib/repository_p.h --- a/src/lib/repository_p.h +++ b/src/lib/repository_p.h @@ -27,7 +27,9 @@ #include #include +QT_BEGIN_NAMESPACE class QString; +QT_END_NAMESPACE namespace KSyntaxHighlighting { diff --git a/src/lib/rule_p.h b/src/lib/rule_p.h --- a/src/lib/rule_p.h +++ b/src/lib/rule_p.h @@ -38,7 +38,9 @@ #include +QT_BEGIN_NAMESPACE class QXmlStreamReader; +QT_END_NAMESPACE namespace KSyntaxHighlighting { diff --git a/src/lib/state.h b/src/lib/state.h --- a/src/lib/state.h +++ b/src/lib/state.h @@ -79,6 +79,8 @@ } +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(KSyntaxHighlighting::State, Q_MOVABLE_TYPE); +QT_END_NAMESPACE #endif // KSYNTAXHIGHLIGHTING_STATE_H diff --git a/src/lib/theme.h b/src/lib/theme.h --- a/src/lib/theme.h +++ b/src/lib/theme.h @@ -371,6 +371,8 @@ } +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(KSyntaxHighlighting::Theme, Q_MOVABLE_TYPE); +QT_END_NAMESPACE #endif // KSYNTAXHIGHLIGHTING_THEME_H diff --git a/src/lib/themedata_p.h b/src/lib/themedata_p.h --- a/src/lib/themedata_p.h +++ b/src/lib/themedata_p.h @@ -163,6 +163,8 @@ } +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(KSyntaxHighlighting::TextStyleData, Q_MOVABLE_TYPE); +QT_END_NAMESPACE #endif // KSYNTAXHIGHLIGHTING_THEMEDATA_P_H diff --git a/src/lib/wildcardmatcher.cpp b/src/lib/wildcardmatcher.cpp --- a/src/lib/wildcardmatcher.cpp +++ b/src/lib/wildcardmatcher.cpp @@ -79,5 +79,5 @@ bool WildcardMatcher::exactMatch(const QString &candidate, const QString &wildcard, bool caseSensitive) { - return exactMatch(candidate, wildcard, candidate.length() - 1, wildcard.length() - 1, caseSensitive); + return ::exactMatch(candidate, wildcard, candidate.length() - 1, wildcard.length() - 1, caseSensitive); } diff --git a/src/lib/wildcardmatcher_p.h b/src/lib/wildcardmatcher_p.h --- a/src/lib/wildcardmatcher_p.h +++ b/src/lib/wildcardmatcher_p.h @@ -24,7 +24,11 @@ #ifndef KSYNTAXHIGHLIGHTING_WILDCARDMATCHER_P_H #define KSYNTAXHIGHLIGHTING_WILDCARDMATCHER_P_H +#include + +QT_BEGIN_NAMESPACE class QString; +QT_END_NAMESPACE namespace KSyntaxHighlighting {