Commit 585bb50d authored by hjk's avatar hjk

debugger: move qml engine private classes to internal namespace

parent 7fbff9c3
......@@ -10,11 +10,10 @@
#include <QtCore/QTimer>
namespace Debugger {
namespace Internal {
const int ConnectionWaitTimeMs = 5000;
namespace Internal {
DebuggerEngine *createCdbEngine(const DebuggerStartParameters &, QString *);
DebuggerEngine *createGdbEngine(const DebuggerStartParameters &);
DebuggerEngine *createQmlEngine(const DebuggerStartParameters &);
......@@ -28,14 +27,13 @@ DebuggerEngine *createQmlCppEngine(const DebuggerStartParameters &sp)
return 0;
}
} // namespace Internal
class QmlCppEnginePrivate {
class QmlCppEnginePrivate
{
public:
QmlCppEnginePrivate();
~QmlCppEnginePrivate() {}
friend class QmlCppEngine;
friend class Debugger::QmlCppEngine;
private:
QmlEngine *m_qmlEngine;
DebuggerEngine *m_cppEngine;
......@@ -43,13 +41,16 @@ private:
DebuggerState m_errorState;
};
QmlCppEnginePrivate::QmlCppEnginePrivate() :
m_qmlEngine(0),
QmlCppEnginePrivate::QmlCppEnginePrivate()
: m_qmlEngine(0),
m_cppEngine(0),
m_activeEngine(0),
m_errorState(InferiorRunOk)
{
}
{}
} // namespace Internal
using namespace Internal;
QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp)
: DebuggerEngine(sp), d(new QmlCppEnginePrivate)
......@@ -640,4 +641,5 @@ DebuggerEngine *QmlCppEngine::cppEngine() const
return d->m_cppEngine;
}
} // namespace Debugger
......@@ -11,7 +11,9 @@ class IEditor;
namespace Debugger {
namespace Internal {
class QmlCppEnginePrivate;
} // namespace Internal
class DEBUGGER_EXPORT QmlCppEngine : public DebuggerEngine
{
......@@ -112,7 +114,7 @@ private:
void engineStateChanged(const DebuggerState &newState);
private:
QScopedPointer<QmlCppEnginePrivate> d;
QScopedPointer<Internal::QmlCppEnginePrivate> d;
};
} // namespace Debugger
......
......@@ -141,27 +141,27 @@ static QDataStream &operator>>(QDataStream &s, StackFrame &frame)
return s;
}
} // namespace Internal
using namespace Internal;
class QmlEnginePrivate {
class QmlEnginePrivate
{
public:
explicit QmlEnginePrivate(QmlEngine *q);
~QmlEnginePrivate() { delete m_adapter; }
friend class QmlEngine;
friend class Debugger::QmlEngine;
private:
int m_ping;
QmlAdapter *m_adapter;
ProjectExplorer::ApplicationLauncher m_applicationLauncher;
};
QmlEnginePrivate::QmlEnginePrivate(QmlEngine *q) :
m_ping(0)
, m_adapter(new QmlAdapter(q))
{
}
QmlEnginePrivate::QmlEnginePrivate(QmlEngine *q)
: m_ping(0), m_adapter(new QmlAdapter(q))
{}
} // namespace Internal
using namespace Internal;
///////////////////////////////////////////////////////////////////////
//
......@@ -177,7 +177,6 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters)
QmlEngine::~QmlEngine()
{
delete d->m_adapter;
}
void QmlEngine::gotoLocation(const QString &fileName, int lineNumber, bool setMarker)
......
......@@ -36,9 +36,10 @@
#include <QtNetwork/QAbstractSocket>
namespace Debugger {
class QmlAdapter;
namespace Internal {
class QmlEnginePrivate;
} // namespace Internal
class DEBUGGER_EXPORT QmlEngine : public DebuggerEngine
{
......@@ -140,7 +141,7 @@ private:
private:
friend class QmlCppEngine;
QScopedPointer<QmlEnginePrivate> d;
QScopedPointer<Internal::QmlEnginePrivate> d;
};
} // namespace Debugger
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment