From 7000f7ca48910deb051e444349b9db4aab41e14f Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 7 Jan 2011 18:38:00 +0100 Subject: [PATCH] projectexplorer: move runcontrol/outputwindow connection to outputwindow --- src/plugins/projectexplorer/outputwindow.cpp | 2 ++ src/plugins/projectexplorer/outputwindow.h | 2 +- src/plugins/projectexplorer/projectexplorer.cpp | 8 +------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp index e9b84f8baa..ff224150e8 100644 --- a/src/plugins/projectexplorer/outputwindow.cpp +++ b/src/plugins/projectexplorer/outputwindow.cpp @@ -246,6 +246,8 @@ void OutputPane::createNewOutputWindow(RunControl *rc) this, SLOT(runControlStarted())); connect(rc, SIGNAL(finished()), this, SLOT(runControlFinished())); + connect(rc, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,ProjectExplorer::OutputFormat)), + this, SLOT(appendMessage(ProjectExplorer::RunControl*,QString,ProjectExplorer::OutputFormat))); // First look if we can reuse a tab const int size = m_runControlTabs.size(); diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h index c41f93a30a..61ff8b1e0c 100644 --- a/src/plugins/projectexplorer/outputwindow.h +++ b/src/plugins/projectexplorer/outputwindow.h @@ -89,6 +89,7 @@ public: void goToPrev(); bool canNavigate(); + void createNewOutputWindow(RunControl *rc); void showTabFor(RunControl *rc); bool aboutToClose() const; @@ -99,7 +100,6 @@ signals: public slots: // ApplicationOutput specifics - void createNewOutputWindow(RunControl *rc); void projectRemoved(); void appendMessage(ProjectExplorer::RunControl *rc, const QString &out, diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index ff6d80f1c4..c7a719120f 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1386,13 +1386,7 @@ void ProjectExplorerPlugin::startRunControl(RunControl *runControl, const QStrin if (runMode == ProjectExplorer::Constants::RUNMODE) d->m_outputPane->popup(false); d->m_outputPane->showTabFor(runControl); - - connect(runControl, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,ProjectExplorer::OutputFormat)), - d->m_outputPane, SLOT(appendMessage(ProjectExplorer::RunControl*,QString,ProjectExplorer::OutputFormat))); - - connect(runControl, SIGNAL(finished()), - this, SLOT(runControlFinished())); - + connect(runControl, SIGNAL(finished()), this, SLOT(runControlFinished())); runControl->start(); emit updateRunActions(); } -- 2.11.0