diff options
Diffstat (limited to 'src/plugins/texteditor/generichighlighter')
10 files changed, 53 insertions, 68 deletions
diff --git a/src/plugins/texteditor/generichighlighter/context.cpp b/src/plugins/texteditor/generichighlighter/context.cpp index 10875c8e8c6..59681af6ec5 100644 --- a/src/plugins/texteditor/generichighlighter/context.cpp +++ b/src/plugins/texteditor/generichighlighter/context.cpp @@ -54,8 +54,7 @@ const Context &Context::operator=(Context copy) return *this; } -Context::~Context() -{} +Context::~Context() = default; void Context::swap(Context &context) { diff --git a/src/plugins/texteditor/generichighlighter/dynamicrule.cpp b/src/plugins/texteditor/generichighlighter/dynamicrule.cpp index 9dcaf359be7..abb4b73faa6 100644 --- a/src/plugins/texteditor/generichighlighter/dynamicrule.cpp +++ b/src/plugins/texteditor/generichighlighter/dynamicrule.cpp @@ -32,8 +32,7 @@ using namespace Internal; DynamicRule::DynamicRule() : m_active(false) {} -DynamicRule::~DynamicRule() -{} +DynamicRule::~DynamicRule() = default; void DynamicRule::setActive(const QString &active) { m_active = toBool(active); } diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp index 42c87727b5e..66e3cb2712d 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinition.cpp @@ -76,13 +76,12 @@ HighlightDefinition::HighlightDefinition() : m_singleLineCommentAfterWhiteSpaces(false), m_indentationBasedFolding(false) { - QString s(QLatin1String(".():!+,-<=>%&/;?[]^{|}~\\*, \t")); - foreach (const QChar &c, s) + const QString s(QLatin1String(".():!+,-<=>%&/;?[]^{|}~\\*, \t")); + for (auto &c : s) m_delimiters.insert(c); } -HighlightDefinition::~HighlightDefinition() -{} +HighlightDefinition::~HighlightDefinition() = default; bool HighlightDefinition::isValid() const { @@ -169,15 +168,15 @@ const QString &HighlightDefinition::multiLineCommentRegion() const void HighlightDefinition::removeDelimiters(const QString &characters) { - for (int i = 0; i < characters.length(); ++i) - m_delimiters.remove(characters.at(i)); + for (QChar character : characters) + m_delimiters.remove(character); } void HighlightDefinition::addDelimiters(const QString &characters) { - for (int i = 0; i < characters.length(); ++i) { - if (!m_delimiters.contains(characters.at(i))) - m_delimiters.insert(characters.at(i)); + for (QChar character : characters) { + if (!m_delimiters.contains(character)) + m_delimiters.insert(character); } } diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp index 76c55f7cab2..56b16264147 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.cpp @@ -113,8 +113,7 @@ HighlightDefinitionHandler(const QSharedPointer<HighlightDefinition> &definition m_initialContext(true) {} -HighlightDefinitionHandler::~HighlightDefinitionHandler() -{} +HighlightDefinitionHandler::~HighlightDefinitionHandler() = default; bool HighlightDefinitionHandler::startDocument() { diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h index d6baff3d39f..f201d3c189b 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h @@ -35,10 +35,10 @@ namespace Internal { class HighlightDefinitionMetaData { public: - HighlightDefinitionMetaData() : priority(0) {} + HighlightDefinitionMetaData() = default; public: - int priority; + int priority = 0; QString id; QString name; QString version; @@ -48,7 +48,7 @@ public: QUrl url; }; -typedef QSharedPointer<HighlightDefinitionMetaData> DefinitionMetaDataPtr; +using DefinitionMetaDataPtr = QSharedPointer<HighlightDefinitionMetaData>; } // namespace Internal } // namespace TextEditor diff --git a/src/plugins/texteditor/generichighlighter/highlighter.cpp b/src/plugins/texteditor/generichighlighter/highlighter.cpp index e4d07adef91..8ea7dbbda3c 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.cpp +++ b/src/plugins/texteditor/generichighlighter/highlighter.cpp @@ -56,17 +56,11 @@ namespace { class HighlighterCodeFormatterData : public CodeFormatterData { public: - HighlighterCodeFormatterData() : - m_foldingIndentDelta(0), - m_originalObservableState(-1), - m_continueObservableState(-1) - {} - - ~HighlighterCodeFormatterData() override {} - int m_foldingIndentDelta; - int m_originalObservableState; + ~HighlighterCodeFormatterData() override = default; + int m_foldingIndentDelta = 0; + int m_originalObservableState = -1; QStack<QString> m_foldingRegions; - int m_continueObservableState; + int m_continueObservableState = -1; }; HighlighterCodeFormatterData *formatterData(const QTextBlock &block) @@ -132,8 +126,7 @@ Highlighter::Highlighter(QTextDocument *parent) : setTextFormatCategories(TextFormatIdCount, styleForFormat); } -Highlighter::~Highlighter() -{} +Highlighter::~Highlighter() = default; // Mapping from Kate format strings to format ids. struct KateFormatMap @@ -344,7 +337,7 @@ void Highlighter::iterateThroughRules(const QString &text, } } - typedef QList<QSharedPointer<Rule> >::const_iterator RuleIterator; + using RuleIterator = QList<QSharedPointer<Rule> >::const_iterator; bool contextChanged = false; bool atLeastOneMatch = false; @@ -639,8 +632,8 @@ void Highlighter::mapLeadingSequence(const QString &contextSequence) void Highlighter::pushContextSequence(int state) { const QVector<QSharedPointer<Context> > &contexts = m_persistentContexts.value(state); - for (int i = 0; i < contexts.size(); ++i) - m_contexts.push_back(contexts.at(i)); + for (const auto &context : contexts) + m_contexts.push_back(context); } QString Highlighter::currentContextSequence() const diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp index 42e9ca3c26d..f0a00d3bc83 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp +++ b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp @@ -45,20 +45,19 @@ QString findFallbackDefinitionsLocation() dir.setNameFilters(QStringList(QLatin1String("*.xml"))); if (Utils::HostOsInfo::isAnyUnixHost() && !Utils::HostOsInfo::isMacHost()) { - static const QLatin1String kateSyntax[] = { + static const QLatin1String kateSyntaxPaths[] = { QLatin1String("/share/apps/katepart/syntax"), QLatin1String("/share/kde4/apps/katepart/syntax") }; - static const int kateSyntaxCount = - sizeof(kateSyntax) / sizeof(kateSyntax[0]); // Some wild guesses. - for (int i = 0; i < kateSyntaxCount; ++i) { - QStringList paths; - paths << QLatin1String("/usr") + kateSyntax[i] - << QLatin1String("/usr/local") + kateSyntax[i] - << QLatin1String("/opt") + kateSyntax[i]; - foreach (const QString &path, paths) { + for (const auto &kateSyntaxPath : kateSyntaxPaths) { + const QStringList paths = { + QLatin1String("/usr") + kateSyntaxPath, + QLatin1String("/usr/local") + kateSyntaxPath, + QLatin1String("/opt") + kateSyntaxPath + }; + for (const auto &path : paths) { dir.setPath(path); if (dir.exists() && !dir.entryInfoList().isEmpty()) return dir.path(); @@ -66,9 +65,8 @@ QString findFallbackDefinitionsLocation() } // Try kde-config. - QStringList programs; - programs << QLatin1String("kde-config") << QLatin1String("kde4-config"); - foreach (const QString &program, programs) { + const QStringList programs = {QLatin1String("kde-config"), QLatin1String("kde4-config")}; + for (auto &program : programs) { Utils::SynchronousProcess process; process.setTimeoutS(5); Utils::SynchronousProcessResponse response @@ -76,8 +74,8 @@ QString findFallbackDefinitionsLocation() if (response.result == Utils::SynchronousProcessResponse::Finished) { QString output = response.stdOut(); output.remove(QLatin1Char('\n')); - for (int i = 0; i < kateSyntaxCount; ++i) { - dir.setPath(output + kateSyntax[i]); + for (auto &kateSyntaxPath : kateSyntaxPaths) { + dir.setPath(output + kateSyntaxPath); if (dir.exists() && !dir.entryInfoList().isEmpty()) return dir.path(); } @@ -189,7 +187,7 @@ void HighlighterSettings::assignDefaultDefinitionsPath() bool HighlighterSettings::isIgnoredFilePattern(const QString &fileName) const { - foreach (QRegExp regExp, m_ignoredFiles) + for (auto ®Exp : m_ignoredFiles) if (regExp.indexIn(fileName) != -1) return true; @@ -210,8 +208,8 @@ void HighlighterSettings::setExpressionsFromList(const QStringList &patterns) QRegExp regExp; regExp.setCaseSensitivity(Qt::CaseInsensitive); regExp.setPatternSyntax(QRegExp::Wildcard); - foreach (const QString &s, patterns) { - regExp.setPattern(s); + for (auto &pattern : patterns) { + regExp.setPattern(pattern); m_ignoredFiles.append(regExp); } } diff --git a/src/plugins/texteditor/generichighlighter/rule.cpp b/src/plugins/texteditor/generichighlighter/rule.cpp index 701c6ac4598..24e16267a2f 100644 --- a/src/plugins/texteditor/generichighlighter/rule.cpp +++ b/src/plugins/texteditor/generichighlighter/rule.cpp @@ -58,8 +58,7 @@ Rule::Rule(bool consumesNonSpace) : m_lookAhead(false), m_firstNonSpace(false), m_column(-1), m_consumesNonSpace(consumesNonSpace) {} -Rule::~Rule() -{} +Rule::~Rule() = default; void Rule::setContext(const QString &context) { m_context = context; } diff --git a/src/plugins/texteditor/generichighlighter/specificrules.cpp b/src/plugins/texteditor/generichighlighter/specificrules.cpp index 0963f621159..1c52986b0c2 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.cpp +++ b/src/plugins/texteditor/generichighlighter/specificrules.cpp @@ -278,8 +278,7 @@ KeywordRule::KeywordRule(const QSharedPointer<HighlightDefinition> &definition) setDefinition(definition); } -KeywordRule::~KeywordRule() -{} +KeywordRule::~KeywordRule() = default; void KeywordRule::setInsensitive(const QString &insensitive) { diff --git a/src/plugins/texteditor/generichighlighter/specificrules.h b/src/plugins/texteditor/generichighlighter/specificrules.h index aa9178a5962..00c9cea816a 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.h +++ b/src/plugins/texteditor/generichighlighter/specificrules.h @@ -42,7 +42,7 @@ class HighlightDefinition; class DetectCharRule : public DynamicRule { public: - ~DetectCharRule() override {} + ~DetectCharRule() override = default; void setChar(const QString &character); @@ -57,7 +57,7 @@ private: class Detect2CharsRule : public DynamicRule { public: - ~Detect2CharsRule() override {} + ~Detect2CharsRule() override = default; void setChar(const QString &character); void setChar1(const QString &character); @@ -74,7 +74,7 @@ private: class AnyCharRule : public Rule { public: - ~AnyCharRule() override {} + ~AnyCharRule() override = default; void setCharacterSet(const QString &s); @@ -88,7 +88,7 @@ private: class StringDetectRule : public DynamicRule { public: - ~StringDetectRule() override {} + ~StringDetectRule() override = default; void setString(const QString &s); void setInsensitive(const QString &insensitive); @@ -157,7 +157,7 @@ private: class IntRule : public Rule { public: - ~IntRule() override {} + ~IntRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; @@ -167,7 +167,7 @@ private: class FloatRule : public Rule { public: - ~FloatRule() override {} + ~FloatRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; @@ -177,7 +177,7 @@ private: class HlCOctRule : public Rule { public: - ~HlCOctRule() override {} + ~HlCOctRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; @@ -187,7 +187,7 @@ private: class HlCHexRule : public Rule { public: - ~HlCHexRule() override {} + ~HlCHexRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; @@ -197,7 +197,7 @@ private: class HlCStringCharRule : public Rule { public: - ~HlCStringCharRule() override {} + ~HlCStringCharRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; @@ -207,7 +207,7 @@ private: class HlCCharRule : public Rule { public: - ~HlCCharRule() override {} + ~HlCCharRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; @@ -217,7 +217,7 @@ private: class RangeDetectRule : public Rule { public: - ~RangeDetectRule() override {} + ~RangeDetectRule() override = default; void setChar(const QString &character); void setChar1(const QString &character); @@ -233,7 +233,7 @@ private: class LineContinueRule : public Rule { public: - ~LineContinueRule() override {} + ~LineContinueRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; @@ -244,7 +244,7 @@ class DetectSpacesRule : public Rule { public: DetectSpacesRule(); - ~DetectSpacesRule() override {} + ~DetectSpacesRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; @@ -254,7 +254,7 @@ private: class DetectIdentifierRule : public Rule { public: - ~DetectIdentifierRule() override {} + ~DetectIdentifierRule() override = default; private: bool doMatchSucceed(const QString &text, const int length, ProgressData *progress) override; |