Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
d9210302
Commit
d9210302
authored
Dec 03, 2010
by
hjk
Browse files
debugger: mover qml related engines to the Internal namespace
parent
4c5f78de
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggerengine.h
View file @
d9210302
...
...
@@ -60,7 +60,6 @@ namespace Debugger {
class
DebuggerEnginePrivate
;
class
DebuggerRunControl
;
class
QmlCppEngine
;
class
DEBUGGER_EXPORT
DebuggerStartParameters
{
...
...
@@ -132,6 +131,7 @@ class SourceFilesHandler;
class
ThreadsHandler
;
class
WatchHandler
;
class
BreakpointParameters
;
class
QmlCppEngine
;
struct
WatchUpdateFlags
{
...
...
@@ -349,7 +349,7 @@ protected:
private:
// Wrapper engine needs access to state of its subengines.
friend
class
QmlCppEngine
;
friend
class
Internal
::
QmlCppEngine
;
void
setState
(
DebuggerState
state
,
bool
forced
=
false
);
void
setSlaveEngine
(
bool
value
);
...
...
src/plugins/debugger/qml/qmlcppengine.cpp
View file @
d9210302
...
...
@@ -33,9 +33,9 @@ public:
QmlCppEnginePrivate
();
~
QmlCppEnginePrivate
()
{}
friend
class
Debugger
::
QmlCppEngine
;
friend
class
QmlCppEngine
;
private:
Qml
Engine
*
m_qmlEngine
;
Debugger
Engine
*
m_qmlEngine
;
DebuggerEngine
*
m_cppEngine
;
DebuggerEngine
*
m_activeEngine
;
DebuggerState
m_errorState
;
...
...
@@ -48,20 +48,17 @@ QmlCppEnginePrivate::QmlCppEnginePrivate()
m_errorState
(
InferiorRunOk
)
{}
}
// namespace Internal
using
namespace
Internal
;
QmlCppEngine
::
QmlCppEngine
(
const
DebuggerStartParameters
&
sp
)
:
DebuggerEngine
(
sp
),
d
(
new
QmlCppEnginePrivate
)
{
d
->
m_qmlEngine
=
qobject_cast
<
QmlEngine
*>
(
Internal
::
createQmlEngine
(
sp
)
)
;
d
->
m_qmlEngine
=
createQmlEngine
(
sp
);
if
(
startParameters
().
cppEngineType
==
GdbEngineType
)
{
d
->
m_cppEngine
=
Internal
::
createGdbEngine
(
sp
);
d
->
m_cppEngine
=
createGdbEngine
(
sp
);
}
else
{
QString
errorMessage
;
d
->
m_cppEngine
=
Internal
::
createCdbEngine
(
sp
,
&
errorMessage
);
d
->
m_cppEngine
=
createCdbEngine
(
sp
,
&
errorMessage
);
if
(
!
d
->
m_cppEngine
)
{
qWarning
(
"%s"
,
qPrintable
(
errorMessage
));
return
;
...
...
@@ -239,7 +236,7 @@ void QmlCppEngine::updateAll()
void
QmlCppEngine
::
attemptBreakpointSynchronization
()
{
d
->
m_cppEngine
->
attemptBreakpointSynchronization
();
static_cast
<
DebuggerEngine
*>
(
d
->
m_qmlEngine
)
->
attemptBreakpointSynchronization
();
d
->
m_qmlEngine
->
attemptBreakpointSynchronization
();
}
bool
QmlCppEngine
::
acceptsBreakpoint
(
BreakpointId
id
)
const
...
...
@@ -642,5 +639,5 @@ DebuggerEngine *QmlCppEngine::cppEngine() const
return
d
->
m_cppEngine
;
}
}
// namespace Internal
}
// namespace Debugger
src/plugins/debugger/qml/qmlcppengine.h
View file @
d9210302
...
...
@@ -10,10 +10,9 @@ class IEditor;
}
namespace
Debugger
{
namespace
Internal
{
class
QmlCppEnginePrivate
;
}
// namespace Internal
class
DEBUGGER_EXPORT
QmlCppEngine
:
public
DebuggerEngine
{
...
...
@@ -27,13 +26,13 @@ public:
virtual
void
setToolTipExpression
(
const
QPoint
&
mousePos
,
TextEditor
::
ITextEditor
*
editor
,
int
cursorPos
);
virtual
void
updateWatchData
(
const
Internal
::
WatchData
&
data
,
const
Internal
::
WatchUpdateFlags
&
flags
);
virtual
void
updateWatchData
(
const
WatchData
&
data
,
const
WatchUpdateFlags
&
flags
);
virtual
void
watchPoint
(
const
QPoint
&
);
virtual
void
fetchMemory
(
Internal
::
MemoryViewAgent
*
,
QObject
*
,
virtual
void
fetchMemory
(
MemoryViewAgent
*
,
QObject
*
,
quint64
addr
,
quint64
length
);
virtual
void
fetchDisassembler
(
Internal
::
DisassemblerViewAgent
*
);
virtual
void
fetchDisassembler
(
DisassemblerViewAgent
*
);
virtual
void
activateFrame
(
int
index
);
virtual
void
reloadModules
();
...
...
@@ -59,7 +58,7 @@ public:
virtual
bool
acceptsBreakpoint
(
BreakpointId
id
)
const
;
virtual
void
selectThread
(
int
index
);
virtual
void
assignValueInDebugger
(
const
Internal
::
WatchData
*
data
,
virtual
void
assignValueInDebugger
(
const
WatchData
*
data
,
const
QString
&
expr
,
const
QVariant
&
value
);
QAbstractItemModel
*
modulesModel
()
const
;
...
...
@@ -114,9 +113,10 @@ private:
void
engineStateChanged
(
const
DebuggerState
&
newState
);
private:
QScopedPointer
<
Internal
::
QmlCppEnginePrivate
>
d
;
QScopedPointer
<
QmlCppEnginePrivate
>
d
;
};
}
// namespace Internal
}
// namespace Debugger
#endif // QMLGDBENGINE_H
src/plugins/debugger/qml/qmlengine.cpp
View file @
d9210302
...
...
@@ -149,8 +149,8 @@ public:
explicit
QmlEnginePrivate
(
QmlEngine
*
q
);
~
QmlEnginePrivate
()
{
delete
m_adapter
;
}
friend
class
Debugger
::
QmlEngine
;
private:
friend
class
QmlEngine
;
int
m_ping
;
QmlAdapter
*
m_adapter
;
ProjectExplorer
::
ApplicationLauncher
m_applicationLauncher
;
...
...
@@ -160,9 +160,6 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *q)
:
m_ping
(
0
),
m_adapter
(
new
QmlAdapter
(
q
))
{}
}
// namespace Internal
using
namespace
Internal
;
///////////////////////////////////////////////////////////////////////
//
...
...
@@ -177,8 +174,7 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters)
}
QmlEngine
::~
QmlEngine
()
{
}
{}
void
QmlEngine
::
gotoLocation
(
const
QString
&
fileName
,
int
lineNumber
,
bool
setMarker
)
{
...
...
@@ -867,5 +863,6 @@ QString QmlEngine::fromShadowBuildFilename(const QString &filename) const
return
newFilename
;
}
}
// namespace Internal
}
// namespace Debugger
src/plugins/debugger/qml/qmlengine.h
View file @
d9210302
...
...
@@ -36,24 +36,23 @@
#include <QtNetwork/QAbstractSocket>
namespace
Debugger
{
namespace
Internal
{
class
QmlEnginePrivate
;
}
// namespace Internal
class
DEBUGGER_EXPORT
QmlEngine
:
public
DebuggerEngine
class
QmlEngine
:
public
DebuggerEngine
{
Q_OBJECT
public:
explicit
QmlEngine
(
const
DebuggerStartParameters
&
startParameters
);
virtual
~
QmlEngine
();
~
QmlEngine
();
void
handleRemoteSetupDone
(
int
port
);
void
handleRemoteSetupFailed
(
const
QString
&
message
);
void
gotoLocation
(
const
QString
&
fileName
,
int
lineNumber
,
bool
setMarker
);
void
gotoLocation
(
const
Internal
::
StackFrame
&
frame
,
bool
setMarker
);
void
gotoLocation
(
const
StackFrame
&
frame
,
bool
setMarker
);
void
pauseConnection
();
...
...
@@ -65,7 +64,7 @@ signals:
void
remoteStartupRequested
();
private:
// DebuggerEngine implementation
// DebuggerEngine implementation
.
bool
isSynchronous
()
const
{
return
false
;
}
void
executeStep
();
void
executeStepOut
();
...
...
@@ -95,7 +94,7 @@ private:
void
attemptBreakpointSynchronization
();
bool
acceptsBreakpoint
(
BreakpointId
id
)
const
;
void
assignValueInDebugger
(
const
Internal
::
WatchData
*
data
,
void
assignValueInDebugger
(
const
WatchData
*
data
,
const
QString
&
expr
,
const
QVariant
&
value
);
void
loadSymbols
(
const
QString
&
moduleName
);
void
loadAllSymbols
();
...
...
@@ -106,8 +105,8 @@ private:
void
reloadFullStack
()
{}
bool
supportsThreads
()
const
{
return
false
;
}
void
updateWatchData
(
const
Internal
::
WatchData
&
data
,
const
Internal
::
WatchUpdateFlags
&
flags
);
void
updateWatchData
(
const
WatchData
&
data
,
const
WatchUpdateFlags
&
flags
);
void
executeDebuggerCommand
(
const
QString
&
command
);
unsigned
int
debuggerCapabilities
()
const
;
...
...
@@ -141,9 +140,10 @@ private:
private:
friend
class
QmlCppEngine
;
QScopedPointer
<
Internal
::
QmlEnginePrivate
>
d
;
QScopedPointer
<
QmlEnginePrivate
>
d
;
};
}
// namespace Internal
}
// namespace Debugger
#endif // DEBUGGER_QMLENGINE_H
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment