Clean up dependency scanner classes.

- Make implementations of base class virtuals private.
- Remove redundant "virtual" keywords.
- Remove unused members.
- More const-correctness.

Change-Id: I9b4134102415610ecaf6fa20dc13d519dc3e74c6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 6 insertions, 19 deletions

diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp
index 4cee86b47..6442d881f 100644
--- a/src/lib/corelib/buildgraph/depscanner.cpp
+++ b/src/lib/corelib/buildgraph/depscanner.cpp
@@ -67,7 +67,6 @@ static void collectCppIncludePaths(const QVariantMap &modules, QSet<QString> *co
 PluginDependencyScanner::PluginDependencyScanner(ScannerPlugin *plugin)
     : m_plugin(plugin)
 {
-    m_fileTag += FileTag(plugin->fileTag);
 }
 
 QStringList PluginDependencyScanner::collectSearchPaths(Artifact *artifact)
@@ -110,17 +109,12 @@ QStringList PluginDependencyScanner::collectDependencies(FileResourceBase *file)
     return QStringList(result.toList());
 }
 
-const FileTags &PluginDependencyScanner::fileTags()
-{
-    return m_fileTag;
-}
-
-bool PluginDependencyScanner::recursive()
+bool PluginDependencyScanner::recursive() const
 {
     return m_plugin->flags & ScannerRecursiveDependencies;
 }
 
-void *PluginDependencyScanner::key()
+const void *PluginDependencyScanner::key() const
 {
     return m_plugin;
 }
@@ -131,7 +125,6 @@ UserDependencyScanner::UserDependencyScanner(const ResolvedScannerConstPtr &scan
       m_logger(logger),
       m_engine(engine),
       m_observer(engine),
-      m_project(0),
       m_product(0)
 {
     m_global = engine->newObject();
@@ -152,26 +145,20 @@ QStringList UserDependencyScanner::collectDependencies(FileResourceBase *file)
     return evaluate(artifact, m_scanner->scanScript);
 }
 
-const FileTags &UserDependencyScanner::fileTags()
-{
-    return m_scanner->inputs;
-}
-
-bool UserDependencyScanner::recursive()
+bool UserDependencyScanner::recursive() const
 {
     return m_scanner->recursive;
 }
 
-void *UserDependencyScanner::key()
+const void *UserDependencyScanner::key() const
 {
-    return const_cast<ResolvedScanner*>(m_scanner.data());
+    return m_scanner.data();
 }
 
 QStringList UserDependencyScanner::evaluate(Artifact *artifact, const ScriptFunctionPtr &script)
 {
-    if ((artifact->product.data() != m_product) || (artifact->product->project.data() != m_project)) {
+    if (artifact->product.data() != m_product) {
         m_product = artifact->product.data();
-        m_project = artifact->product->project.data();
         setupScriptEngineForProduct(m_engine, artifact->product,
                                     m_scanner->module, m_global, &m_observer);
     }