feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: shorten namespace noise

Browse Source 
Change-Id: I16bc218ccefb7234cb9c1299ee3022549b178600
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-02-06 10:51:37 +01:00
parent f4a45884ca
commit f75934f297
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/highlighter.cpp
View File

@@ -100,10 +100,10 @@ Highlighter::Highlighter()
&categoryForTextStyle); &categoryForTextStyle);
} }
KSyntaxHighlighting::Definition Highlighter::definitionForDocument(const TextDocument *document) Highlighter::Definition Highlighter::definitionForDocument(const TextDocument *document)
{ {
const Utils::MimeType mimeType = Utils::mimeTypeForName(document->mimeType()); const Utils::MimeType mimeType = Utils::mimeTypeForName(document->mimeType());
KSyntaxHighlighting::Definition definition; Definition definition;
if (mimeType.isValid()) if (mimeType.isValid())
definition = Highlighter::definitionForMimeType(mimeType.name()); definition = Highlighter::definitionForMimeType(mimeType.name());
if (!definition.isValid()) if (!definition.isValid())
@@ -111,12 +111,12 @@ KSyntaxHighlighting::Definition Highlighter::definitionForDocument(const TextDoc
return definition; return definition;
} }
KSyntaxHighlighting::Definition Highlighter::definitionForMimeType(const QString &mimeType) Highlighter::Definition Highlighter::definitionForMimeType(const QString &mimeType)
{ {
return highlightRepository()->definitionForMimeType(mimeType); return highlightRepository()->definitionForMimeType(mimeType);
} }
KSyntaxHighlighting::Definition Highlighter::definitionForFileName(const QString &fileName) Highlighter::Definition Highlighter::definitionForFileName(const QString &fileName)
{ {
return highlightRepository()->definitionForFileName(fileName); return highlightRepository()->definitionForFileName(fileName);
} }

7
src/plugins/texteditor/highlighter.h
View File

@@ -39,11 +39,12 @@ class TextDocument;
class Highlighter : public SyntaxHighlighter, public KSyntaxHighlighting::AbstractHighlighter class Highlighter : public SyntaxHighlighter, public KSyntaxHighlighting::AbstractHighlighter
{ {
public: public:
using Definition = KSyntaxHighlighting::Definition;
Highlighter(); Highlighter();
static KSyntaxHighlighting::Definition definitionForDocument(const TextDocument *document); static Definition definitionForDocument(const TextDocument *document);
static KSyntaxHighlighting::Definition definitionForMimeType(const QString &mimeType); static Definition definitionForMimeType(const QString &mimeType);
static KSyntaxHighlighting::Definition definitionForFileName(const QString &fileName); static Definition definitionForFileName(const QString &fileName);
static void addCustomHighlighterPath(const Utils::FileName &path); static void addCustomHighlighterPath(const Utils::FileName &path);
static void updateDefinitions(std::function<void()> callback = nullptr); static void updateDefinitions(std::function<void()> callback = nullptr);

3
src/plugins/texteditor/texteditor.cpp
View File

@@ -8499,8 +8499,7 @@ void TextEditorWidget::configureGenericHighlighter()
setCodeFoldingSupported(false); setCodeFoldingSupported(false);
const KSyntaxHighlighting::Definition definition = const Highlighter::Definition definition = Highlighter::definitionForDocument(textDocument());
Highlighter::definitionForDocument(textDocument());
if (definition.isValid()) { if (definition.isValid()) {
highlighter->setDefinition(definition); highlighter->setDefinition(definition);