diff options
author | hjk <hjk@qt.io> | 2019-09-19 16:55:21 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-09-20 13:39:31 +0000 |
commit | 7b0a5e44d3d4209f7d52fb8a589164bb79b8233b (patch) | |
tree | 0c8ed019bf8daf86b39ae146e7f096a050ace18d | |
parent | f5e624feaad4849944a88d1434d8a6cef16c107a (diff) | |
download | qt-creator-7b0a5e44d3d4209f7d52fb8a589164bb79b8233b.tar.gz |
Debugger: Inline rarely used convienience function
Change-Id: Iad5db32af9adb90f5d191e4fdcd2be751bd2b412
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rw-r--r-- | src/plugins/debugger/analyzer/analyzermanager.h | 1 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerengine.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 5 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerruncontrol.cpp | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/debugger/analyzer/analyzermanager.h b/src/plugins/debugger/analyzer/analyzermanager.h index e7c7f4d9d5..d8c5d1112a 100644 --- a/src/plugins/debugger/analyzer/analyzermanager.h +++ b/src/plugins/debugger/analyzer/analyzermanager.h @@ -63,7 +63,6 @@ DEBUGGER_EXPORT void showCannotStartDialog(const QString &toolName); DEBUGGER_EXPORT void enableMainWindow(bool on); // Convenience functions. -DEBUGGER_EXPORT void showStatusMessage(const QString &message, int timeoutMS = 10000); DEBUGGER_EXPORT void showPermanentStatusMessage(const QString &message); DEBUGGER_EXPORT QAction *createStartAction(); diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 86fe38bf21..0dd02e1b63 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -1740,7 +1740,7 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c case StatusBar: d->m_logWindow->showInput(LogMisc, msg); d->m_logWindow->showOutput(LogMisc, msg); - Debugger::showStatusMessage(msg, timeout); + DebuggerMainWindow::showStatusMessage(msg, timeout); break; case LogMiscInput: d->m_logWindow->showInput(LogMisc, msg); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index d953b5ef71..176639ff67 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2406,11 +2406,6 @@ void enableMainWindow(bool on) DebuggerMainWindow::instance()->setEnabled(on); } -void showStatusMessage(const QString &message, int timeoutMS) -{ - DebuggerMainWindow::showStatusMessage(message, timeoutMS); -} - void showPermanentStatusMessage(const QString &message) { DebuggerMainWindow::showStatusMessage(message, -1); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 142250b841..86c8119d9b 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -23,6 +23,7 @@ ** ****************************************************************************/ +#include "debuggermainwindow.h" #include "debuggerruncontrol.h" #include "terminal.h" @@ -701,9 +702,10 @@ void DebuggerRunTool::start() QString debuggerName = m_engine->objectName(); if (m_engine2) debuggerName += ' ' + m_engine2->objectName(); + const QString message = tr("Starting debugger \"%1\" for ABI \"%2\"...") .arg(debuggerName).arg(m_runParameters.toolChainAbi.toString()); - showStatusMessage(message); + DebuggerMainWindow::showStatusMessage(message, 10000); showMessage(m_engine->formatStartParameters(), LogDebug); showMessage(DebuggerSettings::dump(), LogDebug); |