diff --git a/src/plugins/texteditor/highlighter.cpp b/src/plugins/texteditor/highlighter.cpp index 2471fd17a14..5c88110b8a6 100644 --- a/src/plugins/texteditor/highlighter.cpp +++ b/src/plugins/texteditor/highlighter.cpp @@ -100,10 +100,10 @@ Highlighter::Highlighter() &categoryForTextStyle); } -KSyntaxHighlighting::Definition Highlighter::definitionForDocument(const TextDocument *document) +Highlighter::Definition Highlighter::definitionForDocument(const TextDocument *document) { const Utils::MimeType mimeType = Utils::mimeTypeForName(document->mimeType()); - KSyntaxHighlighting::Definition definition; + Definition definition; if (mimeType.isValid()) definition = Highlighter::definitionForMimeType(mimeType.name()); if (!definition.isValid()) @@ -111,12 +111,12 @@ KSyntaxHighlighting::Definition Highlighter::definitionForDocument(const TextDoc return definition; } -KSyntaxHighlighting::Definition Highlighter::definitionForMimeType(const QString &mimeType) +Highlighter::Definition Highlighter::definitionForMimeType(const QString &mimeType) { return highlightRepository()->definitionForMimeType(mimeType); } -KSyntaxHighlighting::Definition Highlighter::definitionForFileName(const QString &fileName) +Highlighter::Definition Highlighter::definitionForFileName(const QString &fileName) { return highlightRepository()->definitionForFileName(fileName); } diff --git a/src/plugins/texteditor/highlighter.h b/src/plugins/texteditor/highlighter.h index f29da279e31..22fd23b26fe 100644 --- a/src/plugins/texteditor/highlighter.h +++ b/src/plugins/texteditor/highlighter.h @@ -39,11 +39,12 @@ class TextDocument; class Highlighter : public SyntaxHighlighter, public KSyntaxHighlighting::AbstractHighlighter { public: + using Definition = KSyntaxHighlighting::Definition; Highlighter(); - static KSyntaxHighlighting::Definition definitionForDocument(const TextDocument *document); - static KSyntaxHighlighting::Definition definitionForMimeType(const QString &mimeType); - static KSyntaxHighlighting::Definition definitionForFileName(const QString &fileName); + static Definition definitionForDocument(const TextDocument *document); + static Definition definitionForMimeType(const QString &mimeType); + static Definition definitionForFileName(const QString &fileName); static void addCustomHighlighterPath(const Utils::FileName &path); static void updateDefinitions(std::function callback = nullptr); diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 8e5aaacbad3..32b5267b12d 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -8499,8 +8499,7 @@ void TextEditorWidget::configureGenericHighlighter() setCodeFoldingSupported(false); - const KSyntaxHighlighting::Definition definition = - Highlighter::definitionForDocument(textDocument()); + const Highlighter::Definition definition = Highlighter::definitionForDocument(textDocument()); if (definition.isValid()) { highlighter->setDefinition(definition);