From 9107f0c5d0d22bf1d794a4723cbbbc7b031e5e9e Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 22 Sep 2010 09:59:18 +0200
Subject: [PATCH] QmlJSDebugger: Change namespace from QmlObserver to
 QmlJSDebugger

The library not only contains the observer part, but also the javascript
debugger. Reflect this in the namespace.
---
 .../qmljsdebugger/editor/abstractformeditortool.cpp         | 2 +-
 .../qtcreator/qmljsdebugger/editor/abstractformeditortool.h | 2 +-
 .../qmljsdebugger/editor/boundingrecthighlighter.cpp        | 4 ++--
 .../qmljsdebugger/editor/boundingrecthighlighter.h          | 4 ++--
 share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp    | 4 ++--
 share/qtcreator/qmljsdebugger/editor/colorpickertool.h      | 4 ++--
 share/qtcreator/qmljsdebugger/editor/layeritem.cpp          | 4 ++--
 share/qtcreator/qmljsdebugger/editor/layeritem.h            | 2 +-
 share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp         | 2 +-
 share/qtcreator/qmljsdebugger/editor/qmltoolbar.h           | 2 +-
 .../qmljsdebugger/editor/rubberbandselectionmanipulator.cpp | 2 +-
 .../qmljsdebugger/editor/rubberbandselectionmanipulator.h   | 2 +-
 share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp | 4 ++--
 share/qtcreator/qmljsdebugger/editor/selectionindicator.h   | 2 +-
 share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp | 2 +-
 share/qtcreator/qmljsdebugger/editor/selectionrectangle.h   | 2 +-
 share/qtcreator/qmljsdebugger/editor/selectiontool.cpp      | 2 +-
 share/qtcreator/qmljsdebugger/editor/selectiontool.h        | 2 +-
 .../qmljsdebugger/editor/singleselectionmanipulator.cpp     | 2 +-
 .../qmljsdebugger/editor/singleselectionmanipulator.h       | 2 +-
 .../qmljsdebugger/editor/subcomponenteditortool.cpp         | 4 ++--
 .../qtcreator/qmljsdebugger/editor/subcomponenteditortool.h | 4 ++--
 .../qmljsdebugger/editor/subcomponentmasklayeritem.cpp      | 4 ++--
 .../qmljsdebugger/editor/subcomponentmasklayeritem.h        | 4 ++--
 share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp    | 4 ++--
 share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h      | 4 ++--
 share/qtcreator/qmljsdebugger/editor/zoomtool.cpp           | 4 ++--
 share/qtcreator/qmljsdebugger/editor/zoomtool.h             | 4 ++--
 share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h     | 4 ++--
 .../qmljsdebugger/include/qdeclarativeobserverservice.h     | 6 +++---
 .../qmljsdebugger/include/qdeclarativeviewobserver.h        | 4 ++--
 .../qtcreator/qmljsdebugger/include/qmlobserverconstants.h  | 4 ++--
 share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp           | 4 ++--
 .../qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp | 6 +++---
 share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp  | 4 ++--
 share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h  | 4 ++--
 .../qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp    | 2 +-
 src/tools/qml/qmlobserver/qmlruntime.cpp                    | 6 +++---
 src/tools/qml/qmlobserver/qmlruntime.h                      | 4 ++--
 39 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp
index c8894539d94..557a3011120 100644
--- a/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.cpp
@@ -37,7 +37,7 @@
 #include <QGraphicsItem>
 #include <QDeclarativeItem>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 AbstractFormEditorTool::AbstractFormEditorTool(QDeclarativeViewObserver *editorView)
     : QObject(editorView), m_observer(editorView)
diff --git a/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h
index 18102862aa5..63f50c876f4 100644
--- a/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h
+++ b/share/qtcreator/qmljsdebugger/editor/abstractformeditortool.h
@@ -45,7 +45,7 @@ class QWheelEvent;
 class QDeclarativeView;
 QT_END_NAMESPACE
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class QDeclarativeViewObserver;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
index dd6db6a2b65..c1daee8b199 100644
--- a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.cpp
@@ -8,7 +8,7 @@
 
 #include <QDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 const qreal AnimDelta = 0.025f;
 const int AnimInterval = 30;
@@ -238,4 +238,4 @@ void BoundingRectHighlighter::refresh()
 }
 
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h
index b7403dbfb22..2463d78d2cd 100644
--- a/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h
+++ b/share/qtcreator/qmljsdebugger/editor/boundingrecthighlighter.h
@@ -12,7 +12,7 @@ QT_FORWARD_DECLARE_CLASS(QWidget);
 QT_FORWARD_DECLARE_CLASS(QStyleOptionGraphicsItem);
 QT_FORWARD_DECLARE_CLASS(QTimer);
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class QDeclarativeViewObserver;
 class BoundingBox;
@@ -73,6 +73,6 @@ public:
     int type() const;
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // BOUNDINGRECTHIGHLIGHTER_H
diff --git a/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp b/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp
index 84a78d96b6b..bf52075fc75 100644
--- a/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/colorpickertool.cpp
@@ -9,7 +9,7 @@
 #include <QApplication>
 #include <QPalette>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 ColorPickerTool::ColorPickerTool(QDeclarativeViewObserver *view) :
         AbstractFormEditorTool(view)
@@ -86,4 +86,4 @@ void ColorPickerTool::pickColor(const QPoint &pos)
     emit selectedColorChanged(m_selectedColor);
 }
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/editor/colorpickertool.h b/share/qtcreator/qmljsdebugger/editor/colorpickertool.h
index 660bb94c26a..748ad581aa8 100644
--- a/share/qtcreator/qmljsdebugger/editor/colorpickertool.h
+++ b/share/qtcreator/qmljsdebugger/editor/colorpickertool.h
@@ -7,7 +7,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QPoint);
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class ColorPickerTool : public AbstractFormEditorTool
 {
@@ -48,6 +48,6 @@ private:
 
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // COLORPICKERTOOL_H
diff --git a/share/qtcreator/qmljsdebugger/editor/layeritem.cpp b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
index 24b8bfeb9cb..285b3e3074e 100644
--- a/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/layeritem.cpp
@@ -32,7 +32,7 @@
 
 #include <QGraphicsScene>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 LayerItem::LayerItem(QGraphicsScene* scene)
             : QGraphicsObject()
@@ -75,4 +75,4 @@ QList<QGraphicsItem*> LayerItem::findAllChildItems(const QGraphicsItem *item) co
     return itemList;
 }
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/editor/layeritem.h b/share/qtcreator/qmljsdebugger/editor/layeritem.h
index 972bb366e46..c699cb8bc99 100644
--- a/share/qtcreator/qmljsdebugger/editor/layeritem.h
+++ b/share/qtcreator/qmljsdebugger/editor/layeritem.h
@@ -33,7 +33,7 @@
 #include <QGraphicsObject>
 #include <QWeakPointer>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class FormEditorScene;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
index 0cfaf744ee6..355a13b6c3d 100644
--- a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.cpp
@@ -8,7 +8,7 @@
 
 #include <QDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 QmlToolbar::QmlToolbar(QWidget *parent)
     : QToolBar(parent)
diff --git a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
index 73d204cd723..77685b9b4f5 100644
--- a/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
+++ b/share/qtcreator/qmljsdebugger/editor/qmltoolbar.h
@@ -5,7 +5,7 @@
 #include <QIcon>
 #include "qmlobserverconstants.h"
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class ToolBarColorBox;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
index 171d5d854fb..379ba98c44d 100644
--- a/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.cpp
@@ -32,7 +32,7 @@
 
 #include <QDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 RubberBandSelectionManipulator::RubberBandSelectionManipulator(QGraphicsObject *layerItem, QDeclarativeViewObserver *editorView)
     : m_selectionRectangleElement(layerItem),
diff --git a/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h
index 820dc97555d..e6815695775 100644
--- a/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h
+++ b/share/qtcreator/qmljsdebugger/editor/rubberbandselectionmanipulator.h
@@ -33,7 +33,7 @@
 
 #include "selectionrectangle.h"
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class QDeclarativeViewObserver;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
index b35e9354bfe..5782f2a5ee2 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectionindicator.cpp
@@ -36,7 +36,7 @@
 #include <QGraphicsScene>
 #include <QDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 SelectionIndicator::SelectionIndicator(QDeclarativeViewObserver *editorView, QGraphicsObject *layerItem)
     : m_layerItem(layerItem), m_view(editorView)
@@ -123,5 +123,5 @@ void SelectionIndicator::setItems(const QList<QWeakPointer<QGraphicsObject> > &i
     }
 }
 
-} //namespace QmlObserver
+} //namespace QmlJSDebugger
 
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionindicator.h b/share/qtcreator/qmljsdebugger/editor/selectionindicator.h
index dffd3d11f67..ecfeda86a0f 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionindicator.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectionindicator.h
@@ -34,7 +34,7 @@
 #include <QGraphicsPolygonItem>
 #include <QGraphicsObject>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class QDeclarativeViewObserver;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
index 1a100db7617..dc8ee26cce4 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.cpp
@@ -36,7 +36,7 @@
 #include <cmath>
 #include <QGraphicsScene>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class SelectionRectShape : public QGraphicsRectItem
 {
diff --git a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h
index d91e93626b4..03346d7bb96 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectionrectangle.h
@@ -34,7 +34,7 @@
 #include <QGraphicsRectItem>
 #include <QGraphicsObject>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class SelectionRectangle
 {
diff --git a/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp b/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp
index 492f258187e..b677a105771 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/selectiontool.cpp
@@ -46,7 +46,7 @@
 
 #include <QDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 SelectionTool::SelectionTool(QDeclarativeViewObserver *editorView)
     : AbstractFormEditorTool(editorView),
diff --git a/share/qtcreator/qmljsdebugger/editor/selectiontool.h b/share/qtcreator/qmljsdebugger/editor/selectiontool.h
index fa570fe5423..63461da296d 100644
--- a/share/qtcreator/qmljsdebugger/editor/selectiontool.h
+++ b/share/qtcreator/qmljsdebugger/editor/selectiontool.h
@@ -45,7 +45,7 @@ QT_FORWARD_DECLARE_CLASS(QGraphicsItem);
 QT_FORWARD_DECLARE_CLASS(QMouseEvent);
 QT_FORWARD_DECLARE_CLASS(QKeyEvent);
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class SelectionTool : public AbstractFormEditorTool
 {
diff --git a/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp
index 5dccd091d70..d0064815496 100644
--- a/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.cpp
@@ -32,7 +32,7 @@
 #include "qdeclarativeviewobserver_p.h"
 #include <QtDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 SingleSelectionManipulator::SingleSelectionManipulator(QDeclarativeViewObserver *editorView)
     : m_editorView(editorView),
diff --git a/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h
index 851c2c6e18a..e4ff0f346ac 100644
--- a/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h
+++ b/share/qtcreator/qmljsdebugger/editor/singleselectionmanipulator.h
@@ -35,7 +35,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QGraphicsItem);
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class QDeclarativeViewObserver;
 
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp
index e500a83bf6e..5089944ddba 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.cpp
@@ -12,7 +12,7 @@
 #include <QDebug>
 
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 const qreal MaxOpacity = 0.5f;
 
@@ -317,4 +317,4 @@ int SubcomponentEditorTool::contextIndex() const
 }
 
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h
index 2fe7a17a473..c1652ddb241 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponenteditortool.h
@@ -9,7 +9,7 @@ QT_FORWARD_DECLARE_CLASS(QGraphicsObject)
 QT_FORWARD_DECLARE_CLASS(QPoint)
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class SubcomponentMaskLayerItem;
 
@@ -78,6 +78,6 @@ private:
     QTimer *m_animTimer;
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // SUBCOMPONENTEDITORTOOL_H
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
index ade3638b4b4..1e8ff42466d 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.cpp
@@ -3,7 +3,7 @@
 #include "qdeclarativeviewobserver.h"
 #include <QPolygonF>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 SubcomponentMaskLayerItem::SubcomponentMaskLayerItem(QDeclarativeViewObserver *observer, QGraphicsItem *parentItem) :
     QGraphicsPolygonItem(parentItem),
@@ -77,4 +77,4 @@ QGraphicsItem *SubcomponentMaskLayerItem::currentItem() const
     return m_currentItem;
 }
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h
index 3b26732657f..37759ebf71b 100644
--- a/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h
+++ b/share/qtcreator/qmljsdebugger/editor/subcomponentmasklayeritem.h
@@ -3,7 +3,7 @@
 
 #include <QGraphicsPolygonItem>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class QDeclarativeViewObserver;
 
@@ -24,6 +24,6 @@ private:
     QRectF m_itemPolyRect;
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // SUBCOMPONENTMASKLAYERITEM_H
diff --git a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
index 5e295e7c1c4..dd6eb7e4a7e 100644
--- a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.cpp
@@ -14,7 +14,7 @@
 
 #include <QDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 ToolBarColorBox::ToolBarColorBox(QWidget *parent) :
     QLabel(parent)
@@ -93,4 +93,4 @@ void ToolBarColorBox::copyColorToClipboard()
 }
 
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h
index 7c0cc653067..d4be7921bb8 100644
--- a/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h
+++ b/share/qtcreator/qmljsdebugger/editor/toolbarcolorbox.h
@@ -8,7 +8,7 @@
 QT_FORWARD_DECLARE_CLASS(QContextMenuEvent);
 QT_FORWARD_DECLARE_CLASS(QAction);
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class ToolBarColorBox : public QLabel
 {
@@ -36,6 +36,6 @@ private:
 
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // ToolBarColorBox_H
diff --git a/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp b/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp
index 585ba476f15..2bb152e2d63 100644
--- a/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp
+++ b/share/qtcreator/qmljsdebugger/editor/zoomtool.cpp
@@ -10,7 +10,7 @@
 
 #include <QDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 ZoomTool::ZoomTool(QDeclarativeViewObserver *view) :
         AbstractFormEditorTool(view),
@@ -284,4 +284,4 @@ qreal ZoomTool::nextZoomScale(ZoomDirection direction) const
     return 1.0f;
 }
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/editor/zoomtool.h b/share/qtcreator/qmljsdebugger/editor/zoomtool.h
index f63bc230de9..299efee3ea3 100644
--- a/share/qtcreator/qmljsdebugger/editor/zoomtool.h
+++ b/share/qtcreator/qmljsdebugger/editor/zoomtool.h
@@ -6,7 +6,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QAction);
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class ZoomTool : public AbstractFormEditorTool
 {
@@ -60,6 +60,6 @@ private:
 
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // ZOOMTOOL_H
diff --git a/share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h b/share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h
index 83b806ca65e..89667d7193e 100644
--- a/share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h
+++ b/share/qtcreator/qmljsdebugger/include/jsdebuggeragent.h
@@ -64,7 +64,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QScriptContext);
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class JSAgentWatchData;
 
@@ -137,6 +137,6 @@ private:
     Q_DISABLE_COPY(JSDebuggerAgent)
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif
diff --git a/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
index 8a56829485e..121a847684e 100644
--- a/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativeobserverservice.h
@@ -54,7 +54,7 @@ QT_FORWARD_DECLARE_CLASS(QDeclarativeContext)
 QT_FORWARD_DECLARE_CLASS(QDeclarativeWatcher)
 QT_FORWARD_DECLARE_CLASS(QDataStream)
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class QMLJSDEBUGGER_EXPORT QDeclarativeObserverService : public QDeclarativeDebugService
 {
@@ -66,7 +66,7 @@ public:
     void setDesignModeBehavior(bool inDesignMode);
     void setCurrentObjects(QList<QObject*> items);
     void setAnimationSpeed(qreal slowdownFactor);
-    void setCurrentTool(QmlObserver::Constants::DesignTool toolId);
+    void setCurrentTool(QmlJSDebugger::Constants::DesignTool toolId);
     void reloaded();
     QString idStringForObject(QObject *obj) const;
 
@@ -105,6 +105,6 @@ private:
     QHash<int, QString> m_stringIdForObjectId;
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // QDECLARATIVEDESIGNDEBUGSERVER_H
diff --git a/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
index dc8ae50b69d..02aee970a20 100644
--- a/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
+++ b/share/qtcreator/qmljsdebugger/include/qdeclarativeviewobserver.h
@@ -39,7 +39,7 @@ QT_FORWARD_DECLARE_CLASS(QDeclarativeItem);
 QT_FORWARD_DECLARE_CLASS(QMouseEvent);
 QT_FORWARD_DECLARE_CLASS(QToolBar);
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class CrumblePath;
 class QDeclarativeViewObserverPrivate;
@@ -124,6 +124,6 @@ private:
 
 };
 
-} //namespace QmlObserver
+} //namespace QmlJSDebugger
 
 #endif // QDECLARATIVEVIEWOBSERVER_H
diff --git a/share/qtcreator/qmljsdebugger/include/qmlobserverconstants.h b/share/qtcreator/qmljsdebugger/include/qmlobserverconstants.h
index 72fcfe8472a..fd6db792214 100644
--- a/share/qtcreator/qmljsdebugger/include/qmlobserverconstants.h
+++ b/share/qtcreator/qmljsdebugger/include/qmlobserverconstants.h
@@ -1,7 +1,7 @@
 #ifndef QMLOBSERVERCONSTANTS_H
 #define QMLOBSERVERCONSTANTS_H
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 namespace Constants {
 
 enum DesignTool {
@@ -34,6 +34,6 @@ enum GraphicsItemTypes {
 
 
 } // namespace Constants
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // QMLOBSERVERCONSTANTS_H
diff --git a/share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp b/share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp
index 2381080e33d..e489be6b1d6 100644
--- a/share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp
+++ b/share/qtcreator/qmljsdebugger/jsdebuggeragent.cpp
@@ -50,7 +50,7 @@
 #include <QtCore/QDateTime>
 #include <QtScript/qscriptvalueiterator.h>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class JSDebuggerAgent::SetupExecEnv {
     JSDebuggerAgent* agent;
@@ -510,4 +510,4 @@ void JSDebuggerAgent::enabledChanged(bool on)
     QDeclarativeDebugService::enabledChanged(on);
 }
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp b/share/qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp
index a5a122774ae..16b5145e74a 100644
--- a/share/qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp
+++ b/share/qtcreator/qmljsdebugger/qdeclarativeobserverservice.cpp
@@ -46,7 +46,7 @@
 
 #include <QDebug>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 Q_GLOBAL_STATIC(QDeclarativeObserverService, serviceInstance)
 
@@ -174,7 +174,7 @@ void QDeclarativeObserverService::setCurrentObjects(QList<QObject*> objects)
     sendMessage(message);
 }
 
-void QDeclarativeObserverService::setCurrentTool(QmlObserver::Constants::DesignTool toolId)
+void QDeclarativeObserverService::setCurrentTool(QmlJSDebugger::Constants::DesignTool toolId)
 {
     QByteArray message;
     QDataStream ds(&message, QIODevice::WriteOnly);
@@ -236,4 +236,4 @@ QString QDeclarativeObserverService::idStringForObject(QObject *obj) const
     return idString;
 }
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
diff --git a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
index e5f6537bd0e..81cd9b018ba 100644
--- a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
+++ b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver.cpp
@@ -52,7 +52,7 @@
 #include <private/qdeclarativeengine_p.h>
 #include <private/qabstractanimation_p.h>
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 const int SceneChangeUpdateInterval = 5000;
 
@@ -799,6 +799,6 @@ void QDeclarativeViewObserver::setDebugMode(bool isDebugMode)
         data->jsDebuggerAgent = new JSDebuggerAgent(QDeclarativeEnginePrivate::getScriptEngine(data->view->engine()));
 }
 
-} //namespace QmlObserver
+} //namespace QmlJSDebugger
 
 #include <moc_qdeclarativeviewobserver.cpp>
diff --git a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h
index 5c2a640066b..a276c4350e2 100644
--- a/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h
+++ b/share/qtcreator/qmljsdebugger/qdeclarativeviewobserver_p.h
@@ -37,7 +37,7 @@
 #include "qdeclarativeviewobserver.h"
 #include "qdeclarativeobserverservice.h"
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
 
 class JSDebuggerAgent;
 class QDeclarativeViewObserver;
@@ -136,6 +136,6 @@ public:
     static QDeclarativeViewObserverPrivate *get(QDeclarativeViewObserver *v) { return v->d_func(); }
 };
 
-} // namespace QmlObserver
+} // namespace QmlJSDebugger
 
 #endif // QDECLARATIVEDESIGNVIEW_P_H
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
index 3ddb72003a2..2de38e5f446 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -51,7 +51,7 @@ QmlApplicationViewer::QmlApplicationViewer(QWidget *parent) :
     connect(engine(), SIGNAL(quit()), SLOT(close()));
     setResizeMode(QDeclarativeView::SizeRootObjectToView);
 #ifdef QMLOBSERVER
-    new QmlObserver::QDeclarativeViewObserver(this, parent);
+    new QmlJSDebugger::QDeclarativeViewObserver(this, parent);
 #endif
 }
 
diff --git a/src/tools/qml/qmlobserver/qmlruntime.cpp b/src/tools/qml/qmlobserver/qmlruntime.cpp
index 7b8c6afc769..6d4fe6c7a04 100644
--- a/src/tools/qml/qmlobserver/qmlruntime.cpp
+++ b/src/tools/qml/qmlobserver/qmlruntime.cpp
@@ -614,7 +614,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
     }
 
     canvas = new QDeclarativeView(this);
-    observer = new QmlObserver::QDeclarativeViewObserver(canvas, this);
+    observer = new QmlJSDebugger::QDeclarativeViewObserver(canvas, this);
     if (!(flags & Qt::FramelessWindowHint)) {
         m_crumblePathWidget = new Utils::CrumblePath(canvas);
 #ifndef Q_WS_MAC
@@ -794,10 +794,10 @@ void QDeclarativeViewer::createMenu()
     designModeBehaviorAction->setShortcut(QKeySequence("Ctrl+D"));
     designModeBehaviorAction->setCheckable(true);
     designModeBehaviorAction->setChecked(observer->designModeBehavior());
-    designModeBehaviorAction->setEnabled(QmlObserver::QDeclarativeObserverService::hasDebuggingClient());
+    designModeBehaviorAction->setEnabled(QmlJSDebugger::QDeclarativeObserverService::hasDebuggingClient());
     connect(designModeBehaviorAction, SIGNAL(triggered(bool)), this, SLOT(setDesignModeBehavior(bool)));
     connect(observer, SIGNAL(designModeBehaviorChanged(bool)), designModeBehaviorAction, SLOT(setChecked(bool)));
-    connect(QmlObserver::QDeclarativeObserverService::instance(), SIGNAL(debuggingClientChanged(bool)), designModeBehaviorAction, SLOT(setEnabled(bool)));
+    connect(QmlJSDebugger::QDeclarativeObserverService::instance(), SIGNAL(debuggingClientChanged(bool)), designModeBehaviorAction, SLOT(setEnabled(bool)));
 
     QAction *proxyAction = new QAction(tr("HTTP &Proxy..."), this);
     connect(proxyAction, SIGNAL(triggered()), this, SLOT(showProxySettings()));
diff --git a/src/tools/qml/qmlobserver/qmlruntime.h b/src/tools/qml/qmlobserver/qmlruntime.h
index 43e32f58d5b..a0a07f1888c 100644
--- a/src/tools/qml/qmlobserver/qmlruntime.h
+++ b/src/tools/qml/qmlobserver/qmlruntime.h
@@ -49,7 +49,7 @@
 
 #include "loggerwidget.h"
 
-namespace QmlObserver {
+namespace QmlJSDebugger {
     class QDeclarativeViewObserver;
 }
 namespace Utils {
@@ -168,7 +168,7 @@ private:
     LoggerWidget *loggerWindow;
 
     QDeclarativeView *canvas;
-    QmlObserver::QDeclarativeViewObserver *observer;
+    QmlJSDebugger::QDeclarativeViewObserver *observer;
     QSize initialSize;
     QString currentFileOrUrl;
     QTimer recordTimer;