summaryrefslogtreecommitdiff
path: root/src/libs/qmljs
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2010-09-27 11:16:43 +0100
committerdt <qtc-committer@nokia.com>2010-09-27 15:56:37 +0100
commit299f139553a7fe9c0c71a0e56193c818edf50f09 (patch)
tree28d104fa58dc0abb5ebb61c5d69c7787d846b652 /src/libs/qmljs
parent699ff22851d0b2d9d0a071f780617413b90db2d8 (diff)
downloadqt-creator-299f139553a7fe9c0c71a0e56193c818edf50f09.tar.gz
Revert "Remove the QmlJSEditor dependency from Qt4ProjectManager."
This reverts commit f8c50013822bcf4119b88dada985c6d58fe27999.
Diffstat (limited to 'src/libs/qmljs')
-rw-r--r--src/libs/qmljs/qmljsmodelmanagerinterface.cpp1
-rw-r--r--src/libs/qmljs/qmljsmodelmanagerinterface.h6
2 files changed, 2 insertions, 5 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index 902c986da1..fbd340587e 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -38,7 +38,6 @@ ModelManagerInterface::ModelManagerInterface(QObject *parent)
{
Q_ASSERT(! g_instance);
g_instance = this;
- setObjectName(MODELMANAGERINTERFACE_OBJECTNAME);
}
ModelManagerInterface::~ModelManagerInterface()
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h
index d833fbb749..938087f454 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.h
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h
@@ -46,8 +46,6 @@ QT_QML_BEGIN_NAMESPACE
namespace QmlJS {
-const char *const MODELMANAGERINTERFACE_OBJECTNAME = "QmlJS::ModelManagerInterface";
-
class Snapshot;
class QMLJS_EXPORT ModelManagerInterface: public QObject
@@ -119,8 +117,8 @@ public:
virtual void removeFiles(const QStringList &files) = 0;
virtual QList<ProjectInfo> projectInfos() const = 0;
- Q_INVOKABLE virtual QmlJS::ModelManagerInterface::ProjectInfo projectInfo(ProjectExplorer::Project *project) const = 0;
- Q_INVOKABLE virtual void updateProjectInfo(const QmlJS::ModelManagerInterface::ProjectInfo &pinfo) = 0;
+ virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const = 0;
+ virtual void updateProjectInfo(const ProjectInfo &pinfo) = 0;
virtual QStringList importPaths() const = 0;