feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Header cleanup in QML/JS and project manager.

Browse Source 
Change-Id: I40b41a3ef6189a99272e345e3251680edccecca0
Reviewed-on: http://codereview.qt.nokia.com/3215
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-08-18 16:46:26 +02:00
parent ce633d57fb
commit 4c116bbda6
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmljstools/qmljsmodelmanager.h
View File

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

6
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

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

9
src/plugins/qmlprojectmanager/qmlproject.h
View File

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

8
src/plugins/qmlprojectmanager/qmlprojectplugin.h
View File

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