diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2011-10-18 16:52:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-24 18:00:18 +0200 |
commit | 3d10ba505e40cc8c63778374627ee232c3252397 (patch) | |
tree | c26fa2f9077cab783c7ba46cd5e3395a2f688735 /src/plugins | |
parent | 574eb6a20d0e507a8885adcbec85034a3d306c79 (diff) |
Debugger: Inspector code cleanup
Change-Id: Ibf647e2885466d521406fca15cc0cf85c5412f52
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Diffstat (limited to 'src/plugins')
3 files changed, 25 insertions, 42 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp index 86a42c217c..1cebbd4283 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp @@ -47,16 +47,13 @@ #include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeComponent> #include <QtCore/private/qabstractanimation_p.h> -#include "QtDeclarative/private/qdeclarativeinspectorservice_p.h" +#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> -#include <QtWidgets/QVBoxLayout> #include <QtGui/QMouseEvent> -#include <QtCore/QSettings> namespace QmlJSDebugger { - AbstractViewInspector::AbstractViewInspector(QObject *parent) : QObject(parent), m_currentTool(0), diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h index 2ac30bc005..ee6eea5aee 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h @@ -61,7 +61,6 @@ QT_END_NAMESPACE namespace QmlJSDebugger { class AbstractTool; -class ToolBox; /* * The common code between QQuickView and QDeclarativeView inspectors lives here, @@ -73,26 +72,11 @@ class AbstractViewInspector : public QObject public: explicit AbstractViewInspector(QObject *parent = 0); - virtual void changeCurrentObjects(const QList<QObject*> &objects) = 0; - - virtual void reloadView() = 0; - void createQmlObject(const QString &qml, QObject *parent, const QStringList &importList, const QString &filename = QString()); - - virtual void reparentQmlObject(QObject *object, QObject *newParent) = 0; - - virtual void changeTool(InspectorProtocol::Tool tool) = 0; - void clearComponentCache(); - virtual Qt::WindowFlags windowFlags() const = 0; - virtual void setWindowFlags(Qt::WindowFlags flags) = 0; - - virtual QDeclarativeEngine *declarativeEngine() const = 0; - - bool showAppOnTop() const { return m_showAppOnTop; } bool designModeBehavior() const { return m_designModeBehavior; } @@ -108,21 +92,13 @@ public: QString idStringForObject(QObject *obj) const; -public slots: - void sendDesignModeBehavior(bool inDesignMode); - void sendColorChanged(const QColor &color); - - void changeToColorPickerTool(); - void changeToZoomTool(); - void changeToSingleSelectTool(); - void changeToMarqueeSelectTool(); - - virtual void setDesignModeBehavior(bool value); - - void setShowAppOnTop(bool appOnTop); - - void setAnimationSpeed(qreal factor); - void setAnimationPaused(bool paused); + virtual void changeCurrentObjects(const QList<QObject*> &objects) = 0; + virtual void reloadView() = 0; + virtual void reparentQmlObject(QObject *object, QObject *newParent) = 0; + virtual void changeTool(InspectorProtocol::Tool tool) = 0; + virtual Qt::WindowFlags windowFlags() const = 0; + virtual void setWindowFlags(Qt::WindowFlags flags) = 0; + virtual QDeclarativeEngine *declarativeEngine() const = 0; signals: void designModeBehaviorChanged(bool inDesignMode); @@ -138,6 +114,8 @@ signals: void animationPausedChanged(bool paused); protected: + AbstractTool *currentTool() const { return m_currentTool; } + void setCurrentTool(AbstractTool *tool) { m_currentTool = tool; } bool eventFilter(QObject *, QEvent *); virtual bool leaveEvent(QEvent *); @@ -149,13 +127,25 @@ protected: virtual bool mouseDoubleClickEvent(QMouseEvent *event); virtual bool wheelEvent(QWheelEvent *event); - AbstractTool *currentTool() const { return m_currentTool; } - void setCurrentTool(AbstractTool *tool) { m_currentTool = tool; } - private slots: void handleMessage(const QByteArray &message); + void sendColorChanged(const QColor &color); private: + void sendDesignModeBehavior(bool inDesignMode); + + void changeToColorPickerTool(); + void changeToZoomTool(); + void changeToSingleSelectTool(); + void changeToMarqueeSelectTool(); + + virtual void setDesignModeBehavior(bool value); + + void setShowAppOnTop(bool appOnTop); + + void setAnimationSpeed(qreal factor); + void setAnimationPaused(bool paused); + void animationSpeedChangeRequested(qreal factor); void animationPausedChangeRequested(bool paused); diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp index 89438b6559..1afeeec321 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp @@ -124,10 +124,6 @@ SGViewInspector::SGViewInspector(QQuickView *view, QObject *parent) : // Try to make sure the overlay is always on top m_overlay->setZ(FLT_MAX); - // TODO - // Make sure mouse hover events are received -// m_view->setMouseTracking(true); - if (QQuickItem *root = view->rootItem()) m_overlay->setParentItem(root); |