Debugger: Get rid of SG* prefix in qtquick2 plugin

Change-Id: Ib8a40d633c169652258480748cfc162593ed9f6c
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
similarity index 92%
rename from src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.cpp
rename to src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
index ab254a3..34b318c 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
@@ -39,20 +39,20 @@
 **
 ****************************************************************************/
 
-#include "sghighlight.h"
+#include "highlight.h"
 
 #include <QtGui/QPainter>
 
 namespace QmlJSDebugger {
 namespace QtQuick2 {
 
-SGHighlight::SGHighlight(QQuickItem *item, QQuickItem *parent)
+Highlight::Highlight(QQuickItem *item, QQuickItem *parent)
     : QQuickPaintedItem(parent)
 {
     setItem(item);
 }
 
-void SGHighlight::setItem(QQuickItem *item)
+void Highlight::setItem(QQuickItem *item)
 {
     if (m_item)
         m_item.data()->disconnect(this);
@@ -71,7 +71,7 @@ void SGHighlight::setItem(QQuickItem *item)
     adjust();
 }
 
-void SGHighlight::adjust()
+void Highlight::adjust()
 {
     const QQuickItem *item = m_item.data();
     setSize(QSizeF(item->width(), item->height()));
@@ -81,14 +81,14 @@ void SGHighlight::adjust()
 }
 
 
-void SGSelectionHighlight::paint(QPainter *painter)
+void SelectionHighlight::paint(QPainter *painter)
 {
     painter->setPen(QColor(108, 141, 221));
     painter->drawRect(QRect(0, 0, width() - 1, height() - 1));
 }
 
 
-void SGHoverHighlight::paint(QPainter *painter)
+void HoverHighlight::paint(QPainter *painter)
 {
     painter->setPen(QPen(QColor(0, 22, 159)));
     painter->drawRect(QRect(1, 1, width() - 3, height() - 3));

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
similarity index 82%
rename from src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h
rename to src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
index d6c380e..c8813c5 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef SGHIGHLIGHT_H
-#define SGHIGHLIGHT_H
+#ifndef HIGHLIGHT_H
+#define HIGHLIGHT_H
 
 #include <QtCore/QWeakPointer>
 #include <QtQuick/QQuickPaintedItem>
@@ -48,13 +48,13 @@
 namespace QmlJSDebugger {
 namespace QtQuick2 {
 
-class SGHighlight : public QQuickPaintedItem
+class Highlight : public QQuickPaintedItem
 {
     Q_OBJECT
 
 public:
-    SGHighlight(QQuickItem *parent) : QQuickPaintedItem(parent) {}
-    SGHighlight(QQuickItem *item, QQuickItem *parent);
+    Highlight(QQuickItem *parent) : QQuickPaintedItem(parent) {}
+    Highlight(QQuickItem *item, QQuickItem *parent);
 
     void setItem(QQuickItem *item);
 
@@ -68,11 +68,11 @@ private:
 /**
  * A highlight suitable for indicating selection.
  */
-class SGSelectionHighlight : public SGHighlight
+class SelectionHighlight : public Highlight
 {
 public:
-    SGSelectionHighlight(QQuickItem *item, QQuickItem *parent)
-        : SGHighlight(item, parent)
+    SelectionHighlight(QQuickItem *item, QQuickItem *parent)
+        : Highlight(item, parent)
     {}
 
     void paint(QPainter *painter);
@@ -81,11 +81,11 @@ public:
 /**
  * A highlight suitable for indicating hover.
  */
-class SGHoverHighlight : public SGHighlight
+class HoverHighlight : public Highlight
 {
 public:
-    SGHoverHighlight(QQuickItem *parent)
-        : SGHighlight(parent)
+    HoverHighlight(QQuickItem *parent)
+        : Highlight(parent)
     {
         setZ(1); // hover highlight on top of selection highlight
     }
@@ -96,4 +96,4 @@ public:
 } // namespace QtQuick2
 } // namespace QmlJSDebugger
 
-#endif // SGHIGHLIGHT_H
+#endif // HIGHLIGHT_H

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index ed6ba4c..b9c6584 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -11,17 +11,17 @@ INCLUDEPATH *= $$PWD $$PWD/../shared
 
 SOURCES += \
     qtquick2plugin.cpp \
-    sghighlight.cpp \
-    sgselectiontool.cpp \
-    sgviewinspector.cpp \
+    highlight.cpp \
+    selectiontool.cpp \
+    qquickviewinspector.cpp \
     ../shared/abstracttool.cpp \
     ../shared/abstractviewinspector.cpp
 
 HEADERS += \
     qtquick2plugin.h \
-    sghighlight.h \
-    sgselectiontool.h \
-    sgviewinspector.h \
+    highlight.h \
+    selectiontool.h \
+    qquickviewinspector.h \
     ../shared/abstracttool.h \
     ../shared/abstractviewinspector.h \
     ../shared/qdeclarativeinspectorprotocol.h \

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
similarity index 85%
rename from src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp
rename to src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
index a1c2c1a..0831432 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "sgviewinspector.h"
+#include "qquickviewinspector.h"
 
 #include "qdeclarativeinspectorprotocol.h"
-#include "sghighlight.h"
-#include "sgselectiontool.h"
+#include "highlight.h"
+#include "selectiontool.h"
 
 #include <QtQuick/private/qquickitem_p.h>
 
@@ -115,11 +115,11 @@ static QQuickItem *itemAt(QQuickItem *item, const QPointF &pos, QQuickItem *over
 }
 
 
-SGViewInspector::SGViewInspector(QQuickView *view, QObject *parent) :
+QQuickViewInspector::QQuickViewInspector(QQuickView *view, QObject *parent) :
     AbstractViewInspector(parent),
     m_view(view),
     m_overlay(new QQuickItem),
-    m_selectionTool(new SGSelectionTool(this)),
+    m_selectionTool(new SelectionTool(this)),
     m_designMode(true)
 {
     // Try to make sure the overlay is always on top
@@ -132,7 +132,7 @@ SGViewInspector::SGViewInspector(QQuickView *view, QObject *parent) :
     setCurrentTool(m_selectionTool);
 }
 
-void SGViewInspector::changeCurrentObjects(const QList<QObject*> &objects)
+void QQuickViewInspector::changeCurrentObjects(const QList<QObject*> &objects)
 {
     QList<QQuickItem*> items;
     foreach (QObject *obj, objects)
@@ -142,13 +142,13 @@ void SGViewInspector::changeCurrentObjects(const QList<QObject*> &objects)
     syncSelectedItems(items);
 }
 
-void SGViewInspector::reloadView()
+void QQuickViewInspector::reloadView()
 {
     // TODO
     emit reloadRequested();
 }
 
-void SGViewInspector::reparentQmlObject(QObject *object, QObject *newParent)
+void QQuickViewInspector::reparentQmlObject(QObject *object, QObject *newParent)
 {
     if (!newParent)
         return;
@@ -160,7 +160,7 @@ void SGViewInspector::reparentQmlObject(QObject *object, QObject *newParent)
         item->setParentItem(newParentItem);
 }
 
-void SGViewInspector::changeTool(InspectorProtocol::Tool tool)
+void QQuickViewInspector::changeTool(InspectorProtocol::Tool tool)
 {
     switch (tool) {
     case InspectorProtocol::ColorPickerTool:
@@ -192,12 +192,12 @@ QWindow *getMasterWindow(QWindow *w)
     return w;
 }
 
-Qt::WindowFlags SGViewInspector::windowFlags() const
+Qt::WindowFlags QQuickViewInspector::windowFlags() const
 {
     return getMasterWindow(m_view)->windowFlags();
 }
 
-void SGViewInspector::setWindowFlags(Qt::WindowFlags flags)
+void QQuickViewInspector::setWindowFlags(Qt::WindowFlags flags)
 {
     QWindow *w = getMasterWindow(m_view);
     w->setWindowFlags(flags);
@@ -206,18 +206,18 @@ void SGViewInspector::setWindowFlags(Qt::WindowFlags flags)
     w->setVisible(true);
 }
 
-QDeclarativeEngine *SGViewInspector::declarativeEngine() const
+QDeclarativeEngine *QQuickViewInspector::declarativeEngine() const
 {
     return m_view->engine();
 }
 
-QQuickItem *SGViewInspector::topVisibleItemAt(const QPointF &pos) const
+QQuickItem *QQuickViewInspector::topVisibleItemAt(const QPointF &pos) const
 {
     QQuickItem *root = m_view->rootItem();
     return itemAt(root, root->mapFromScene(pos), m_overlay);
 }
 
-QList<QQuickItem *> SGViewInspector::itemsAt(const QPointF &pos) const
+QList<QQuickItem *> QQuickViewInspector::itemsAt(const QPointF &pos) const
 {
     QQuickItem *root = m_view->rootItem();
     QList<QQuickItem *> resultList;
@@ -225,7 +225,7 @@ QList<QQuickItem *> SGViewInspector::itemsAt(const QPointF &pos) const
     return resultList;
 }
 
-QList<QQuickItem*> SGViewInspector::selectedItems() const
+QList<QQuickItem*> QQuickViewInspector::selectedItems() const
 {
     QList<QQuickItem *> selection;
     foreach (const QWeakPointer<QQuickItem> &selectedItem, m_selectedItems) {
@@ -235,7 +235,7 @@ QList<QQuickItem*> SGViewInspector::selectedItems() const
     return selection;
 }
 
-void SGViewInspector::setSelectedItems(const QList<QQuickItem *> &items)
+void QQuickViewInspector::setSelectedItems(const QList<QQuickItem *> &items)
 {
     if (!syncSelectedItems(items))
         return;
@@ -247,7 +247,7 @@ void SGViewInspector::setSelectedItems(const QList<QQuickItem *> &items)
     sendCurrentObjects(objectList);
 }
 
-bool SGViewInspector::syncSelectedItems(const QList<QQuickItem *> &items)
+bool QQuickViewInspector::syncSelectedItems(const QList<QQuickItem *> &items)
 {
     bool selectionChanged = false;
 
@@ -272,13 +272,13 @@ bool SGViewInspector::syncSelectedItems(const QList<QQuickItem *> &items)
         selectionChanged = true;
         connect(item, SIGNAL(destroyed(QObject*)), this, SLOT(removeFromSelectedItems(QObject*)));
         m_selectedItems.append(item);
-        m_highlightItems.insert(item, new SGSelectionHighlight(item, m_overlay));
+        m_highlightItems.insert(item, new SelectionHighlight(item, m_overlay));
     }
 
     return selectionChanged;
 }
 
-void SGViewInspector::removeFromSelectedItems(QObject *object)
+void QQuickViewInspector::removeFromSelectedItems(QObject *object)
 {
     if (QQuickItem *item = qobject_cast<QQuickItem*>(object)) {
         if (m_selectedItems.removeOne(item))
@@ -286,7 +286,7 @@ void SGViewInspector::removeFromSelectedItems(QObject *object)
     }
 }
 
-bool SGViewInspector::eventFilter(QObject *obj, QEvent *event)
+bool QQuickViewInspector::eventFilter(QObject *obj, QEvent *event)
 {
     if (obj != m_view)
         return QObject::eventFilter(obj, event);
@@ -294,7 +294,7 @@ bool SGViewInspector::eventFilter(QObject *obj, QEvent *event)
     return AbstractViewInspector::eventFilter(obj, event);
 }
 
-bool SGViewInspector::mouseMoveEvent(QMouseEvent *event)
+bool QQuickViewInspector::mouseMoveEvent(QMouseEvent *event)
 {
     // TODO
 //    if (QQuickItem *item = topVisibleItemAt(event->pos()))
@@ -305,7 +305,7 @@ bool SGViewInspector::mouseMoveEvent(QMouseEvent *event)
     return AbstractViewInspector::mouseMoveEvent(event);
 }
 
-QString SGViewInspector::titleForItem(QQuickItem *item) const
+QString QQuickViewInspector::titleForItem(QQuickItem *item) const
 {
     QString className = QLatin1String(item->metaObject()->className());
     QString objectStringId = idStringForObject(item);

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.h b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
similarity index 89%
rename from src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.h
rename to src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
index fa404a5..94fa4c2 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSGVIEWINSPECTOR_H
-#define QSGVIEWINSPECTOR_H
+#ifndef QQUICKVIEWINSPECTOR_H
+#define QQUICKVIEWINSPECTOR_H
 
 #include "abstractviewinspector.h"
 
@@ -55,14 +55,14 @@ QT_END_NAMESPACE
 namespace QmlJSDebugger {
 namespace QtQuick2 {
 
-class SGSelectionTool;
-class SGSelectionHighlight;
+class SelectionTool;
+class SelectionHighlight;
 
-class SGViewInspector : public AbstractViewInspector
+class QQuickViewInspector : public AbstractViewInspector
 {
     Q_OBJECT
 public:
-    explicit SGViewInspector(QQuickView *view, QObject *parent = 0);
+    explicit QQuickViewInspector(QQuickView *view, QObject *parent = 0);
 
     // AbstractViewInspector
     void changeCurrentObjects(const QList<QObject*> &objects);
@@ -98,10 +98,10 @@ private:
     QQuickView *m_view;
     QQuickItem *m_overlay;
 
-    SGSelectionTool *m_selectionTool;
+    SelectionTool *m_selectionTool;
 
     QList<QWeakPointer<QQuickItem> > m_selectedItems;
-    QHash<QQuickItem*, SGSelectionHighlight*> m_highlightItems;
+    QHash<QQuickItem*, SelectionHighlight*> m_highlightItems;
 
     bool m_designMode;
 };
@@ -109,4 +109,4 @@ private:
 } // namespace QtQuick2
 } // namespace QmlJSDebugger
 
-#endif // QSGVIEWINSPECTOR_H
+#endif // QQUICKVIEWINSPECTOR_H

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
index 33b8cc1..2263c82 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qtquick2plugin.h"
-#include "sgviewinspector.h"
+#include "qquickviewinspector.h"
 
 #include <QtCore/qplugin.h>
 #include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
@@ -68,7 +68,7 @@ void QtQuick2Plugin::activate(QObject *view)
 {
     QQuickView *qtQuickView = qobject_cast<QQuickView*>(view);
     Q_ASSERT(qtQuickView);
-    m_inspector = new SGViewInspector(qtQuickView, qtQuickView);
+    m_inspector = new QQuickViewInspector(qtQuickView, qtQuickView);
 }
 
 void QtQuick2Plugin::deactivate()

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp
similarity index 83%
rename from src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp
rename to src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp
index f96f7d2..ae93e21 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "sgselectiontool.h"
+#include "selectiontool.h"
 
-#include "sghighlight.h"
-#include "sgviewinspector.h"
+#include "highlight.h"
+#include "qquickviewinspector.h"
 
 #include <QtGui/QMouseEvent>
 #include <QtQuick/QQuickView>
@@ -51,18 +51,18 @@
 namespace QmlJSDebugger {
 namespace QtQuick2 {
 
-SGSelectionTool::SGSelectionTool(SGViewInspector *inspector) :
+SelectionTool::SelectionTool(QQuickViewInspector *inspector) :
     AbstractTool(inspector),
-    m_hoverHighlight(new SGHoverHighlight(inspector->overlay()))
+    m_hoverHighlight(new HoverHighlight(inspector->overlay()))
 {
 }
 
-void SGSelectionTool::leaveEvent(QEvent *)
+void SelectionTool::leaveEvent(QEvent *)
 {
     m_hoverHighlight->setVisible(false);
 }
 
-void SGSelectionTool::mousePressEvent(QMouseEvent *event)
+void SelectionTool::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
         if (QQuickItem *item = inspector()->topVisibleItemAt(event->pos()))
@@ -72,7 +72,7 @@ void SGSelectionTool::mousePressEvent(QMouseEvent *event)
     }
 }
 
-void SGSelectionTool::hoverMoveEvent(QMouseEvent *event)
+void SelectionTool::hoverMoveEvent(QMouseEvent *event)
 {
     QQuickItem *item = inspector()->topVisibleItemAt(event->pos());
     if (!item) {
@@ -83,9 +83,9 @@ void SGSelectionTool::hoverMoveEvent(QMouseEvent *event)
     }
 }
 
-SGViewInspector *SGSelectionTool::inspector() const
+QQuickViewInspector *SelectionTool::inspector() const
 {
-    return static_cast<SGViewInspector*>(AbstractTool::inspector());
+    return static_cast<QQuickViewInspector*>(AbstractTool::inspector());
 }
 
 } // namespace QtQuick2

diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.h b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h
similarity index 88%
rename from src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.h
rename to src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h
index faf75be..51752f3 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef SGSELECTIONTOOL_H
-#define SGSELECTIONTOOL_H
+#ifndef SELECTIONTOOL_H
+#define SELECTIONTOOL_H
 
 #include "abstracttool.h"
 
@@ -52,14 +52,14 @@ QT_FORWARD_DECLARE_CLASS(QQuickItem)
 namespace QmlJSDebugger {
 namespace QtQuick2 {
 
-class SGViewInspector;
-class SGHoverHighlight;
+class QQuickViewInspector;
+class HoverHighlight;
 
-class SGSelectionTool : public AbstractTool
+class SelectionTool : public AbstractTool
 {
     Q_OBJECT
 public:
-    explicit SGSelectionTool(SGViewInspector *inspector);
+    explicit SelectionTool(QQuickViewInspector *inspector);
 
     void leaveEvent(QEvent *);
 
@@ -75,12 +75,12 @@ public:
     void keyReleaseEvent(QKeyEvent *) {}
 
 private:
-    SGViewInspector *inspector() const;
+    QQuickViewInspector *inspector() const;
 
-    SGHoverHighlight *m_hoverHighlight;
+    HoverHighlight *m_hoverHighlight;
 };
 
 } // namespace QtQuick2
 } // namespace QmlJSDebugger
 
-#endif // SGSELECTIONTOOL_H
+#endif // SELECTIONTOOL_H