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>

12 files changed, 42 insertions, 23 deletions

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
index 5af7a225fd..4d4e3aa720 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
@@ -38,8 +38,9 @@
 #include <QtGui/QStaticText>
 #include <QtQuick/QQuickWindow>
 
+QT_BEGIN_NAMESPACE
+
 namespace QmlJSDebugger {
-namespace QtQuick2 {
 
 Highlight::Highlight(QQuickItem *parent) : QQuickPaintedItem(parent)
 {
@@ -193,5 +194,6 @@ void SelectionHighlight::disableNameDisplay()
     update();
 }
 
-} // namespace QtQuick2
 } // namespace QmlJSDebugger
+
+QT_END_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
index 29d2f0d911..05f6382353 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
@@ -39,9 +39,9 @@
 #include <QtGui/QTransform>
 #include <QtQuick/QQuickPaintedItem>
 
+QT_BEGIN_NAMESPACE
 
 namespace QmlJSDebugger {
-namespace QtQuick2 {
 
 class Highlight : public QQuickPaintedItem
 {
@@ -104,7 +104,8 @@ public:
     void paint(QPainter *painter);
 };
 
-} // namespace QtQuick2
 } // namespace QmlJSDebugger
 
+QT_END_NAMESPACE
+
 #endif // HIGHLIGHT_H
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
index d5e54045fc..cc6b4ffb8c 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp
@@ -48,8 +48,9 @@
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickItem>
 
+QT_BEGIN_NAMESPACE
+
 namespace QmlJSDebugger {
-namespace QtQuick2 {
 
 static const double ZoomSnapDelta = 0.04;
 static const int PressAndHoldTimeout = 800;
@@ -421,5 +422,6 @@ void InspectTool::showSelectedItemName()
     inspector()->showSelectedItemName(m_lastItem, m_mousePosition);
 }
 
-} // namespace QtQuick2
 } // namespace QmlJSDebugger
+
+QT_END_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
index 0b1b49fd93..fdb763d4b3 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h
@@ -40,11 +40,12 @@
 #include <QtCore/QPointer>
 #include <QtCore/QTimer>
 
-QT_FORWARD_DECLARE_CLASS(QQuickView)
-QT_FORWARD_DECLARE_CLASS(QQuickItem)
+QT_BEGIN_NAMESPACE
+
+class QQuickView;
+class QQuickItem;
 
 namespace QmlJSDebugger {
-namespace QtQuick2 {
 
 class QQuickViewInspector;
 class HoverHighlight;
@@ -119,7 +120,8 @@ private:
     QQuickItem *m_lastClickedItem;
 };
 
-} // namespace QtQuick2
 } // namespace QmlJSDebugger
 
+QT_END_NAMESPACE
+
 #endif // INSPECTTOOL_H
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
index c5cf6c31d4..1506b04863 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
@@ -45,8 +45,8 @@
 
 #include <cfloat>
 
+QT_BEGIN_NAMESPACE
 namespace QmlJSDebugger {
-namespace QtQuick2 {
 
 /*
  * Collects all the items at the given position, from top to bottom.
@@ -372,5 +372,6 @@ void QQuickViewInspector::applyAppOnTop()
     setWindowFlags(flags);
 }
 
-} // namespace QtQuick2
 } // namespace QmlJSDebugger
+
+QT_END_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
index be3ede4d07..9a2ac4f373 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
@@ -43,10 +43,8 @@
 QT_BEGIN_NAMESPACE
 class QQuickView;
 class QQuickItem;
-QT_END_NAMESPACE
 
 namespace QmlJSDebugger {
-namespace QtQuick2 {
 
 class InspectTool;
 class SelectionHighlight;
@@ -104,7 +102,8 @@ private:
     bool m_appOnTop;
 };
 
-} // namespace QtQuick2
 } // namespace QmlJSDebugger
 
+QT_END_NAMESPACE
+
 #endif // QQUICKVIEWINSPECTOR_H
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
index 88801ec9db..2bfb0a3086 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
@@ -38,8 +38,9 @@
 #include <QtQml/private/qqmlinspectorservice_p.h>
 #include <QtQuick/QQuickView>
 
+QT_BEGIN_NAMESPACE
+
 namespace QmlJSDebugger {
-namespace QtQuick2 {
 
 QtQuick2Plugin::QtQuick2Plugin() :
     m_inspector(0)
@@ -74,5 +75,6 @@ void QtQuick2Plugin::clientMessage(const QByteArray &message)
         m_inspector->handleMessage(message);
 }
 
-} // namespace QtQuick2
 } // namespace QmlJSDebugger
+
+QT_END_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
index 6866e74aa1..6f4d7206c3 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
@@ -37,12 +37,12 @@
 #include <QtCore/QPointer>
 #include <QtQml/private/qqmlinspectorinterface_p.h>
 
+QT_BEGIN_NAMESPACE
+
 namespace QmlJSDebugger {
 
 class AbstractViewInspector;
 
-namespace QtQuick2 {
-
 class QtQuick2Plugin : public QObject, public QQmlInspectorInterface
 {
     Q_OBJECT
@@ -64,7 +64,8 @@ private:
     QPointer<AbstractViewInspector> m_inspector;
 };
 
-} // namespace QtQuick2
 } // namespace QmlJSDebugger
 
+QT_END_NAMESPACE
+
 #endif // QTQUICK2PLUGINPLUGIN_H
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