Revert "qmljs: better defaults, more uniform handling of paths"

moving to master

This reverts commit 0c46692244def9edb89c2914b9b1e5eff10cb6ce

Change-Id: Ie09f6db02058f4a5539221f1a0cc4f9225f38300
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

1 files changed, 10 insertions, 9 deletions

diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h
index 425f7bc2eb..fd28b27a88 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.h
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h
@@ -178,7 +178,7 @@ public:
     void updateLibraryInfo(const QString &path, const QmlJS::LibraryInfo &info);
     void emitDocumentChangedOnDisk(QmlJS::Document::Ptr doc);
     void updateQrcFile(const QString &path);
-    ProjectInfo projectInfoForPath(QString path) const;
+    ProjectInfo projectInfoForPath(QString path);
 
     QStringList importPaths() const;
     QmlJS::QmlLanguageBundles activeBundles() const;
@@ -189,16 +189,17 @@ public:
 
     CppDataHash cppData() const;
     LibraryInfo builtins(const Document::Ptr &doc) const;
-    ViewerContext completeVContext(const ViewerContext &vCtx,
-                                   const Document::Ptr &doc = Document::Ptr(0)) const;
-    ViewerContext defaultVContext(Language::Enum language = Language::Qml,
-                                  const Document::Ptr &doc = Document::Ptr(0),
-                                  bool autoComplete = true) const;
-    void setDefaultVContext(const ViewerContext &vContext);
-    virtual ProjectInfo defaultProjectInfo() const;
+    virtual ViewerContext completeVContext(const ViewerContext &vCtx,
+                                           const Document::Ptr &doc = Document::Ptr(0)) const;
+    virtual ViewerContext defaultVContext(bool autoComplete = true,
+                                          const Document::Ptr &doc = Document::Ptr(0)) const;
+    virtual void setDefaultVContext(const ViewerContext &vContext);
 
     // Blocks until all parsing threads are done. Used for testing.
     void joinAllThreads();
+
+    virtual ModelManagerInterface::ProjectInfo defaultProjectInfo() const;
+
 public slots:
     virtual void resetCodeModel();
     void removeProjectInfo(ProjectExplorer::Project *project);
@@ -256,7 +257,7 @@ private:
     QStringList m_defaultImportPaths;
     QmlJS::QmlLanguageBundles m_activeBundles;
     QmlJS::QmlLanguageBundles m_extendedBundles;
-    QHash<Language::Enum, QmlJS::ViewerContext> m_defaultVContexts;
+    QmlJS::ViewerContext m_vContext;
     bool m_shouldScanImports;
     QSet<QString> m_scannedPaths;