4 files changed, 134 insertions, 81 deletions

diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h
index 972a362788..c28f0b50ba 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeinspectorservice.h
@@ -33,7 +33,7 @@
 #define QDECLARATIVEDESIGNDEBUGSERVER_H
 
 #include "qt_private/qdeclarativedebugservice_p.h"
-#include "qmlobserverconstants.h"
+#include "qmlinspectorconstants.h"
 #include "qmljsdebugger_global.h"
 
 #include <QtCore/QHash>
@@ -46,12 +46,12 @@ QT_FORWARD_DECLARE_CLASS(QDataStream)
 
 namespace QmlJSDebugger {
 
-class QMLJSDEBUGGER_EXPORT QDeclarativeObserverService : public QDeclarativeDebugService
+class QMLJSDEBUGGER_EXPORT QDeclarativeInspectorService : public QDeclarativeDebugService
 {
     Q_OBJECT
 public:
-    QDeclarativeObserverService();
-    static QDeclarativeObserverService *instance();
+    QDeclarativeInspectorService();
+    static QDeclarativeInspectorService *instance();
 
     void setDesignModeBehavior(bool inDesignMode);
     void setCurrentObjects(QList<QObject*> items);
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h
new file mode 100644
index 0000000000..6ba0427187
--- /dev/null
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewinspector.h
@@ -0,0 +1,120 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.nokia.com)
+**
+**
+** GNU Lesser General Public License Usage
+**
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** Other Usage
+**
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**************************************************************************/
+
+#ifndef QDECLARATIVEVIEWINSPECTOR_H
+#define QDECLARATIVEVIEWINSPECTOR_H
+
+#include "qmljsdebugger_global.h"
+#include "qmlinspectorconstants.h"
+
+#include <QtCore/QScopedPointer>
+#include <QtDeclarative/QDeclarativeView>
+
+QT_FORWARD_DECLARE_CLASS(QDeclarativeItem)
+QT_FORWARD_DECLARE_CLASS(QMouseEvent)
+QT_FORWARD_DECLARE_CLASS(QToolBar)
+
+namespace QmlJSDebugger {
+
+class CrumblePath;
+class QDeclarativeViewInspectorPrivate;
+
+class QMLJSDEBUGGER_EXPORT QDeclarativeViewInspector : public QObject
+{
+    Q_OBJECT
+public:
+
+    explicit QDeclarativeViewInspector(QDeclarativeView *view, QObject *parent = 0);
+    ~QDeclarativeViewInspector();
+
+    void setSelectedItems(QList<QGraphicsItem *> items);
+    QList<QGraphicsItem *> selectedItems();
+
+    QDeclarativeView *declarativeView();
+
+    static QString idStringForObject(QObject *obj);
+    QRectF adjustToScreenBoundaries(const QRectF &boundingRectInSceneSpace);
+
+    bool showAppOnTop() const;
+
+public Q_SLOTS:
+    void setDesignModeBehavior(bool value);
+    bool designModeBehavior();
+
+    void setShowAppOnTop(bool appOnTop);
+
+    void setAnimationSpeed(qreal factor);
+    void setAnimationPaused(bool paused);
+
+Q_SIGNALS:
+    void designModeBehaviorChanged(bool inDesignMode);
+    void showAppOnTopChanged(bool showAppOnTop);
+    void reloadRequested();
+    void marqueeSelectToolActivated();
+    void selectToolActivated();
+    void zoomToolActivated();
+    void colorPickerActivated();
+    void selectedColorChanged(const QColor &color);
+
+    void animationSpeedChanged(qreal factor);
+    void animationPausedChanged(bool paused);
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event);
+
+    bool leaveEvent(QEvent *);
+    bool mousePressEvent(QMouseEvent *event);
+    bool mouseMoveEvent(QMouseEvent *event);
+    bool mouseReleaseEvent(QMouseEvent *event);
+    bool keyPressEvent(QKeyEvent *event);
+    bool keyReleaseEvent(QKeyEvent *keyEvent);
+    bool mouseDoubleClickEvent(QMouseEvent *event);
+    bool wheelEvent(QWheelEvent *event);
+
+    void setSelectedItemsForTools(QList<QGraphicsItem *> items);
+
+private slots:
+    void animationSpeedChangeRequested(qreal factor);
+    void animationPausedChangeRequested(bool paused);
+
+private:
+    Q_DISABLE_COPY(QDeclarativeViewInspector)
+
+    inline QDeclarativeViewInspectorPrivate *d_func() { return data.data(); }
+    QScopedPointer<QDeclarativeViewInspectorPrivate> data;
+    friend class QDeclarativeViewInspectorPrivate;
+    friend class AbstractLiveEditTool;
+};
+
+} // namespace QmlJSDebugger
+
+#endif // QDECLARATIVEVIEWINSPECTOR_H
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
index 2accbfa700..7621a9e8d7 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
@@ -33,86 +33,19 @@
 #ifndef QDECLARATIVEVIEWOBSERVER_H
 #define QDECLARATIVEVIEWOBSERVER_H
 
-#include "qmljsdebugger_global.h"
-#include "qmlobserverconstants.h"
-
-#include <QtCore/QScopedPointer>
-#include <QtDeclarative/QDeclarativeView>
-
-QT_FORWARD_DECLARE_CLASS(QDeclarativeItem)
-QT_FORWARD_DECLARE_CLASS(QMouseEvent)
-QT_FORWARD_DECLARE_CLASS(QToolBar)
+#include "qdeclarativeviewinspector.h"
 
 namespace QmlJSDebugger {
 
-class CrumblePath;
-class QDeclarativeViewObserverPrivate;
-
-class QMLJSDEBUGGER_EXPORT QDeclarativeViewObserver : public QObject
+// Provided for compatibility with QmlApplicationViewer
+class QMLJSDEBUGGER_EXPORT QDeclarativeViewObserver : public QDeclarativeViewInspector
 {
     Q_OBJECT
-public:
-
-    explicit QDeclarativeViewObserver(QDeclarativeView *view, QObject *parent = 0);
-    ~QDeclarativeViewObserver();
-
-    void setSelectedItems(QList<QGraphicsItem *> items);
-    QList<QGraphicsItem *> selectedItems();
-
-    QDeclarativeView *declarativeView();
-
-    static QString idStringForObject(QObject *obj);
-    QRectF adjustToScreenBoundaries(const QRectF &boundingRectInSceneSpace);
-
-    bool showAppOnTop() const;
-
-public Q_SLOTS:
-    void setDesignModeBehavior(bool value);
-    bool designModeBehavior();
 
-    void setShowAppOnTop(bool appOnTop);
-
-    void setAnimationSpeed(qreal factor);
-    void setAnimationPaused(bool paused);
-
-Q_SIGNALS:
-    void designModeBehaviorChanged(bool inDesignMode);
-    void showAppOnTopChanged(bool showAppOnTop);
-    void reloadRequested();
-    void marqueeSelectToolActivated();
-    void selectToolActivated();
-    void zoomToolActivated();
-    void colorPickerActivated();
-    void selectedColorChanged(const QColor &color);
-
-    void animationSpeedChanged(qreal factor);
-    void animationPausedChanged(bool paused);
-
-protected:
-    bool eventFilter(QObject *obj, QEvent *event);
-
-    bool leaveEvent(QEvent *);
-    bool mousePressEvent(QMouseEvent *event);
-    bool mouseMoveEvent(QMouseEvent *event);
-    bool mouseReleaseEvent(QMouseEvent *event);
-    bool keyPressEvent(QKeyEvent *event);
-    bool keyReleaseEvent(QKeyEvent *keyEvent);
-    bool mouseDoubleClickEvent(QMouseEvent *event);
-    bool wheelEvent(QWheelEvent *event);
-
-    void setSelectedItemsForTools(QList<QGraphicsItem *> items);
-
-private slots:
-    void animationSpeedChangeRequested(qreal factor);
-    void animationPausedChangeRequested(bool paused);
-
-private:
-    Q_DISABLE_COPY(QDeclarativeViewObserver)
-
-    inline QDeclarativeViewObserverPrivate *d_func() { return data.data(); }
-    QScopedPointer<QDeclarativeViewObserverPrivate> data;
-    friend class QDeclarativeViewObserverPrivate;
-    friend class AbstractLiveEditTool;
+public:
+    explicit QDeclarativeViewObserver(QDeclarativeView *view, QObject *parent = 0)
+        : QDeclarativeViewInspector(view, parent)
+    {}
 };
 
 } // namespace QmlJSDebugger
diff --git a/share/qtcreator/qml/qmljsdebugger/include/qmlobserverconstants.h b/share/qtcreator/qml/qmljsdebugger/include/qmlinspectorconstants.h
index 30aefdf1f6..eb5ac317e8 100644
--- a/share/qtcreator/qml/qmljsdebugger/include/qmlobserverconstants.h
+++ b/share/qtcreator/qml/qmljsdebugger/include/qmlinspectorconstants.h
@@ -30,8 +30,8 @@
 **
 **************************************************************************/
 
-#ifndef QMLOBSERVERCONSTANTS_H
-#define QMLOBSERVERCONSTANTS_H
+#ifndef QMLINSPECTORCONSTANTS_H
+#define QMLINSPECTORCONSTANTS_H
 
 namespace QmlJSDebugger {
 namespace Constants {
@@ -68,4 +68,4 @@ enum GraphicsItemTypes {
 } // namespace Constants
 } // namespace QmlJSDebugger
 
-#endif // QMLOBSERVERCONSTANTS_H
+#endif // QMLINSPECTORCONSTANTS_H