From a82b40e037417300309942575f2fa0d4fca4460c Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 19 Sep 2019 16:41:14 +0200
Subject: Debugger: Move convenience function to only user

Change-Id: I50952521bdd45faa8a31da674e7ea5f0796d75d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/debuggercore.h     |  4 ----
 src/plugins/debugger/debuggerplugin.cpp | 11 -----------
 src/plugins/debugger/gdb/gdbengine.cpp  | 11 +++++++++++
 3 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/plugins/debugger')

diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h
index f14884d3e3..af0de1c25b 100644
--- a/src/plugins/debugger/debuggercore.h
+++ b/src/plugins/debugger/debuggercore.h
@@ -36,7 +36,6 @@
 #include <functional>
 
 QT_BEGIN_NAMESPACE
-class QMessageBox;
 class QWidget;
 class QMenu;
 class QAction;
@@ -71,9 +70,6 @@ bool boolSetting(int code);
 QString stringSetting(int code);
 QStringList stringListSetting(int code);
 
-QMessageBox *showMessageBox(int icon, const QString &title,
-    const QString &text, int buttons = 0);
-
 QAction *addAction(QMenu *menu, const QString &display, bool on,
                    const std::function<void()> &onTriggered = {});
 QAction *addAction(QMenu *menu, const QString &d1, const QString &d2, bool on,
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index b224572bba..50ac0504a7 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2029,17 +2029,6 @@ void DebuggerPluginPrivate::remoteCommand(const QStringList &options)
     runScheduled();
 }
 
-QMessageBox *showMessageBox(int icon, const QString &title, const QString &text, int buttons)
-{
-    QMessageBox *mb = new QMessageBox(QMessageBox::Icon(icon),
-        title, text, QMessageBox::StandardButtons(buttons),
-        ICore::mainWindow());
-    mb->setAttribute(Qt::WA_DeleteOnClose);
-    mb->setTextInteractionFlags(Qt::TextSelectableByMouse);
-    mb->show();
-    return mb;
-}
-
 void addDebugInfoTask(unsigned id, const QString &cmd)
 {
     dd->m_debugInfoTaskHandler.addTask(id, cmd);
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index dda518ceea..ff0197c225 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -103,6 +103,17 @@ static bool isMostlyHarmlessMessage(const QStringRef &msg)
                   "Invalid argument\\n";
 }
 
+static QMessageBox *showMessageBox(QMessageBox::Icon icon,
+                                   const QString &title, const QString &text,
+                                   QMessageBox::StandardButtons buttons)
+{
+    auto mb = new QMessageBox(icon, title, text, buttons, ICore::mainWindow());
+    mb->setAttribute(Qt::WA_DeleteOnClose);
+    mb->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    mb->show();
+    return mb;
+}
+
 ///////////////////////////////////////////////////////////////////////
 //
 // GdbEngine
-- 
cgit v1.2.1