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

Inline RunControl::canReUseOutputPane into its only caller

Browse Source 
Change-Id: I2e858ab3bf715b41c26cfb6246d470787d003e3c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
hjk
2018-05-29 14:23:07 +02:00
parent bb28b10add
commit 772098c710
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -411,8 +411,15 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
this, &AppOutputPane::appendMessage);
// First look if we can reuse a tab
const int tabIndex = Utils::indexOf(m_runControlTabs, [rc](const RunControlTab &tab) {
return rc->canReUseOutputPane(tab.runControl);
const Runnable thisRunnable = rc->runnable();
const int tabIndex = Utils::indexOf(m_runControlTabs, [&](const RunControlTab &tab) {
if (!tab.runControl || tab.runControl->isRunning())
return false;
const Runnable otherRunnable = tab.runControl->runnable();
return thisRunnable.executable == otherRunnable.executable
&& thisRunnable.commandLineArguments == otherRunnable.commandLineArguments
&& thisRunnable.workingDirectory == otherRunnable.workingDirectory
&& thisRunnable.environment == otherRunnable.environment;
});
if (tabIndex != -1) {
RunControlTab &tab = m_runControlTabs[tabIndex];

11
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -1445,17 +1445,6 @@ Project *RunControl::project() const
return d->project.data();
}
bool RunControl::canReUseOutputPane(const RunControl *other) const
{
if (!other || other->isRunning())
return false;
return d->runnable.executable == other->d->runnable.executable
&& d->runnable.commandLineArguments == other->d->runnable.commandLineArguments
&& d->runnable.workingDirectory == other->d->runnable.workingDirectory
&& d->runnable.environment == other->d->runnable.environment;
}
/*!
A handle to the application process.

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

@@ -504,7 +504,6 @@ public:
RunConfiguration *runConfiguration() const;
Project *project() const;
bool canReUseOutputPane(const RunControl *other) const;
Utils::OutputFormatter *outputFormatter() const;
Core::Id runMode() const;