summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-05-07 18:46:17 +0200
committerhjk <hjk121@nokiamail.com>2014-05-08 17:51:47 +0200
commit3089c8b1df9ee57fe228e63aa37bde64517bccbb (patch)
tree79330f7879da5b4ea8c3f8ac365f08751483db39
parentfcdb3373b1045492b65537ac4ebbd371606d04e0 (diff)
downloadqt-creator-3089c8b1df9ee57fe228e63aa37bde64517bccbb.tar.gz
QbsProjectManager: Remove some unused code
Change-Id: I5e77f5daeb8d7200e333443b0912c5be6e3b9f81 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanager.cpp3
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanager.h4
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp4
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h2
4 files changed, 3 insertions, 10 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
index abeed42ccc..3ba25457dd 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
@@ -60,8 +60,7 @@ namespace QbsProjectManager {
qbs::Settings *QbsManager::m_settings = 0;
-QbsManager::QbsManager(Internal::QbsProjectManagerPlugin *plugin) :
- m_plugin(plugin),
+QbsManager::QbsManager() :
m_defaultPropertyProvider(new DefaultPropertyProvider)
{
m_settings = new qbs::Settings(Core::ICore::userResourcePath());
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.h b/src/plugins/qbsprojectmanager/qbsprojectmanager.h
index ff137f61c9..378689e75b 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.h
@@ -53,7 +53,6 @@ namespace QbsProjectManager {
namespace Internal {
class QbsLogSink;
class QbsProject;
-class QbsProjectManagerPlugin;
} // namespace Internal
class DefaultPropertyProvider;
@@ -63,7 +62,7 @@ class QbsManager : public ProjectExplorer::IProjectManager
Q_OBJECT
public:
- QbsManager(Internal::QbsProjectManagerPlugin *plugin);
+ QbsManager();
~QbsManager();
QString mimeType() const;
@@ -85,7 +84,6 @@ private:
void addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k);
void addProfileFromKit(const ProjectExplorer::Kit *k);
- Internal::QbsProjectManagerPlugin *m_plugin;
Internal::QbsLogSink *m_logSink;
static qbs::Settings *m_settings;
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
index 4dee9d6433..af420c4467 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
@@ -89,7 +89,6 @@ class QbsFeatureProvider : public Core::IFeatureProvider
QbsProjectManagerPlugin::QbsProjectManagerPlugin() :
- m_manager(0),
m_selectedProject(0),
m_selectedNode(0),
m_currentProject(0),
@@ -102,14 +101,13 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
Q_UNUSED(arguments);
Q_UNUSED(errorMessage);
- m_manager = new QbsManager(this);
const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID);
const Core::Context globalcontext(Core::Constants::C_GLOBAL);
Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "qbs");
//create and register objects
- addAutoReleasedObject(m_manager);
+ addAutoReleasedObject(new QbsManager);
addAutoReleasedObject(new QbsBuildConfigurationFactory);
addAutoReleasedObject(new QbsBuildStepFactory);
addAutoReleasedObject(new QbsCleanStepFactory);
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
index 2cfd42ce46..789a607c1b 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
@@ -95,8 +95,6 @@ private:
void buildSingleFile(QbsProject *project, const QString &file);
void buildProducts(QbsProject *project, const QStringList &products);
- QbsManager *m_manager;
-
QAction *m_reparseQbs;
QAction *m_reparseQbsCtx;
QAction *m_buildFileCtx;