diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-15 17:54:11 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 08:51:50 +0000 |
| commit | aaf163b942470c6a1f4a15e43a26e3b13a5761bb (patch) | |
| tree | defa60f7359e8fee1c2f2f6c58df91ec3339e762 /src/plugins/qmltooling/shared | |
| parent | be89ee26dc827105777ceb22db2a179461328a20 (diff) | |
Fix namespaces in inspector plugin
Defining things outside the Qt namespace and then accessing Qt
internals is just asking for trouble. The redundant QtQuick2
namespace can be dropped, though.
Change-Id: Ifa83733a3f98704b7b51697dbca9486d0f504f65
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling/shared')
4 files changed, 12 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/shared/abstracttool.cpp b/src/plugins/qmltooling/shared/abstracttool.cpp index 990bc704b9..3e059bed13 100644 --- a/src/plugins/qmltooling/shared/abstracttool.cpp +++ b/src/plugins/qmltooling/shared/abstracttool.cpp @@ -35,6 +35,8 @@ #include "abstractviewinspector.h" +QT_BEGIN_NAMESPACE + namespace QmlJSDebugger { AbstractTool::AbstractTool(AbstractViewInspector *inspector) : @@ -44,3 +46,5 @@ AbstractTool::AbstractTool(AbstractViewInspector *inspector) : } } // namespace QmlJSDebugger + +QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/shared/abstracttool.h b/src/plugins/qmltooling/shared/abstracttool.h index 85f2b5b9ad..c796925866 100644 --- a/src/plugins/qmltooling/shared/abstracttool.h +++ b/src/plugins/qmltooling/shared/abstracttool.h @@ -41,7 +41,6 @@ class QMouseEvent; class QKeyEvent; class QWheelEvent; class QTouchEvent; -QT_END_NAMESPACE namespace QmlJSDebugger { @@ -81,4 +80,6 @@ private: } // namespace QmlJSDebugger +QT_END_NAMESPACE + #endif // ABSTRACTTOOL_H diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp index c32a297d6a..10957d2360 100644 --- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp @@ -61,6 +61,8 @@ // clearCache: void // Response for "destroyObject" carries the <debugId_int> of the destroyed object. +QT_BEGIN_NAMESPACE + const char REQUEST[] = "request"; const char RESPONSE[] = "response"; const char EVENT[] = "event"; @@ -414,3 +416,5 @@ void AbstractViewInspector::removeTool(AbstractTool *tool) } } // namespace QmlJSDebugger + +QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h index 70226d7cb1..8958e941b3 100644 --- a/src/plugins/qmltooling/shared/abstractviewinspector.h +++ b/src/plugins/qmltooling/shared/abstractviewinspector.h @@ -46,8 +46,6 @@ class QMouseEvent; class QWheelEvent; class QTouchEvent; -QT_END_NAMESPACE - namespace QmlJSDebugger { class AbstractTool; @@ -123,4 +121,6 @@ private: } // namespace QmlJSDebugger +QT_END_NAMESPACE + #endif // ABSTRACTVIEWINSPECTOR_H |