From a4760b716e0731bb9248480b4fdb75daaf41a16a Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 20 Oct 2009 17:43:06 +0200
Subject: [PATCH] centralize message box handling in adapters
---
src/plugins/debugger/gdb/abstractgdbadapter.h | 2 ++
src/plugins/debugger/gdb/remotegdbadapter.cpp | 2 +-
src/plugins/debugger/gdb/termgdbadapter.cpp | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.h b/src/plugins/debugger/gdb/abstractgdbadapter.h
index 7fed63fc8c3..83a76682b04 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.h
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.h
@@ -99,6 +99,8 @@ protected:
{ m_engine->debugMessage(msg); }
void showStatusMessage(const QString &msg) const
{ m_engine->showStatusMessage(msg); }
+ void showMessageBox(int icon, const QString &title, const QString &text) const
+ { m_engine->showMessageBox(icon, title, text); }
GdbEngine * const m_engine;
};
diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp
index 617141eb2a3..e79c0942189 100644
--- a/src/plugins/debugger/gdb/remotegdbadapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp
@@ -119,7 +119,7 @@ void RemoteGdbAdapter::uploadProcError(QProcess::ProcessError error)
}
m_engine->showStatusMessage(msg);
- QMessageBox::critical(m_engine->mainWindow(), tr("Error"), msg);
+ showMessageBox(QMessageBox::Critical, tr("Error"), msg);
}
void RemoteGdbAdapter::readUploadStandardOutput()
diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp
index e7769fac397..9ab469c7a06 100644
--- a/src/plugins/debugger/gdb/termgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/termgdbadapter.cpp
@@ -147,7 +147,7 @@ void TermGdbAdapter::shutdown()
void TermGdbAdapter::stubError(const QString &msg)
{
- QMessageBox::critical(m_engine->mainWindow(), tr("Debugger Error"), msg);
+ showMessageBox(QMessageBox::Critical, tr("Debugger Error"), msg);
}
void TermGdbAdapter::stubExited()
--
GitLab