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

ProjectExplorer: Fully qualify signals of run control.

Browse Source 
To be able to connect to them in the debugger namespace.
Reviewed-by: dt
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Friedemann Kleint
2010-07-02 15:30:25 +02:00
parent bc0d5e38e4
commit 4c655cdd90
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/outputwindow.h
View File

@@ -93,11 +93,11 @@ public slots:
void projectRemoved(); void projectRemoved();
void coreAboutToClose(); void coreAboutToClose();
void appendApplicationOutput(RunControl *rc, const QString &out, void appendApplicationOutput(ProjectExplorer::RunControl *rc, const QString &out,
bool onStdErr); bool onStdErr);
void appendApplicationOutputInline(RunControl *rc, const QString &out, void appendApplicationOutputInline(ProjectExplorer::RunControl *rc, const QString &out,
bool onStdErr); bool onStdErr);
void appendMessage(RunControl *rc, const QString &out, bool isError); void appendMessage(ProjectExplorer::RunControl *rc, const QString &out, bool isError);
private slots: private slots:
void reRunRunControl(); void reRunRunControl();

12
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -1264,12 +1264,12 @@ void ProjectExplorerPlugin::startRunControl(RunControl *runControl, const QStrin
if (projectExplorerSettings().cleanOldAppOutput) if (projectExplorerSettings().cleanOldAppOutput)
d->m_outputPane->clearContents(); d->m_outputPane->clearContents();
connect(runControl, SIGNAL(addToOutputWindow(RunControl *, const QString &, bool)), connect(runControl, SIGNAL(addToOutputWindow(ProjectExplorer::RunControl*,QString,bool)),
d->m_outputPane, SLOT(appendApplicationOutput(RunControl*,const QString &, bool))); d->m_outputPane, SLOT(appendApplicationOutput(ProjectExplorer::RunControl*,QString, bool)));
connect(runControl, SIGNAL(addToOutputWindowInline(RunControl *, const QString &, bool)), connect(runControl, SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl*,QString,bool)),
d->m_outputPane, SLOT(appendApplicationOutputInline(RunControl*,const QString &, bool))); d->m_outputPane, SLOT(appendApplicationOutputInline(ProjectExplorer::RunControl*,QString,bool)));
connect(runControl, SIGNAL(appendMessage(RunControl*,QString,bool)), connect(runControl, SIGNAL(appendMessage(ProjectExplorer::RunControl*,QString,bool)),
d->m_outputPane, SLOT(appendMessage(RunControl *, const QString &, bool))); d->m_outputPane, SLOT(appendMessage(ProjectExplorer::RunControl*,QString,bool)));
connect(runControl, SIGNAL(finished()), connect(runControl, SIGNAL(finished()),
this, SLOT(runControlFinished())); this, SLOT(runControlFinished()));

6
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -173,9 +173,9 @@ public:
QString runMode() const; QString runMode() const;
signals: signals:
void addToOutputWindow(RunControl *, const QString &line, bool onStdErr); void addToOutputWindow(ProjectExplorer::RunControl *, const QString &line, bool onStdErr);
void addToOutputWindowInline(RunControl *, const QString &line, bool onStdErr); void addToOutputWindowInline(ProjectExplorer::RunControl *, const QString &line, bool onStdErr);
void appendMessage(RunControl *, const QString &error, bool isError); void appendMessage(ProjectExplorer::RunControl *, const QString &error, bool isError);
void started(); void started();
void finished(); void finished();

4
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

@@ -457,8 +457,8 @@ MaemoDebugRunControl::MaemoDebugRunControl(RunConfiguration *runConfiguration)
MaemoDebugRunControl::~MaemoDebugRunControl() MaemoDebugRunControl::~MaemoDebugRunControl()
{ {
disconnect(SIGNAL(addToOutputWindow(RunControl*,QString, bool))); disconnect(SIGNAL(addToOutputWindow(ProjectExplorer::RunControl*,QString, bool)));
disconnect(SIGNAL(addToOutputWindowInline(RunControl*,QString, bool))); disconnect(SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl*,QString, bool)));
stop(); stop();
} }

4
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -947,8 +947,8 @@ void S60DeviceDebugRunControl::handleLauncherFinished()
SLOT(debuggingFinished()), SLOT(debuggingFinished()),
Qt::QueuedConnection); Qt::QueuedConnection);
connect(m_debuggerRunControl, connect(m_debuggerRunControl,
SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl,QString,bool)), SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl*,QString,bool)),
SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl,QString,bool)), SIGNAL(addToOutputWindowInline(ProjectExplorer::RunControl*,QString,bool)),
Qt::QueuedConnection); Qt::QueuedConnection);
DebuggerPlugin::startDebugger(m_debuggerRunControl); DebuggerPlugin::startDebugger(m_debuggerRunControl);