From 2de390cfdbb709a2278dd42f3cef22371e8165a4 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 30 Nov 2009 19:16:00 +0100
Subject: [PATCH] Move QMakeParser to Qt4ProjectManager
---
.../projectexplorer/buildparserfactory.cpp | 16 -----------
.../projectexplorer/buildparserfactory.h | 10 -------
.../projectexplorer/projectexplorer.cpp | 1 -
.../projectexplorer/projectexplorer.pro | 2 --
.../projectexplorerconstants.h | 1 -
.../qmakeparser.cpp | 28 +++++++++++++++----
.../qmakeparser.h | 17 +++++++++--
src/plugins/qt4projectmanager/qmakestep.cpp | 4 +--
.../qt4projectmanager/qt4projectmanager.pro | 6 ++--
.../qt4projectmanagerconstants.h | 3 ++
.../qt4projectmanagerplugin.cpp | 2 ++
11 files changed, 48 insertions(+), 42 deletions(-)
rename src/plugins/{projectexplorer => qt4projectmanager}/qmakeparser.cpp (71%)
rename src/plugins/{projectexplorer => qt4projectmanager}/qmakeparser.h (79%)
diff --git a/src/plugins/projectexplorer/buildparserfactory.cpp b/src/plugins/projectexplorer/buildparserfactory.cpp
index cb9326d68ba..e4b8895eaee 100644
--- a/src/plugins/projectexplorer/buildparserfactory.cpp
+++ b/src/plugins/projectexplorer/buildparserfactory.cpp
@@ -32,7 +32,6 @@
#include "projectexplorerconstants.h"
#include "gccparser.h"
#include "msvcparser.h"
-#include "qmakeparser.h"
using namespace ProjectExplorer::Internal;
@@ -65,18 +64,3 @@ ProjectExplorer::IBuildParser * MsvcParserFactory::create(const QString & name)
Q_UNUSED(name)
return new MsvcParser();
}
-
-QMakeParserFactory::~QMakeParserFactory()
-{
-}
-
-bool QMakeParserFactory::canCreate(const QString & name) const
-{
- return (name == Constants::BUILD_PARSER_QMAKE);
-}
-
-ProjectExplorer::IBuildParser * QMakeParserFactory::create(const QString & name) const
-{
- Q_UNUSED(name)
- return new QMakeParser();
-}
diff --git a/src/plugins/projectexplorer/buildparserfactory.h b/src/plugins/projectexplorer/buildparserfactory.h
index f953d63ebf6..e29570f2baf 100644
--- a/src/plugins/projectexplorer/buildparserfactory.h
+++ b/src/plugins/projectexplorer/buildparserfactory.h
@@ -55,16 +55,6 @@ public:
virtual ProjectExplorer::IBuildParser * create(const QString & name) const;
};
-class QMakeParserFactory : public ProjectExplorer::IBuildParserFactory
-{
- Q_OBJECT
-public:
- QMakeParserFactory() {}
- virtual ~QMakeParserFactory();
- virtual bool canCreate(const QString & name) const;
- virtual ProjectExplorer::IBuildParser * create(const QString & name) const;
-};
-
} // namespace Internal
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 2f2da8c6e0a..c15c303e3ae 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -307,7 +307,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
// Build parsers
addAutoReleasedObject(new GccParserFactory);
addAutoReleasedObject(new MsvcParserFactory);
- addAutoReleasedObject(new QMakeParserFactory);
// Settings page
addAutoReleasedObject(new ProjectExplorerSettingsPage);
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 8aaba10473a..325f624a321 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -66,7 +66,6 @@ HEADERS += projectexplorer.h \
projectexplorersettingspage.h \
projectwelcomepage.h \
projectwelcomepagewidget.h \
- qmakeparser.h \
baseprojectwizarddialog.h
SOURCES += projectexplorer.cpp \
projectwindow.cpp \
@@ -121,7 +120,6 @@ SOURCES += projectexplorer.cpp \
projectwelcomepage.cpp \
projectwelcomepagewidget.cpp \
corelistenercheckingforrunningbuild.cpp \
- qmakeparser.cpp \
baseprojectwizarddialog.cpp
FORMS += processstep.ui \
editorsettingspropertiespage.ui \
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 262cc513675..958391e6371 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -179,7 +179,6 @@ const char * const FORM_MIMETYPE = "application/x-designer";
const char * const RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource";
// build parsers
-const char * const BUILD_PARSER_QMAKE = "BuildParser.QMake";
const char * const BUILD_PARSER_MSVC = "BuildParser.MSVC";
const char * const BUILD_PARSER_GCC = "BuildParser.Gcc";
const char * const BUILD_PARSER_RVCT = "BuildParser.Rvct";
diff --git a/src/plugins/projectexplorer/qmakeparser.cpp b/src/plugins/qt4projectmanager/qmakeparser.cpp
similarity index 71%
rename from src/plugins/projectexplorer/qmakeparser.cpp
rename to src/plugins/qt4projectmanager/qmakeparser.cpp
index 4425835f4e7..767b86921af 100644
--- a/src/plugins/projectexplorer/qmakeparser.cpp
+++ b/src/plugins/qt4projectmanager/qmakeparser.cpp
@@ -28,10 +28,28 @@
**************************************************************************/
#include "qmakeparser.h"
-#include "projectexplorerconstants.h"
-#include "taskwindow.h"
+#include "qt4projectmanagerconstants.h"
+#include <projectexplorer/taskwindow.h>
+#include <projectexplorer/projectexplorerconstants.h>
-using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Internal;
+using ProjectExplorer::TaskWindow;
+
+QMakeParserFactory::~QMakeParserFactory()
+{
+}
+
+bool QMakeParserFactory::canCreate(const QString & name) const
+{
+ return (name == Constants::BUILD_PARSER_QMAKE);
+}
+
+ProjectExplorer::IBuildParser * QMakeParserFactory::create(const QString & name) const
+{
+ Q_UNUSED(name)
+ return new QMakeParser();
+}
QMakeParser::QMakeParser()
{
@@ -39,7 +57,7 @@ QMakeParser::QMakeParser()
QString QMakeParser::name() const
{
- return QLatin1String(ProjectExplorer::Constants::BUILD_PARSER_QMAKE);
+ return QLatin1String(Qt4ProjectManager::Constants::BUILD_PARSER_QMAKE);
}
void QMakeParser::stdOutput(const QString & line)
@@ -57,7 +75,7 @@ void QMakeParser::stdError(const QString & line)
lne /* description */,
QString() /* filename */,
-1 /* linenumber */,
- Constants::TASK_CATEGORY_BUILDSYSTEM));
+ ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
return;
}
}
diff --git a/src/plugins/projectexplorer/qmakeparser.h b/src/plugins/qt4projectmanager/qmakeparser.h
similarity index 79%
rename from src/plugins/projectexplorer/qmakeparser.h
rename to src/plugins/qt4projectmanager/qmakeparser.h
index 5d5a1b02bb7..e3bdf950a9d 100644
--- a/src/plugins/projectexplorer/qmakeparser.h
+++ b/src/plugins/qt4projectmanager/qmakeparser.h
@@ -30,11 +30,23 @@
#ifndef QMAKEPARSER_H
#define QMAKEPARSER_H
-#include "ibuildparser.h"
+#include <projectexplorer/ibuildparser.h>
#include <QtCore/QRegExp>
-namespace ProjectExplorer {
+namespace Qt4ProjectManager {
+namespace Internal {
+
+class QMakeParserFactory : public ProjectExplorer::IBuildParserFactory
+{
+ Q_OBJECT
+public:
+ QMakeParserFactory() {}
+ virtual ~QMakeParserFactory();
+ virtual bool canCreate(const QString & name) const;
+ virtual ProjectExplorer::IBuildParser * create(const QString & name) const;
+};
+
class QMakeParser : public ProjectExplorer::IBuildParser
{
@@ -48,6 +60,7 @@ public:
private:
};
+} // namesapce Interanal
} // namespace ProjectExplorer
#endif // QMAKEPARSER_H
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index c5447ce44a5..32325ec5666 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -39,8 +39,6 @@
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
-#include <projectexplorer/projectexplorerconstants.h>
-
#include <QFileDialog>
#include <QDir>
#include <QFile>
@@ -152,7 +150,7 @@ bool QMakeStep::init()
setArguments(args);
setEnvironment(qt4bc->environment());
- setBuildParser(ProjectExplorer::Constants::BUILD_PARSER_QMAKE);
+ setBuildParser(Qt4ProjectManager::Constants::BUILD_PARSER_QMAKE);
return AbstractMakeStep::init();
}
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index d3847c1202b..aafdecbb6ae 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -39,7 +39,8 @@ HEADERS += qt4projectmanagerplugin.h \
externaleditors.h \
gettingstartedwelcomepagewidget.h \
gettingstartedwelcomepage.h \
- qt4buildconfiguration.h
+ qt4buildconfiguration.h \
+ qmakeparser.h
SOURCES += qt4projectmanagerplugin.cpp \
qt4projectmanager.cpp \
qt4project.cpp \
@@ -74,7 +75,8 @@ SOURCES += qt4projectmanagerplugin.cpp \
externaleditors.cpp \
gettingstartedwelcomepagewidget.cpp \
gettingstartedwelcomepage.cpp \
- qt4buildconfiguration.cpp
+ qt4buildconfiguration.cpp \
+ qmakeparser.cpp
FORMS += makestep.ui \
qmakestep.ui \
qt4projectconfigwidget.ui \
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 19c033a0eee..6af9bbb0f6a 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -77,6 +77,9 @@ const char * const QT_SETTINGS_CATEGORY = "L.Qt4";
const char * const QT_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt4");
const char * const QTVERSION_SETTINGS_PAGE_ID = "Qt Versions";
const char * const QTVERSION_SETTINGS_PAGE_NAME = QT_TRANSLATE_NOOP("Qt4ProjectManager", "Qt Versions");
+
+// BuildParser
+const char * const BUILD_PARSER_QMAKE = "BuildParser.QMake";
} // namespace Constants
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index a6fbe1c9806..040691c56a0 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -45,6 +45,7 @@
#include "externaleditors.h"
#include "gettingstartedwelcomepage.h"
#include "gettingstartedwelcomepagewidget.h"
+#include "qmakeparser.h"
#ifdef QTCREATOR_WITH_S60
#include "qt-s60/s60manager.h"
@@ -149,6 +150,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
addAutoReleasedObject(new QMakeStepFactory);
addAutoReleasedObject(new MakeStepFactory);
+ addAutoReleasedObject(new QMakeParserFactory);
addAutoReleasedObject(new Qt4RunConfigurationFactory);
--
GitLab