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

remove obsolete code that tracked build manager status (and failed to do so)

Browse Source 
Merge-request: 265
Reviewed-by: hjk <qtc-committer@nokia.com>
This commit is contained in:
Milian Wolff
2011-03-04 16:00:01 +01:00
committed by hjk
parent 7592fb13f2
commit 8f5e33cfc0
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/analyzerbase/analyzermanager.cpp
View File

@@ -52,7 +52,6 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/uniqueidmanager.h> #include <coreplugin/uniqueidmanager.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
@@ -131,7 +130,6 @@ public:
AnalyzerMode *m_mode; AnalyzerMode *m_mode;
AnalyzerRunControlFactory *m_runControlFactory; AnalyzerRunControlFactory *m_runControlFactory;
ProjectExplorer::RunControl *m_currentRunControl; ProjectExplorer::RunControl *m_currentRunControl;
bool m_isWaitingForBuild;
Utils::FancyMainWindow *m_mainWindow; Utils::FancyMainWindow *m_mainWindow;
QList<IAnalyzerTool*> m_tools; QList<IAnalyzerTool*> m_tools;
QActionGroup *m_toolGroup; QActionGroup *m_toolGroup;
@@ -154,7 +152,6 @@ AnalyzerManager::AnalyzerManagerPrivate::AnalyzerManagerPrivate(AnalyzerManager
m_mode(0), m_mode(0),
m_runControlFactory(0), m_runControlFactory(0),
m_currentRunControl(0), m_currentRunControl(0),
m_isWaitingForBuild(false),
m_mainWindow(0), m_mainWindow(0),
m_toolGroup(0), m_toolGroup(0),
m_startAction(0), m_startAction(0),
@@ -366,7 +363,6 @@ bool buildTypeAcceppted(IAnalyzerTool::ToolMode toolMode,
void AnalyzerManager::AnalyzerManagerPrivate::startTool() void AnalyzerManager::AnalyzerManagerPrivate::startTool()
{ {
QTC_ASSERT(!m_isWaitingForBuild, return);
QTC_ASSERT(!m_currentRunControl, return); QTC_ASSERT(!m_currentRunControl, return);
// make sure our mode is shown // make sure our mode is shown
@@ -429,7 +425,6 @@ void AnalyzerManager::AnalyzerManagerPrivate::startTool()
return; return;
} }
m_isWaitingForBuild = true;
pe->runProject(pro, Constants::MODE_ANALYZE); pe->runProject(pro, Constants::MODE_ANALYZE);
m_startAction->setEnabled(false); m_startAction->setEnabled(false);
@@ -449,8 +444,6 @@ AnalyzerManager::AnalyzerManager(QObject *parent) :
connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)), connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)),
this, SLOT(modeChanged(Core::IMode*))); this, SLOT(modeChanged(Core::IMode*)));
ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance(); ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance();
connect(pe->buildManager(), SIGNAL(buildQueueFinished(bool)),
this, SLOT(buildQueueFinished(bool)));
connect(pe, SIGNAL(updateRunActions()), connect(pe, SIGNAL(updateRunActions()),
this, SLOT(updateRunActions())); this, SLOT(updateRunActions()));
} }
@@ -606,26 +599,8 @@ void AnalyzerManager::runControlCreated(AnalyzerRunControl *rc)
connect(rc, SIGNAL(finished()), this, SLOT(handleToolFinished())); connect(rc, SIGNAL(finished()), this, SLOT(handleToolFinished()));
} }
void AnalyzerManager::buildQueueFinished(bool success)
{
// maybe that wasn't for our build
if (!d->m_isWaitingForBuild)
return;
d->m_isWaitingForBuild = false;
if (success)
return;
// note that the RunControl is started, if it is started, before we get here.
QTC_ASSERT(!d->m_currentRunControl, qt_noop());
handleToolFinished();
}
void AnalyzerManager::stopTool() void AnalyzerManager::stopTool()
{ {
if (d->m_isWaitingForBuild) {
QTC_ASSERT(!d->m_currentRunControl, qt_noop());
ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance();
pe->buildManager()->cancel();
}
if (!d->m_currentRunControl) if (!d->m_currentRunControl)
return; return;

1
src/plugins/analyzerbase/analyzermanager.h
View File

@@ -167,7 +167,6 @@ private slots:
void toolSelected(QAction *); void toolSelected(QAction *);
void modeChanged(Core::IMode *mode); void modeChanged(Core::IMode *mode);
void runControlCreated(AnalyzerRunControl *); void runControlCreated(AnalyzerRunControl *);
void buildQueueFinished(bool success);
void resetLayout(); void resetLayout();
void saveToolSettings(IAnalyzerTool *tool); void saveToolSettings(IAnalyzerTool *tool);
void loadToolSettings(IAnalyzerTool *tool); void loadToolSettings(IAnalyzerTool *tool);