summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/buildmanager.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2009-12-09 13:54:46 +0100
committerTobias Hunger <tobias.hunger@nokia.com>2009-12-09 18:39:03 +0100
commitec025c6dbf1b3c9b6ff4ac7859d61f03b35c21f4 (patch)
tree5e3d5b2a0fcbd4928826466e59394a43c8b1b0d0 /src/plugins/projectexplorer/buildmanager.cpp
parenta0abde6306571fb7f12fe1d176cec1c8dba4d358 (diff)
downloadqt-creator-ec025c6dbf1b3c9b6ff4ac7859d61f03b35c21f4.tar.gz
Rework Build Parser handling
* Rework IBuildParser: * Remove name() method. * Remove enterDirectory and leaveDirectory signals. * Allow chaining of parsers. * Rename IBuildParser to IOutputParser. * Implement GnuMakeParser. * Remove entering/leaving directory related code from all other parsers * Move filename fixup heuristic based on entering/leaving directory massages from gnumake here from AbstractMakeStep. * Add outputParser method to ToolChain: This removes the need to map toolchains to BuildParser names in the BuildSteps. * Enhance AbstractProcessStep to accept a IOutputParser to parse its output. * Remove AbstractMakeStep. * Set the appropriate Parsers in all classes deriving from AbstractProcessStep and append the ToolChain's parser to the parser chain. * Remove BuildParserFactories: There is no more need for them. * Remove constants used to identify the BuildParsers. * Clean up some names: * Replace stdOut with stdOutput. * Replace addToTaskWindow with addTask and addToOutputWindow with addOutput. Do this wherever it is not yet clear that this will end up in the Task/Output window. Reviewed-by: dt
Diffstat (limited to 'src/plugins/projectexplorer/buildmanager.cpp')
-rw-r--r--src/plugins/projectexplorer/buildmanager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index dde844b1fb..560061eee4 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -132,9 +132,9 @@ void BuildManager::cancel()
// (And we want those to be before the cancel message.)
QTimer::singleShot(0, this, SLOT(emitCancelMessage()));
- disconnect(m_currentBuildStep, SIGNAL(addToTaskWindow(ProjectExplorer::TaskWindow::Task)),
+ disconnect(m_currentBuildStep, SIGNAL(addTask(ProjectExplorer::TaskWindow::Task)),
this, SLOT(addToTaskWindow(ProjectExplorer::TaskWindow::Task)));
- disconnect(m_currentBuildStep, SIGNAL(addToOutputWindow(QString)),
+ disconnect(m_currentBuildStep, SIGNAL(addOutput(QString)),
this, SLOT(addToOutputWindow(QString)));
decrementActiveBuildSteps(m_currentBuildStep->buildConfiguration()->project());
@@ -269,9 +269,9 @@ void BuildManager::nextBuildQueue()
if (m_canceling)
return;
- disconnect(m_currentBuildStep, SIGNAL(addToTaskWindow(ProjectExplorer::TaskWindow::Task)),
+ disconnect(m_currentBuildStep, SIGNAL(addTask(ProjectExplorer::TaskWindow::Task)),
this, SLOT(addToTaskWindow(ProjectExplorer::TaskWindow::Task)));
- disconnect(m_currentBuildStep, SIGNAL(addToOutputWindow(QString)),
+ disconnect(m_currentBuildStep, SIGNAL(addOutput(QString)),
this, SLOT(addToOutputWindow(QString)));
++m_progress;
@@ -311,9 +311,9 @@ void BuildManager::nextStep()
m_currentBuildStep = m_buildQueue.front();
m_buildQueue.pop_front();
- connect(m_currentBuildStep, SIGNAL(addToTaskWindow(ProjectExplorer::TaskWindow::Task)),
+ connect(m_currentBuildStep, SIGNAL(addTask(ProjectExplorer::TaskWindow::Task)),
this, SLOT(addToTaskWindow(ProjectExplorer::TaskWindow::Task)));
- connect(m_currentBuildStep, SIGNAL(addToOutputWindow(QString)),
+ connect(m_currentBuildStep, SIGNAL(addOutput(QString)),
this, SLOT(addToOutputWindow(QString)));
bool init = m_currentBuildStep->init();