diff options
author | hjk <hjk@qt.io> | 2019-07-22 14:57:53 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-07-22 14:27:37 +0000 |
commit | 93669a133944551c852dd5ef4e4dbca0a3946e8a (patch) | |
tree | 29aa0e5b61d190c1f1c4115aeacd1eea3ae4c045 | |
parent | 16a84ff85a5b440757962ad481335b60c5cdf44e (diff) |
Avoid some deprecation warnings for QLatin1Literal uses
Change-Id: I8fe64c2ab78b1cf2e1af2a6aa2dad201299a0a94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/scanner/cpp/cppscanner.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index 067127d00..cbab8a012 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -126,7 +126,7 @@ public: { } - bool equals(const Token &tk, const QLatin1Literal &literal) const + bool equals(const Token &tk, const QLatin1String &literal) const { return static_cast<int>(tk.length()) == literal.size() && memcmp(m_fileContent + tk.begin(), literal.data(), literal.size()) == 0; @@ -136,13 +136,13 @@ public: static void scanCppFile(void *opaq, CPlusPlus::Lexer &yylex, bool scanForFileTags, bool scanForDependencies) { - const QLatin1Literal includeLiteral("include"); - const QLatin1Literal importLiteral("import"); - const QLatin1Literal defineLiteral("define"); - const QLatin1Literal qobjectLiteral("Q_OBJECT"); - const QLatin1Literal qgadgetLiteral("Q_GADGET"); - const QLatin1Literal qnamespaceLiteral("Q_NAMESPACE"); - const QLatin1Literal pluginMetaDataLiteral("Q_PLUGIN_METADATA"); + const QLatin1String includeLiteral("include"); + const QLatin1String importLiteral("import"); + const QLatin1String defineLiteral("define"); + const QLatin1String qobjectLiteral("Q_OBJECT"); + const QLatin1String qgadgetLiteral("Q_GADGET"); + const QLatin1String qnamespaceLiteral("Q_NAMESPACE"); + const QLatin1String pluginMetaDataLiteral("Q_PLUGIN_METADATA"); const auto opaque = static_cast<Opaq *>(opaq); const TokenComparator tc(opaque->fileContent); Token tk; |