Debugger: Move DebuggerEngine/QmlEngine/QmlCppEngine into Debugger{}

namespace (from Debugger::Internal) as they are exported classes.
Introduce private classes to avoid exposing private JS debugger
headers.

1 files changed, 18 insertions, 8 deletions

diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index a438b16eba1..41d084aa8b3 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -404,22 +404,22 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams
             initGdbEngine(qobject_cast<Internal::GdbEngine *>(m_engine));
             break;
         case ScriptEngineType:
-            m_engine = createScriptEngine(sp);
+            m_engine = Internal::createScriptEngine(sp);
             break;
         case CdbEngineType:
-            m_engine = createCdbEngine(sp);
+            m_engine = Internal::createCdbEngine(sp);
             break;
         case PdbEngineType:
-            m_engine = createPdbEngine(sp);
+            m_engine = Internal::createPdbEngine(sp);
             break;
         case TcfEngineType:
-            m_engine = createTcfEngine(sp);
+            m_engine = Internal::createTcfEngine(sp);
             break;
         case QmlEngineType:
-            m_engine = createQmlEngine(sp);
+            m_engine = Internal::createQmlEngine(sp);
             break;
         case QmlCppEngineType:
-            m_engine = createQmlCppEngine(sp);
+            m_engine = Internal::createQmlCppEngine(sp);
             if (Internal::GdbEngine *embeddedGdbEngine = gdbEngine())
                 initGdbEngine(embeddedGdbEngine);
             break;
@@ -608,7 +608,7 @@ DebuggerState DebuggerRunControl::state() const
     return m_engine->state();
 }
 
-Internal::DebuggerEngine *DebuggerRunControl::engine()
+DebuggerEngine *DebuggerRunControl::engine()
 {
     QTC_ASSERT(m_engine, /**/);
     return m_engine;
@@ -620,7 +620,7 @@ Internal::GdbEngine *DebuggerRunControl::gdbEngine() const
     if (GdbEngine *gdbEngine = qobject_cast<GdbEngine *>(m_engine))
         return gdbEngine;
     if (QmlCppEngine * const qmlEngine = qobject_cast<QmlCppEngine *>(m_engine))
-        if (GdbEngine *embeddedGdbEngine = qobject_cast<GdbEngine *>(qmlEngine->cppEngine()))
+        if (Internal::GdbEngine *embeddedGdbEngine = qobject_cast<GdbEngine *>(qmlEngine->cppEngine()))
             return embeddedGdbEngine;
     return 0;
 }
@@ -657,4 +657,14 @@ void DebuggerRunControl::remoteGdbHandleSetupFailed(const QString &message)
         QTC_ASSERT(false, /* */ );
     }
 }
+
+void DebuggerRunControl::emitAddToOutputWindow(const QString &line, bool onStdErr)
+{
+    emit addToOutputWindow(this, line, onStdErr);
+}
+
+void DebuggerRunControl::emitAppendMessage(const QString &m, bool isError)
+{
+    emit appendMessage(this, m, isError);
+}
 } // namespace Debugger