7 files changed, 1 insertions, 27 deletions
diff --git a/src/plugins/scanner/cpp/Lexer.cpp b/src/plugins/scanner/cpp/Lexer.cpp
index 6bad85c5c..6793080e9 100644
--- a/src/plugins/scanner/cpp/Lexer.cpp
+++ b/src/plugins/scanner/cpp/Lexer.cpp
@@ -69,8 +69,6 @@ Lexer::Lexer(const char *firstChar, const char *lastChar)
     setSource(firstChar, lastChar);
 }
 
-Lexer::~Lexer() = default;
-
 void Lexer::setSource(const char *firstChar, const char *lastChar)
 {
     _firstChar = firstChar;
@@ -566,7 +564,7 @@ void Lexer::scan_helper(Token *tok)
 
                 do {
                     yyinp();
-                    if (! (isalnum(_yychar) || _yychar == '_' || _yychar == '$'))
+                    if (!isalnum(_yychar) && _yychar != '_' && _yychar != '$')
                         break;
                 } while (_yychar);
 
diff --git a/src/plugins/scanner/cpp/Lexer.h b/src/plugins/scanner/cpp/Lexer.h
index 8f55f84e9..42f733dc5 100644
--- a/src/plugins/scanner/cpp/Lexer.h
+++ b/src/plugins/scanner/cpp/Lexer.h
@@ -79,7 +79,6 @@ public:
     };
 
     Lexer(const char *firstChar, const char *lastChar);
-    ~Lexer();
 
     bool qtMocRunEnabled() const;
     void setQtMocRunEnabled(bool onoff);
diff --git a/src/plugins/scanner/cpp/cpp.pri b/src/plugins/scanner/cpp/cpp.pri
deleted file mode 100644
index 515e65635..000000000
--- a/src/plugins/scanner/cpp/cpp.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = qbs_cpp_scanner
diff --git a/src/plugins/scanner/cpp/cpp.pro b/src/plugins/scanner/cpp/cpp.pro
deleted file mode 100644
index 12a6d7b6c..000000000
--- a/src/plugins/scanner/cpp/cpp.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-include(cpp.pri)
-include(../../plugins.pri)
-DEFINES += CPLUSPLUS_NO_PARSER
-
-QT = core
-
-HEADERS += CPlusPlusForwardDeclarations.h Lexer.h Token.h ../scanner.h \
-           cpp_global.h
-SOURCES += Lexer.cpp Token.cpp \
-    cppscanner.cpp
diff --git a/src/plugins/scanner/qt/qt.pri b/src/plugins/scanner/qt/qt.pri
deleted file mode 100644
index 71e3a8a45..000000000
--- a/src/plugins/scanner/qt/qt.pri
+++ /dev/null
@@ -1 +0,0 @@
-qbsPluginTarget = qbs_qt_scanner
diff --git a/src/plugins/scanner/qt/qt.pro b/src/plugins/scanner/qt/qt.pro
deleted file mode 100644
index f231ea9e2..000000000
--- a/src/plugins/scanner/qt/qt.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-include(qt.pri)
-include(../../plugins.pri)
-
-QT = core
-
-HEADERS += ../scanner.h
-SOURCES += \
-    qtscanner.cpp
diff --git a/src/plugins/scanner/scanner.pro b/src/plugins/scanner/scanner.pro
deleted file mode 100644
index 68acae7da..000000000
--- a/src/plugins/scanner/scanner.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = cpp qt
-