Clean up module item caches.

The product- and project-specific ones were left-overs from earlier
concepts, so get rid of them. Everything goes into the same "global"
cache now. Also make sure that we cache disabled modules too; the
respective files were always re-read from disk so far.

Change-Id: Ib1dee08dbbfe61b0369772df96122e8eab19741b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/lib/corelib/language/moduleloader.h b/src/lib/corelib/language/moduleloader.h
index 67bfa1e07..07e0ab24f 100644
--- a/src/lib/corelib/language/moduleloader.h
+++ b/src/lib/corelib/language/moduleloader.h
@@ -106,7 +106,14 @@ public:
     static QString fullModuleName(const QStringList &moduleName);
 
 private:
-    typedef QMap<QPair<QString, QString>, Item *> ModuleItemCache;
+    struct ItemCacheValue {
+        explicit ItemCacheValue(Item *module = 0, bool enabled = false)
+            : module(module), enabled(enabled) {}
+        Item *module;
+        bool enabled;
+    };
+
+    typedef QMap<QPair<QString, QString>, ItemCacheValue> ModuleItemCache;
 
     class ContextBase
     {
@@ -118,7 +125,6 @@ private:
         Item *item;
         Item *scope;
         QStringList extraSearchPaths;
-        ModuleItemCache moduleItemCache;
     };
 
     class ProjectContext : public ContextBase
@@ -204,7 +210,7 @@ private:
     Evaluator *m_evaluator;
     QStringList m_moduleSearchPaths;
     QMap<QString, QStringList> m_moduleDirListCache;
-    ModuleItemCache m_globalModuleItemCache;
+    ModuleItemCache m_modulePrototypeItemCache;
     QHash<Item *, QSet<QString> > m_validItemPropertyNamesPerItem;
     QSet<Item *> m_disabledItems;
     SetupProjectParameters m_parameters;