Modernize variable declarations

Use 'const' and 'auto' keywords more where static_cast is used.

Change-Id: I60152b90fe5e44aa1ca513b43f133e604ed6417f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp
index 739b863de..f03156fb5 100644
--- a/src/plugins/scanner/cpp/cppscanner.cpp
+++ b/src/plugins/scanner/cpp/cppscanner.cpp
@@ -143,7 +143,7 @@ static void scanCppFile(void *opaq, CPlusPlus::Lexer &yylex, bool scanForFileTag
     const QLatin1Literal qgadgetLiteral("Q_GADGET");
     const QLatin1Literal qnamespaceLiteral("Q_NAMESPACE");
     const QLatin1Literal pluginMetaDataLiteral("Q_PLUGIN_METADATA");
-    Opaq *opaque = static_cast<Opaq *>(opaq);
+    const auto opaque = static_cast<Opaq *>(opaq);
     const TokenComparator tc(opaque->fileContent);
     Token tk;
     Token oldTk;
@@ -255,13 +255,13 @@ static void *openScanner(const unsigned short *filePath, const char *fileTags, i
 
 static void closeScanner(void *ptr)
 {
-    Opaq *opaque = static_cast<Opaq *>(ptr);
+    const auto opaque = static_cast<Opaq *>(ptr);
     delete opaque;
 }
 
 static const char *next(void *opaq, int *size, int *flags)
 {
-    Opaq *opaque = static_cast<Opaq*>(opaq);
+    const auto opaque = static_cast<Opaq*>(opaq);
     if (opaque->currentResultIndex < opaque->includedFiles.size()) {
         const ScanResult &result = opaque->includedFiles.at(opaque->currentResultIndex);
         ++opaque->currentResultIndex;
@@ -281,7 +281,7 @@ static const char **additionalFileTags(void *opaq, int *size)
     static const char *thMocPluginHpp[] = { "moc_hpp_plugin" };
     static const char *thMocPluginCpp[] = { "moc_cpp_plugin" };
 
-    Opaq *opaque = static_cast<Opaq*>(opaq);
+    const auto opaque = static_cast<const Opaq*>(opaq);
     if (opaque->hasQObjectMacro) {
         *size = 1;
         switch (opaque->fileType) {
diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp
index 10947e61c..5a790efc1 100644
--- a/src/plugins/scanner/qt/qtscanner.cpp
+++ b/src/plugins/scanner/qt/qtscanner.cpp
@@ -142,13 +142,13 @@ static void *openScannerQrc(const unsigned short *filePath, const char *fileTags
 
 static void closeScannerQrc(void *ptr)
 {
-    OpaqQrc *opaque = static_cast<OpaqQrc *>(ptr);
+    const auto opaque = static_cast<OpaqQrc *>(ptr);
     delete opaque;
 }
 
 static const char *nextQrc(void *opaq, int *size, int *flags)
 {
-    OpaqQrc *o= static_cast<OpaqQrc *>(opaq);
+    const auto o = static_cast<OpaqQrc *>(opaq);
     while (!o->xml->atEnd()) {
         o->xml->readNext();
         switch (o->xml->tokenType()) {