aboutsummaryrefslogtreecommitdiffstats
path: root/src/tools/qml
diff options
context:
space:
mode:
authorKai Koehne <[email protected]>2010-09-22 09:59:18 +0200
committerKai Koehne <[email protected]>2010-09-22 15:44:13 +0200
commit9107f0c5d0d22bf1d794a4723cbbbc7b031e5e9e (patch)
tree470cdca60a2fe3f4372f4d964e1b513ec38c9070 /src/tools/qml
parentb4dd2080bee32e3feaf652893eb73d95957e6feb (diff)
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.
Diffstat (limited to 'src/tools/qml')
-rw-r--r--src/tools/qml/qmlobserver/qmlruntime.cpp6
-rw-r--r--src/tools/qml/qmlobserver/qmlruntime.h4
2 files changed, 5 insertions, 5 deletions
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;