diff options
Diffstat (limited to 'src/libs/3rdparty/syntax-highlighting/src/lib/keywordlist.cpp')
-rw-r--r-- | src/libs/3rdparty/syntax-highlighting/src/lib/keywordlist.cpp | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/keywordlist.cpp b/src/libs/3rdparty/syntax-highlighting/src/lib/keywordlist.cpp index 144ced2c00..7cbbaecacf 100644 --- a/src/libs/3rdparty/syntax-highlighting/src/lib/keywordlist.cpp +++ b/src/libs/3rdparty/syntax-highlighting/src/lib/keywordlist.cpp @@ -21,10 +21,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "keywordlist_p.h" -#include "repository.h" #include "definition_p.h" +#include "keywordlist_p.h" #include "ksyntaxhighlighting_logging.h" +#include "repository.h" #include <QXmlStreamReader> @@ -42,10 +42,10 @@ bool KeywordList::contains(const QStringRef &str, Qt::CaseSensitivity caseSensit /** * search with right predicate */ - return std::binary_search(vectorToSearch.begin(), vectorToSearch.end(), str, [caseSensitive] (const QStringRef &a, const QStringRef &b) { return a.compare(b, caseSensitive) < 0; }); + return std::binary_search(vectorToSearch.begin(), vectorToSearch.end(), str, [caseSensitive](const QStringRef &a, const QStringRef &b) { return a.compare(b, caseSensitive) < 0; }); } -void KeywordList::load(QXmlStreamReader& reader) +void KeywordList::load(QXmlStreamReader &reader) { Q_ASSERT(reader.name() == QLatin1String("list")); Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement); @@ -54,25 +54,24 @@ void KeywordList::load(QXmlStreamReader& reader) while (!reader.atEnd()) { switch (reader.tokenType()) { - case QXmlStreamReader::StartElement: - if (reader.name() == QLatin1String("item")) { - m_keywords.append(reader.readElementText().trimmed()); - reader.readNextStartElement(); - break; - } - else if (reader.name() == QLatin1String("include")) { - m_includes.append(reader.readElementText().trimmed()); - reader.readNextStartElement(); - break; - } - reader.readNext(); + case QXmlStreamReader::StartElement: + if (reader.name() == QLatin1String("item")) { + m_keywords.append(reader.readElementText().trimmed()); + reader.readNextStartElement(); break; - case QXmlStreamReader::EndElement: - reader.readNext(); - return; - default: - reader.readNext(); + } else if (reader.name() == QLatin1String("include")) { + m_includes.append(reader.readElementText().trimmed()); + reader.readNextStartElement(); break; + } + reader.readNext(); + break; + case QXmlStreamReader::EndElement: + reader.readNext(); + return; + default: + reader.readNext(); + break; } } } @@ -107,7 +106,7 @@ void KeywordList::initLookupForCaseSensitivity(Qt::CaseSensitivity caseSensitive /** * sort with right predicate */ - std::sort(vectorToSort.begin(), vectorToSort.end(), [caseSensitive] (const QStringRef &a, const QStringRef &b) { return a.compare(b, caseSensitive) < 0; }); + std::sort(vectorToSort.begin(), vectorToSort.end(), [caseSensitive](const QStringRef &a, const QStringRef &b) { return a.compare(b, caseSensitive) < 0; }); } void KeywordList::resolveIncludeKeywords(DefinitionData &def) @@ -127,8 +126,7 @@ void KeywordList::resolveIncludeKeywords(DefinitionData &def) auto defData = DefinitionData::get(includeDef); defData->load(DefinitionData::OnlyKeywords(true)); keywords = defData->keywordList(listName); - } - else { + } else { qCWarning(Log) << "Unable to resolve external include keyword for definition" << defName << "in" << def.name; } } else { @@ -140,8 +138,7 @@ void KeywordList::resolveIncludeKeywords(DefinitionData &def) keywords->resolveIncludeKeywords(def); } m_keywords += keywords->m_keywords; - } - else { + } else { qCWarning(Log) << "Unresolved include keyword" << kw_include << "in" << def.name; } } |