qml: moving most of ModelManager logic to ModelManageInterface

Currently ModelManager contains lot logic, but as it sits in QmlJSTools
it is not possible to use it in standalone tests.
Moving most of the logic to ModelManagerInterface (and cleanup)
to allow better testing, and refactoring.
This introduces a dependency of the qmljs lib on the cplusplus lib
Also a (small) part of the CppTool::ModelManagerInterface has been
moved to CPlusPlus::CppModelManagerBase to remove the dependency on
CppTools to gather the Qml types exposed from C++.

Change-Id: Icad7fe96dfd0f1a2b1058d82bd98c77c40aa5e9d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

src/libs/cplusplus/cplusplus-lib.pri

@@ -57,7 +57,8 @@ HEADERS += \
     $$PWD/pp-scanner.h \
     $$PWD/findcdbbreakpoint.h \
     $$PWD/PPToken.h \
-    $$PWD/Dumpers.h
+    $$PWD/Dumpers.h \
+    $$PWD/cppmodelmanagerbase.h
 
 SOURCES += \
     $$PWD/SimpleLexer.cpp \
@@ -85,6 +86,7 @@ SOURCES += \
     $$PWD/pp-scanner.cpp \
     $$PWD/findcdbbreakpoint.cpp \
     $$PWD/PPToken.cpp \
-    $$PWD/Dumpers.cpp
+    $$PWD/Dumpers.cpp \
+    $$PWD/cppmodelmanagerbase.cpp
 
 RESOURCES += $$PWD/cplusplus.qrc

src/libs/cplusplus/cplusplus.qbs

@@ -94,6 +94,7 @@ QtcLibrary {
             "BackwardsScanner.cpp", "BackwardsScanner.h",
             "CppDocument.cpp", "CppDocument.h",
             "CppRewriter.cpp", "CppRewriter.h",
+            "cppmodelmanagerbase.cpp", "cppmodelmanagerbase.h",
             "DependencyTable.cpp", "DependencyTable.h",
             "DeprecatedGenTemplateInstance.cpp", "DeprecatedGenTemplateInstance.h",
             "ExpressionUnderCursor.cpp", "ExpressionUnderCursor.h",

src/libs/cplusplus/cppmodelmanagerbase.cpp

@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "cppmodelmanagerbase.h"
+
+namespace CPlusPlus {
+
+static CppModelManagerBase *g_instance = 0;
+
+CppModelManagerBase::CppModelManagerBase(QObject *parent)
+    : QObject(parent)
+{
+    Q_ASSERT(!g_instance);
+    g_instance = this;
+}
+
+CppModelManagerBase::~CppModelManagerBase()
+{
+    Q_ASSERT(g_instance == this);
+    g_instance = 0;
+}
+
+CppModelManagerBase *CppModelManagerBase::instance()
+{
+    return g_instance;
+}
+
+bool CppModelManagerBase::trySetExtraDiagnostics(const QString &fileName, const QString &kind,
+                                                 const QList<CPlusPlus::Document::DiagnosticMessage> &diagnostics)
+{
+    if (CppModelManagerBase *mm = instance())
+        return mm->setExtraDiagnostics(fileName, kind, diagnostics);
+    return false;
+}
+
+bool CppModelManagerBase::setExtraDiagnostics(const QString &fileName, const QString &kind,
+                                              const QList<CPlusPlus::Document::DiagnosticMessage> &diagnostics)
+{
+    Q_UNUSED(fileName);
+    Q_UNUSED(kind);
+    Q_UNUSED(diagnostics);
+    return false;
+}
+
+CPlusPlus::Snapshot CppModelManagerBase::snapshot() const
+{
+    return CPlusPlus::Snapshot();
+}
+
+} // namespace CPlusPlus

src/libs/cplusplus/cppmodelmanagerbase.h

@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef CPPMODELMANAGERBASE_H
+#define CPPMODELMANAGERBASE_H
+
+#include <cplusplus/CppDocument.h>
+
+#include <QObject>
+#include <QList>
+
+QT_BEGIN_NAMESPACE
+class QString;
+QT_END_NAMESPACE
+
+namespace CPlusPlus {
+
+class CPLUSPLUS_EXPORT CppModelManagerBase : public QObject
+{
+    Q_OBJECT
+public:
+    CppModelManagerBase(QObject *parent = 0);
+    ~CppModelManagerBase();
+
+    static CppModelManagerBase *instance();
+    static bool trySetExtraDiagnostics(const QString &fileName, const QString &kind,
+                                       const QList<Document::DiagnosticMessage> &diagnostics);
+
+    virtual bool setExtraDiagnostics(const QString &fileName, const QString &kind,
+                                     const QList<Document::DiagnosticMessage> &diagnostics);
+    virtual CPlusPlus::Snapshot snapshot() const;
+};
+
+} // namespace CPlusPlus
+
+#endif // CPPMODELMANAGERBASE_H