fix cppscanner file type passing

Without the proper file type, Q_PLUGIN_METADATA wasn't found anymore.

Change-Id: I9f753422fd8fd388f9e8c5a4ba1d49543dc45382
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp
index 0aa774561..97377ef30 100644
--- a/src/plugins/scanner/cpp/cppscanner.cpp
+++ b/src/plugins/scanner/cpp/cppscanner.cpp
@@ -164,10 +164,11 @@ static void scanCppFile(void *opaq, Lexer &yylex, bool scanForFileTags, bool sca
     }
 }
 
-static Opaq *openScanner(const unsigned short *filePath, int flags)
+static Opaq *openScanner(const unsigned short *filePath, Opaq::FileType fileType, int flags)
 {
     QScopedPointer<Opaq> opaque(new Opaq);
     opaque->fileName = QString::fromUtf16(filePath);
+    opaque->fileType = fileType;
 
     size_t mapl = 0;
 #ifdef Q_OS_UNIX
@@ -209,10 +210,7 @@ static Opaq *openScanner(const unsigned short *filePath, int flags)
 template <typename Opaq::FileType t>
 static void *openScannerT(const unsigned short *filePath, int flags)
 {
-    Opaq *opaq = openScanner(filePath, flags);
-    if (opaq)
-        opaq->fileType = t;
-    return opaq;
+    return openScanner(filePath, t, flags);
 }
 
 static void closeScanner(void *ptr)