debugger: more interface cleanup

Looks like DebuggerPlugin::mainWindow() was used after all.

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 111682d..cbf2f69 100644 (file)
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -3340,6 +3340,11 @@ bool DebuggerPlugin::isActiveDebugLanguage(int language)
     return theDebuggerCore->isActiveDebugLanguage(language);
 }
 
+DebuggerMainWindow *DebuggerPlugin::mainWindow()
+{
+    return theDebuggerCore->m_mainWindow;
+}
+
 QWidget *DebugMode::widget()
 {
     if (!m_widget) {

diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 211fdf1..625c9e5 100644 (file)
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -43,6 +43,7 @@ class RunControl;
 
 namespace Debugger {
 
+class DebuggerMainWindow;
 class DebuggerRunControl;
 class DebuggerStartParameters;
 
@@ -59,11 +60,15 @@ public:
     DebuggerPlugin();
     ~DebuggerPlugin();
 
+    // Used by Maemo debugging support.
     static DebuggerRunControl *createDebugger(const DebuggerStartParameters &sp,
         ProjectExplorer::RunConfiguration *rc = 0);
     static void startDebugger(ProjectExplorer::RunControl *runControl);
     static void displayDebugger(ProjectExplorer::RunControl *runControl);
+
+    // Used by QmlJSInspector.
     static bool isActiveDebugLanguage(int language);
+    static DebuggerMainWindow *mainWindow();
 
 private:
     // IPlugin implementation.

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
index 2c2e615..af85c55 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
@@ -54,7 +54,6 @@
 
 using namespace Core;
 using namespace Debugger;
-using namespace Debugger::Internal;
 using namespace ProjectExplorer;
 
 namespace Qt4ProjectManager {