Header cleanup in QML/JS and project manager.

Change-Id: I40b41a3ef6189a99272e345e3251680edccecca0
Reviewed-on: http://codereview.qt.nokia.com/3215
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

src/plugins/qmljstools/qmljsmodelmanager.h

@@ -37,7 +37,7 @@
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
-#include <cplusplus/ModelManagerInterface.h>
+#include <cplusplus/CppDocument.h>
 
 #include <QtCore/QFuture>
 #include <QtCore/QFutureSynchronizer>
@@ -50,6 +50,10 @@ class ICore;
 class MimeType;
 }
 
+namespace CPlusPlus {
+class CppModelManagerInterface;
+}
+
 namespace QmlJSTools {
 namespace Internal {
 

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -37,6 +37,8 @@
 #include "qmlprojectrunconfiguration.h"
 #include "qmlprojecttarget.h"
 #include "qmlprojectconstants.h"
+#include "qmlprojectnodes.h"
+#include "qmlprojectmanager.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
@@ -256,7 +258,7 @@ Core::IFile *QmlProject::file() const
     return m_file;
 }
 
-Internal::Manager *QmlProject::projectManager() const
+ProjectExplorer::IProjectManager *QmlProject::projectManager() const
 {
     return m_manager;
 }
@@ -276,7 +278,7 @@ Internal::QmlProjectTarget *QmlProject::activeTarget() const
     return static_cast<Internal::QmlProjectTarget *>(Project::activeTarget());
 }
 
-Internal::QmlProjectNode *QmlProject::rootProjectNode() const
+ProjectExplorer::ProjectNode *QmlProject::rootProjectNode() const
 {
     return m_rootNode;
 }

src/plugins/qmlprojectmanager/qmlproject.h

@@ -34,8 +34,6 @@
 #define QMLPROJECT_H
 
 #include "qmlprojectmanager_global.h"
-#include "qmlprojectnodes.h"
-#include "qmlprojectmanager.h"
 
 #include <projectexplorer/project.h>
 
@@ -54,9 +52,10 @@ namespace QmlProjectManager {
 class QmlProjectItem;
 
 namespace Internal {
-
+class Manager;
 class QmlProjectFile;
 class QmlProjectTarget;
+class QmlProjectNode;
 } // namespace Internal
 
 class QMLPROJECTMANAGER_EXPORT QmlProject : public ProjectExplorer::Project
@@ -72,14 +71,14 @@ public:
     QString displayName() const;
     QString id() const;
     Core::IFile *file() const;
-    Internal::Manager *projectManager() const;
+    ProjectExplorer::IProjectManager *projectManager() const;
     Internal::QmlProjectTarget *activeTarget() const;
 
     QList<ProjectExplorer::Project *> dependsOn();
 
     QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
 
-    Internal::QmlProjectNode *rootProjectNode() const;
+    ProjectExplorer::ProjectNode *rootProjectNode() const;
     QStringList files(FilesMode fileMode) const;
 
     bool validProjectFile() const;

src/plugins/qmlprojectmanager/qmlprojectplugin.h

@@ -37,14 +37,7 @@
 
 #include <extensionsystem/iplugin.h>
 
-#include <QtCore/QObject>
-
 namespace QmlProjectManager {
-namespace Internal {
-
-class ProjectFilesFactory;
-
-}
 
 class QMLPROJECTMANAGER_EXPORT QmlProjectPlugin: public ExtensionSystem::IPlugin
 {
@@ -58,7 +51,6 @@ public:
     virtual void extensionsInitialized();
 
     static void showQmlObserverToolWarning();
-
 };
 
 } // namespace QmlProject