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

QbsProjectManager: Remove some unused code

Browse Source 
Change-Id: I5e77f5daeb8d7200e333443b0912c5be6e3b9f81
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2014-05-07 18:46:17 +02:00
parent fcdb3373b1
commit 3089c8b1df
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
View File

@@ -60,8 +60,7 @@ namespace QbsProjectManager {
qbs::Settings *QbsManager::m_settings = 0; qbs::Settings *QbsManager::m_settings = 0;
QbsManager::QbsManager(Internal::QbsProjectManagerPlugin *plugin) : QbsManager::QbsManager() :
m_plugin(plugin),
m_defaultPropertyProvider(new DefaultPropertyProvider) m_defaultPropertyProvider(new DefaultPropertyProvider)
{ {
m_settings = new qbs::Settings(Core::ICore::userResourcePath()); m_settings = new qbs::Settings(Core::ICore::userResourcePath());

4
src/plugins/qbsprojectmanager/qbsprojectmanager.h
View File

@@ -53,7 +53,6 @@ namespace QbsProjectManager {
namespace Internal { namespace Internal {
class QbsLogSink; class QbsLogSink;
class QbsProject; class QbsProject;
class QbsProjectManagerPlugin;
} // namespace Internal } // namespace Internal
class DefaultPropertyProvider; class DefaultPropertyProvider;
@@ -63,7 +62,7 @@ class QbsManager : public ProjectExplorer::IProjectManager
Q_OBJECT Q_OBJECT
public: public:
QbsManager(Internal::QbsProjectManagerPlugin *plugin); QbsManager();
~QbsManager(); ~QbsManager();
QString mimeType() const; QString mimeType() const;
@@ -85,7 +84,6 @@ private:
void addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k); void addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k);
void addProfileFromKit(const ProjectExplorer::Kit *k); void addProfileFromKit(const ProjectExplorer::Kit *k);
Internal::QbsProjectManagerPlugin *m_plugin;
Internal::QbsLogSink *m_logSink; Internal::QbsLogSink *m_logSink;
static qbs::Settings *m_settings; static qbs::Settings *m_settings;

4
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -89,7 +89,6 @@ class QbsFeatureProvider : public Core::IFeatureProvider
QbsProjectManagerPlugin::QbsProjectManagerPlugin() : QbsProjectManagerPlugin::QbsProjectManagerPlugin() :
m_manager(0),
m_selectedProject(0), m_selectedProject(0),
m_selectedNode(0), m_selectedNode(0),
m_currentProject(0), m_currentProject(0),
@@ -102,14 +101,13 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
Q_UNUSED(arguments); Q_UNUSED(arguments);
Q_UNUSED(errorMessage); Q_UNUSED(errorMessage);
m_manager = new QbsManager(this);
const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID); const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID);
const Core::Context globalcontext(Core::Constants::C_GLOBAL); const Core::Context globalcontext(Core::Constants::C_GLOBAL);
Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "qbs"); Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "qbs");
//create and register objects //create and register objects
addAutoReleasedObject(m_manager); addAutoReleasedObject(new QbsManager);
addAutoReleasedObject(new QbsBuildConfigurationFactory); addAutoReleasedObject(new QbsBuildConfigurationFactory);
addAutoReleasedObject(new QbsBuildStepFactory); addAutoReleasedObject(new QbsBuildStepFactory);
addAutoReleasedObject(new QbsCleanStepFactory); addAutoReleasedObject(new QbsCleanStepFactory);

2
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
View File

@@ -95,8 +95,6 @@ private:
void buildSingleFile(QbsProject *project, const QString &file); void buildSingleFile(QbsProject *project, const QString &file);
void buildProducts(QbsProject *project, const QStringList &products); void buildProducts(QbsProject *project, const QStringList &products);
QbsManager *m_manager;
QAction *m_reparseQbs; QAction *m_reparseQbs;
QAction *m_reparseQbsCtx; QAction *m_reparseQbsCtx;
QAction *m_buildFileCtx; QAction *m_buildFileCtx;