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

Debugger: Inline rarely used convienience function

Browse Source 
Change-Id: Iad5db32af9adb90f5d191e4fdcd2be751bd2b412
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2019-09-19 16:55:21 +02:00
parent f5e624feaa
commit 7b0a5e44d3
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/analyzer/analyzermanager.h
View File

@@ -63,7 +63,6 @@ DEBUGGER_EXPORT void showCannotStartDialog(const QString &toolName);
DEBUGGER_EXPORT void enableMainWindow(bool on); DEBUGGER_EXPORT void enableMainWindow(bool on);
// Convenience functions. // Convenience functions.
DEBUGGER_EXPORT void showStatusMessage(const QString &message, int timeoutMS = 10000);
DEBUGGER_EXPORT void showPermanentStatusMessage(const QString &message); DEBUGGER_EXPORT void showPermanentStatusMessage(const QString &message);
DEBUGGER_EXPORT QAction *createStartAction(); DEBUGGER_EXPORT QAction *createStartAction();

2
src/plugins/debugger/debuggerengine.cpp
View File

@@ -1740,7 +1740,7 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
case StatusBar: case StatusBar:
d->m_logWindow->showInput(LogMisc, msg); d->m_logWindow->showInput(LogMisc, msg);
d->m_logWindow->showOutput(LogMisc, msg); d->m_logWindow->showOutput(LogMisc, msg);
Debugger::showStatusMessage(msg, timeout); DebuggerMainWindow::showStatusMessage(msg, timeout);
break; break;
case LogMiscInput: case LogMiscInput:
d->m_logWindow->showInput(LogMisc, msg); d->m_logWindow->showInput(LogMisc, msg);

5
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2406,11 +2406,6 @@ void enableMainWindow(bool on)
DebuggerMainWindow::instance()->setEnabled(on); DebuggerMainWindow::instance()->setEnabled(on);
} }
void showStatusMessage(const QString &message, int timeoutMS)
{
DebuggerMainWindow::showStatusMessage(message, timeoutMS);
}
void showPermanentStatusMessage(const QString &message) void showPermanentStatusMessage(const QString &message)
{ {
DebuggerMainWindow::showStatusMessage(message, -1); DebuggerMainWindow::showStatusMessage(message, -1);

4
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -23,6 +23,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include "debuggermainwindow.h"
#include "debuggerruncontrol.h" #include "debuggerruncontrol.h"
#include "terminal.h" #include "terminal.h"
@@ -701,9 +702,10 @@ void DebuggerRunTool::start()
QString debuggerName = m_engine->objectName(); QString debuggerName = m_engine->objectName();
if (m_engine2) if (m_engine2)
debuggerName += ' ' + m_engine2->objectName(); debuggerName += ' ' + m_engine2->objectName();
const QString message = tr("Starting debugger \"%1\" for ABI \"%2\"...") const QString message = tr("Starting debugger \"%1\" for ABI \"%2\"...")
.arg(debuggerName).arg(m_runParameters.toolChainAbi.toString()); .arg(debuggerName).arg(m_runParameters.toolChainAbi.toString());
showStatusMessage(message); DebuggerMainWindow::showStatusMessage(message, 10000);
showMessage(m_engine->formatStartParameters(), LogDebug); showMessage(m_engine->formatStartParameters(), LogDebug);
showMessage(DebuggerSettings::dump(), LogDebug); showMessage(DebuggerSettings::dump(), LogDebug);