From b9df65a6c9c73a1a1faf8ec5c122802d54f2c622 Mon Sep 17 00:00:00 2001 From: SR_team Date: Mon, 28 Mar 2022 15:12:09 +0300 Subject: [PATCH] Update includes compat with KF5.92 on some distributions (#2912) With KF5.92 headers KSyntaxHighlighting/{header}.h copied to KSyntaxHighlighting/ksyntaxhighlighting/{header}.h. Headers KSyntaxHighlighting/{Header} now include ksyntaxhighlighting/{header}.h instead of {header}.h. Than on some distros like ArchLinux headers KSyntaxHighlighting/{header}.h removed, because it copies of KSyntaxHighlighting/ksyntaxhighlighting/{header}.h and because KSyntaxHighlighting/{Header} now include ksyntaxhighlighting/{header}.h. --- src/common/Configuration.cpp | 6 +++--- src/common/SyntaxHighlighter.cpp | 2 +- src/common/SyntaxHighlighter.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp index cc8690b4..0a73eb34 100644 --- a/src/common/Configuration.cpp +++ b/src/common/Configuration.cpp @@ -7,9 +7,9 @@ #include #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING -# include -# include -# include +# include +# include +# include #endif #include "common/ColorThemeWorker.h" diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp index 64a2038e..b15afc63 100644 --- a/src/common/SyntaxHighlighter.cpp +++ b/src/common/SyntaxHighlighter.cpp @@ -5,7 +5,7 @@ # include "Configuration.h" -# include +# include SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document) : KSyntaxHighlighting::SyntaxHighlighter(document) diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h index b9e88970..7846c227 100644 --- a/src/common/SyntaxHighlighter.h +++ b/src/common/SyntaxHighlighter.h @@ -10,7 +10,7 @@ #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING -# include +# include class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter {