diff options
Diffstat (limited to 'src/declarative/debugger')
16 files changed, 1 insertions, 61 deletions
diff --git a/src/declarative/debugger/qdeclarativedebug.h b/src/declarative/debugger/qdeclarativedebug.h index ff021850..b4250604 100644 --- a/src/declarative/debugger/qdeclarativedebug.h +++ b/src/declarative/debugger/qdeclarativedebug.h @@ -44,8 +44,6 @@ #include <QtDeclarative/qtdeclarativeglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -62,6 +60,4 @@ static QDeclarativeDebuggingEnabler qmlEnableDebuggingHelper; QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUG_H diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h index 5332d5df..79046749 100644 --- a/src/declarative/debugger/qdeclarativedebugclient_p.h +++ b/src/declarative/debugger/qdeclarativedebugclient_p.h @@ -46,8 +46,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -98,6 +96,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUGCLIENT_H diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h index 3a9b2108..f9670608 100644 --- a/src/declarative/debugger/qdeclarativedebuggerstatus_p.h +++ b/src/declarative/debugger/qdeclarativedebuggerstatus_p.h @@ -46,8 +46,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -66,6 +64,4 @@ Q_DECLARE_INTERFACE(QDeclarativeDebuggerStatus, QDeclarativeDebuggerStatus_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QLMDEBUGGERSTATUS_P_H diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/declarative/debugger/qdeclarativedebughelper_p.h index e72501ee..f05666ca 100644 --- a/src/declarative/debugger/qdeclarativedebughelper_p.h +++ b/src/declarative/debugger/qdeclarativedebughelper_p.h @@ -44,8 +44,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QScriptEngine; @@ -66,6 +64,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUGHELPER_P_H diff --git a/src/declarative/debugger/qdeclarativedebugserver_p.h b/src/declarative/debugger/qdeclarativedebugserver_p.h index 533d3d36..3adfc560 100644 --- a/src/declarative/debugger/qdeclarativedebugserver_p.h +++ b/src/declarative/debugger/qdeclarativedebugserver_p.h @@ -45,8 +45,6 @@ #include <private/qdeclarativeglobal_p.h> #include <private/qdeclarativedebugserverconnection_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUGSERVICE_H diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h index 87ea9a8e..403ee520 100644 --- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h +++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h @@ -56,8 +56,6 @@ // We mean it. // -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -83,6 +81,4 @@ Q_DECLARE_INTERFACE(QDeclarativeDebugServerConnection, QDeclarativeDebugServerCo QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUGSERVERCONNECTION_H diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h index 98ac7ea9..8961f0f6 100644 --- a/src/declarative/debugger/qdeclarativedebugservice_p.h +++ b/src/declarative/debugger/qdeclarativedebugservice_p.h @@ -46,8 +46,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -90,7 +88,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUGSERVICE_H diff --git a/src/declarative/debugger/qdeclarativedebugservice_p_p.h b/src/declarative/debugger/qdeclarativedebugservice_p_p.h index 35b83f0e..56e3b851 100644 --- a/src/declarative/debugger/qdeclarativedebugservice_p_p.h +++ b/src/declarative/debugger/qdeclarativedebugservice_p_p.h @@ -45,8 +45,6 @@ #include <QtCore/qglobal.h> #include <private/qobject_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -66,6 +64,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUGSERVICE_P_H diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h index f968f46d..ba210a7f 100644 --- a/src/declarative/debugger/qdeclarativedebugtrace_p.h +++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h @@ -47,8 +47,6 @@ #include <private/qdeclarativedebugservice_p.h> #include <qelapsedtimer.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct QDeclarativeDebugData @@ -144,7 +142,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUGTRACE_P_H diff --git a/src/declarative/debugger/qdeclarativeenginedebug_p.h b/src/declarative/debugger/qdeclarativeenginedebug_p.h index b802d36f..c16dddf5 100644 --- a/src/declarative/debugger/qdeclarativeenginedebug_p.h +++ b/src/declarative/debugger/qdeclarativeenginedebug_p.h @@ -47,8 +47,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -389,6 +387,4 @@ Q_DECLARE_METATYPE(QDeclarativeDebugObjectReference) Q_DECLARE_METATYPE(QDeclarativeDebugContextReference) Q_DECLARE_METATYPE(QDeclarativeDebugPropertyReference) -QT_END_HEADER - #endif // QDECLARATIVEENGINEDEBUG_H diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp index d97349ed..5ee064a2 100644 --- a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp +++ b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp @@ -518,7 +518,7 @@ void QDeclarativeEngineDebugService::messageReceived(const QByteArray &message) QVariant expr; bool isLiteralValue; QString filename; - int line; + int line = 0; ds >> objectId >> propertyName >> expr >> isLiteralValue; if (!ds.atEnd()) { // backward compatibility from 2.1, 2.2 ds >> filename >> line; diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h index 3596460b..685d7097 100644 --- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h @@ -44,8 +44,6 @@ #include <QtDeclarative/private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -66,6 +64,4 @@ Q_DECLARE_INTERFACE(QDeclarativeInspectorInterface, QDeclarativeInspectorInterfa QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEOBSERVERINTERFACE_H diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h index 2aabf3c7..4c39968e 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h @@ -47,8 +47,6 @@ #include <QtCore/QList> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -88,6 +86,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEOBSERVERSERVICE_H diff --git a/src/declarative/debugger/qjsdebuggeragent_p.h b/src/declarative/debugger/qjsdebuggeragent_p.h index decc7010..5a2ed140 100644 --- a/src/declarative/debugger/qjsdebuggeragent_p.h +++ b/src/declarative/debugger/qjsdebuggeragent_p.h @@ -62,8 +62,6 @@ class QScriptValue; class QDeclarativeEngine; QT_END_NAMESPACE -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -225,6 +223,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QJSDEBUGGERAGENT_P_H diff --git a/src/declarative/debugger/qjsdebugservice_p.h b/src/declarative/debugger/qjsdebugservice_p.h index 8f89f592..b7240e31 100644 --- a/src/declarative/debugger/qjsdebugservice_p.h +++ b/src/declarative/debugger/qjsdebugservice_p.h @@ -58,8 +58,6 @@ #include "private/qdeclarativedebugservice_p.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -118,6 +116,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QJSDEBUGSERVICE_P_H diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/declarative/debugger/qpacketprotocol_p.h index 1a1e1464..ba8d200e 100644 --- a/src/declarative/debugger/qpacketprotocol_p.h +++ b/src/declarative/debugger/qpacketprotocol_p.h @@ -47,8 +47,6 @@ #include <private/qtdeclarativeglobal_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -122,6 +120,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif |