diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-14 10:51:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 11:53:26 +0200 |
commit | bfb3c424abc7c839dc44de0e36024ede99ece736 (patch) | |
tree | b6814d0238bead8518b23c078beb818432de6ce4 /src/plugins/qmltooling/qmldbg_inspector | |
parent | 2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (diff) |
Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.
All the classes and files in the declarative/items
directory have been renamed.
In particular, for classes that are currently public,
the renaming is as follows:
QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem
The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).
Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_inspector')
8 files changed, 83 insertions, 83 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h index 7d9ad955dc..2ac30bc005 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h @@ -64,7 +64,7 @@ class AbstractTool; class ToolBox; /* - * The common code between QSGView and QDeclarativeView inspectors lives here, + * The common code between QQuickView and QDeclarativeView inspectors lives here, */ class AbstractViewInspector : public QObject { diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp index 82d8e7a75f..51dfda669a 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeinspectorplugin.cpp @@ -46,7 +46,7 @@ #include <QtCore/qplugin.h> #include <QtDeclarative/private/qdeclarativeinspectorservice_p.h> -#include <QtDeclarative/QSGView> +#include <QtDeclarative/QQuickView> namespace QmlJSDebugger { @@ -71,7 +71,7 @@ void QDeclarativeInspectorPlugin::activate() QObject *firstView = views.first(); if (QDeclarativeView *declarativeView = qobject_cast<QDeclarativeView*>(firstView)) m_inspector = new QDeclarativeViewInspector(declarativeView, declarativeView); - else if (QSGView *sgView = qobject_cast<QSGView*>(firstView)) + else if (QQuickView *sgView = qobject_cast<QQuickView*>(firstView)) m_inspector = new SGViewInspector(sgView, sgView); } diff --git a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp b/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp index 4488214a31..1af789d389 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/sghighlight.cpp @@ -45,13 +45,13 @@ namespace QmlJSDebugger { -SGHighlight::SGHighlight(QSGItem *item, QSGItem *parent) - : QSGPaintedItem(parent) +SGHighlight::SGHighlight(QQuickItem *item, QQuickItem *parent) + : QQuickPaintedItem(parent) { setItem(item); } -void SGHighlight::setItem(QSGItem *item) +void SGHighlight::setItem(QQuickItem *item) { if (m_item) m_item.data()->disconnect(this); @@ -72,7 +72,7 @@ void SGHighlight::setItem(QSGItem *item) void SGHighlight::adjust() { - const QSGItem *item = m_item.data(); + const QQuickItem *item = m_item.data(); setSize(QSizeF(item->width(), item->height())); setPos(parentItem()->mapFromItem(item->parentItem(), item->pos())); setRotation(item->rotation()); diff --git a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h b/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h index f3e8edd442..8d5659cc5d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h +++ b/src/plugins/qmltooling/qmldbg_inspector/sghighlight.h @@ -43,25 +43,25 @@ #define SGHIGHLIGHT_H #include <QtCore/QWeakPointer> -#include <QtDeclarative/QSGPaintedItem> +#include <QtDeclarative/QQuickPaintedItem> namespace QmlJSDebugger { -class SGHighlight : public QSGPaintedItem +class SGHighlight : public QQuickPaintedItem { Q_OBJECT public: - SGHighlight(QSGItem *parent) : QSGPaintedItem(parent) {} - SGHighlight(QSGItem *item, QSGItem *parent); + SGHighlight(QQuickItem *parent) : QQuickPaintedItem(parent) {} + SGHighlight(QQuickItem *item, QQuickItem *parent); - void setItem(QSGItem *item); + void setItem(QQuickItem *item); private slots: void adjust(); private: - QWeakPointer<QSGItem> m_item; + QWeakPointer<QQuickItem> m_item; }; /** @@ -70,7 +70,7 @@ private: class SGSelectionHighlight : public SGHighlight { public: - SGSelectionHighlight(QSGItem *item, QSGItem *parent) + SGSelectionHighlight(QQuickItem *item, QQuickItem *parent) : SGHighlight(item, parent) {} @@ -83,7 +83,7 @@ public: class SGHoverHighlight : public SGHighlight { public: - SGHoverHighlight(QSGItem *parent) + SGHoverHighlight(QQuickItem *parent) : SGHighlight(parent) { setZ(1); // hover highlight on top of selection highlight diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp index 653c059d53..bdfc28f5ec 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.cpp @@ -46,8 +46,8 @@ #include <QtWidgets/QMenu> #include <QtGui/QMouseEvent> -#include <QtDeclarative/QSGView> -#include <QtDeclarative/QSGItem> +#include <QtDeclarative/QQuickView> +#include <QtDeclarative/QQuickItem> namespace QmlJSDebugger { @@ -65,17 +65,17 @@ void SGSelectionTool::leaveEvent(QEvent *) void SGSelectionTool::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { - if (QSGItem *item = inspector()->topVisibleItemAt(event->pos())) - inspector()->setSelectedItems(QList<QSGItem*>() << item); + if (QQuickItem *item = inspector()->topVisibleItemAt(event->pos())) + inspector()->setSelectedItems(QList<QQuickItem*>() << item); } else if (event->button() == Qt::RightButton) { - QList<QSGItem*> items = inspector()->itemsAt(event->pos()); + QList<QQuickItem*> items = inspector()->itemsAt(event->pos()); createContextMenu(items, event->globalPos()); } } void SGSelectionTool::hoverMoveEvent(QMouseEvent *event) { - QSGItem *item = inspector()->topVisibleItemAt(event->pos()); + QQuickItem *item = inspector()->topVisibleItemAt(event->pos()); if (!item) { m_hoverHighlight->setVisible(false); } else { @@ -84,16 +84,16 @@ void SGSelectionTool::hoverMoveEvent(QMouseEvent *event) } } -void SGSelectionTool::createContextMenu(const QList<QSGItem *> &items, QPoint pos) +void SGSelectionTool::createContextMenu(const QList<QQuickItem *> &items, QPoint pos) { QMenu contextMenu; connect(&contextMenu, SIGNAL(hovered(QAction*)), this, SLOT(contextMenuElementHovered(QAction*))); - const QList<QSGItem*> selectedItems = inspector()->selectedItems(); + const QList<QQuickItem*> selectedItems = inspector()->selectedItems(); int shortcutKey = Qt::Key_1; - foreach (QSGItem *item, items) { + foreach (QQuickItem *item, items) { const QString title = inspector()->titleForItem(item); QAction *elementAction = contextMenu.addAction(title); elementAction->setData(QVariant::fromValue(item)); @@ -117,14 +117,14 @@ void SGSelectionTool::createContextMenu(const QList<QSGItem *> &items, QPoint po void SGSelectionTool::contextMenuElementHovered(QAction *action) { - if (QSGItem *item = action->data().value<QSGItem*>()) + if (QQuickItem *item = action->data().value<QQuickItem*>()) m_hoverHighlight->setItem(item); } void SGSelectionTool::contextMenuElementSelected() { - if (QSGItem *item = static_cast<QAction*>(sender())->data().value<QSGItem*>()) - inspector()->setSelectedItems(QList<QSGItem*>() << item); + if (QQuickItem *item = static_cast<QAction*>(sender())->data().value<QQuickItem*>()) + inspector()->setSelectedItems(QList<QQuickItem*>() << item); } SGViewInspector *SGSelectionTool::inspector() const diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h index 9f2171f572..587701733d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h +++ b/src/plugins/qmltooling/qmldbg_inspector/sgselectiontool.h @@ -48,7 +48,7 @@ #include <QtCore/QPoint> QT_FORWARD_DECLARE_CLASS(QAction) -QT_FORWARD_DECLARE_CLASS(QSGItem) +QT_FORWARD_DECLARE_CLASS(QQuickItem) namespace QmlJSDebugger { @@ -79,7 +79,7 @@ private slots: void contextMenuElementSelected(); private: - void createContextMenu(const QList<QSGItem*> &items, QPoint pos); + void createContextMenu(const QList<QQuickItem*> &items, QPoint pos); SGViewInspector *inspector() const; diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp index a6f405261d..89438b6559 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.cpp @@ -45,10 +45,10 @@ #include "sghighlight.h" #include "sgselectiontool.h" -#include <QtDeclarative/private/qsgitem_p.h> +#include <QtDeclarative/private/qquickitem_p.h> -#include <QtDeclarative/QSGView> -#include <QtDeclarative/QSGItem> +#include <QtDeclarative/QQuickView> +#include <QtDeclarative/QQuickItem> #include <cfloat> @@ -57,20 +57,20 @@ namespace QmlJSDebugger { /* * Collects all the items at the given position, from top to bottom. */ -static void collectItemsAt(QSGItem *item, const QPointF &pos, QSGItem *overlay, - QList<QSGItem *> &resultList) +static void collectItemsAt(QQuickItem *item, const QPointF &pos, QQuickItem *overlay, + QList<QQuickItem *> &resultList) { if (item == overlay) return; - if (item->flags() & QSGItem::ItemClipsChildrenToShape) { + if (item->flags() & QQuickItem::ItemClipsChildrenToShape) { if (!QRectF(0, 0, item->width(), item->height()).contains(pos)) return; } - QList<QSGItem *> children = QSGItemPrivate::get(item)->paintOrderChildItems(); + QList<QQuickItem *> children = QQuickItemPrivate::get(item)->paintOrderChildItems(); for (int i = children.count() - 1; i >= 0; --i) { - QSGItem *child = children.at(i); + QQuickItem *child = children.at(i); collectItemsAt(child, item->mapToItem(child, pos), overlay, resultList); } @@ -84,7 +84,7 @@ static void collectItemsAt(QSGItem *item, const QPointF &pos, QSGItem *overlay, * Returns the first visible item at the given position, or 0 when no such * child exists. */ -static QSGItem *itemAt(QSGItem *item, const QPointF &pos, QSGItem *overlay) +static QQuickItem *itemAt(QQuickItem *item, const QPointF &pos, QQuickItem *overlay) { if (item == overlay) return 0; @@ -92,19 +92,19 @@ static QSGItem *itemAt(QSGItem *item, const QPointF &pos, QSGItem *overlay) if (!item->isVisible() || item->opacity() == 0.0) return 0; - if (item->flags() & QSGItem::ItemClipsChildrenToShape) { + if (item->flags() & QQuickItem::ItemClipsChildrenToShape) { if (!QRectF(0, 0, item->width(), item->height()).contains(pos)) return 0; } - QList<QSGItem *> children = QSGItemPrivate::get(item)->paintOrderChildItems(); + QList<QQuickItem *> children = QQuickItemPrivate::get(item)->paintOrderChildItems(); for (int i = children.count() - 1; i >= 0; --i) { - QSGItem *child = children.at(i); - if (QSGItem *betterCandidate = itemAt(child, item->mapToItem(child, pos), overlay)) + QQuickItem *child = children.at(i); + if (QQuickItem *betterCandidate = itemAt(child, item->mapToItem(child, pos), overlay)) return betterCandidate; } - if (!(item->flags() & QSGItem::ItemHasContents)) + if (!(item->flags() & QQuickItem::ItemHasContents)) return 0; if (!QRectF(0, 0, item->width(), item->height()).contains(pos)) @@ -114,10 +114,10 @@ static QSGItem *itemAt(QSGItem *item, const QPointF &pos, QSGItem *overlay) } -SGViewInspector::SGViewInspector(QSGView *view, QObject *parent) : +SGViewInspector::SGViewInspector(QQuickView *view, QObject *parent) : AbstractViewInspector(parent), m_view(view), - m_overlay(new QSGItem), + m_overlay(new QQuickItem), m_selectionTool(new SGSelectionTool(this)), m_designMode(true) { @@ -128,7 +128,7 @@ SGViewInspector::SGViewInspector(QSGView *view, QObject *parent) : // Make sure mouse hover events are received // m_view->setMouseTracking(true); - if (QSGItem *root = view->rootItem()) + if (QQuickItem *root = view->rootItem()) m_overlay->setParentItem(root); view->installEventFilter(this); @@ -137,9 +137,9 @@ SGViewInspector::SGViewInspector(QSGView *view, QObject *parent) : void SGViewInspector::changeCurrentObjects(const QList<QObject*> &objects) { - QList<QSGItem*> items; + QList<QQuickItem*> items; foreach (QObject *obj, objects) - if (QSGItem *item = qobject_cast<QSGItem*>(obj)) + if (QQuickItem *item = qobject_cast<QQuickItem*>(obj)) items << item; syncSelectedItems(items); @@ -157,8 +157,8 @@ void SGViewInspector::reparentQmlObject(QObject *object, QObject *newParent) return; object->setParent(newParent); - QSGItem *newParentItem = qobject_cast<QSGItem*>(newParent); - QSGItem *item = qobject_cast<QSGItem*>(object); + QQuickItem *newParentItem = qobject_cast<QQuickItem*>(newParent); + QQuickItem *item = qobject_cast<QQuickItem*>(object); if (newParentItem && item) item->setParentItem(newParentItem); } @@ -212,48 +212,48 @@ QDeclarativeEngine *SGViewInspector::declarativeEngine() const return m_view->engine(); } -QSGItem *SGViewInspector::topVisibleItemAt(const QPointF &pos) const +QQuickItem *SGViewInspector::topVisibleItemAt(const QPointF &pos) const { - QSGItem *root = m_view->rootItem(); + QQuickItem *root = m_view->rootItem(); return itemAt(root, root->mapFromScene(pos), m_overlay); } -QList<QSGItem *> SGViewInspector::itemsAt(const QPointF &pos) const +QList<QQuickItem *> SGViewInspector::itemsAt(const QPointF &pos) const { - QSGItem *root = m_view->rootItem(); - QList<QSGItem *> resultList; + QQuickItem *root = m_view->rootItem(); + QList<QQuickItem *> resultList; collectItemsAt(root, root->mapFromScene(pos), m_overlay, resultList); return resultList; } -QList<QSGItem*> SGViewInspector::selectedItems() const +QList<QQuickItem*> SGViewInspector::selectedItems() const { - QList<QSGItem *> selection; - foreach (const QWeakPointer<QSGItem> &selectedItem, m_selectedItems) { + QList<QQuickItem *> selection; + foreach (const QWeakPointer<QQuickItem> &selectedItem, m_selectedItems) { if (selectedItem) selection << selectedItem.data(); } return selection; } -void SGViewInspector::setSelectedItems(const QList<QSGItem *> &items) +void SGViewInspector::setSelectedItems(const QList<QQuickItem *> &items) { if (!syncSelectedItems(items)) return; QList<QObject*> objectList; - foreach (QSGItem *item, items) + foreach (QQuickItem *item, items) objectList << item; sendCurrentObjects(objectList); } -bool SGViewInspector::syncSelectedItems(const QList<QSGItem *> &items) +bool SGViewInspector::syncSelectedItems(const QList<QQuickItem *> &items) { bool selectionChanged = false; // Disconnect and remove items that are no longer selected - foreach (const QWeakPointer<QSGItem> &item, m_selectedItems) { + foreach (const QWeakPointer<QQuickItem> &item, m_selectedItems) { if (!item) // Don't see how this can happen due to handling of destroyed() continue; if (items.contains(item.data())) @@ -266,7 +266,7 @@ bool SGViewInspector::syncSelectedItems(const QList<QSGItem *> &items) } // Connect and add newly selected items - foreach (QSGItem *item, items) { + foreach (QQuickItem *item, items) { if (m_selectedItems.contains(item)) continue; @@ -281,7 +281,7 @@ bool SGViewInspector::syncSelectedItems(const QList<QSGItem *> &items) void SGViewInspector::removeFromSelectedItems(QObject *object) { - if (QSGItem *item = qobject_cast<QSGItem*>(object)) { + if (QQuickItem *item = qobject_cast<QQuickItem*>(object)) { if (m_selectedItems.removeOne(item)) delete m_highlightItems.take(item); } @@ -298,7 +298,7 @@ bool SGViewInspector::eventFilter(QObject *obj, QEvent *event) bool SGViewInspector::mouseMoveEvent(QMouseEvent *event) { // TODO -// if (QSGItem *item = topVisibleItemAt(event->pos())) +// if (QQuickItem *item = topVisibleItemAt(event->pos())) // m_view->setToolTip(titleForItem(item)); // else // m_view->setToolTip(QString()); @@ -306,15 +306,15 @@ bool SGViewInspector::mouseMoveEvent(QMouseEvent *event) return AbstractViewInspector::mouseMoveEvent(event); } -QString SGViewInspector::titleForItem(QSGItem *item) const +QString SGViewInspector::titleForItem(QQuickItem *item) const { QString className = QLatin1String(item->metaObject()->className()); QString objectStringId = idStringForObject(item); className.remove(QRegExp(QLatin1String("_QMLTYPE_\\d+"))); className.remove(QRegExp(QLatin1String("_QML_\\d+"))); - if (className.startsWith(QLatin1String("QSG"))) - className = className.mid(3); + if (className.startsWith(QLatin1String("QQuick"))) + className = className.mid(6); QString constructedName; diff --git a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h index 38271aa2d7..788d6a0924 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h +++ b/src/plugins/qmltooling/qmldbg_inspector/sgviewinspector.h @@ -48,8 +48,8 @@ #include <QtCore/QHash> QT_BEGIN_NAMESPACE -class QSGView; -class QSGItem; +class QQuickView; +class QQuickItem; QT_END_NAMESPACE namespace QmlJSDebugger { @@ -61,7 +61,7 @@ class SGViewInspector : public AbstractViewInspector { Q_OBJECT public: - explicit SGViewInspector(QSGView *view, QObject *parent = 0); + explicit SGViewInspector(QQuickView *view, QObject *parent = 0); // AbstractViewInspector void changeCurrentObjects(const QList<QObject*> &objects); @@ -72,16 +72,16 @@ public: void setWindowFlags(Qt::WindowFlags flags); QDeclarativeEngine *declarativeEngine() const; - QSGView *view() const { return m_view; } - QSGItem *overlay() const { return m_overlay; } + QQuickView *view() const { return m_view; } + QQuickItem *overlay() const { return m_overlay; } - QSGItem *topVisibleItemAt(const QPointF &pos) const; - QList<QSGItem *> itemsAt(const QPointF &pos) const; + QQuickItem *topVisibleItemAt(const QPointF &pos) const; + QList<QQuickItem *> itemsAt(const QPointF &pos) const; - QList<QSGItem *> selectedItems() const; - void setSelectedItems(const QList<QSGItem*> &items); + QList<QQuickItem *> selectedItems() const; + void setSelectedItems(const QList<QQuickItem*> &items); - QString titleForItem(QSGItem *item) const; + QString titleForItem(QQuickItem *item) const; protected: bool eventFilter(QObject *obj, QEvent *event); @@ -92,15 +92,15 @@ private slots: void removeFromSelectedItems(QObject *); private: - bool syncSelectedItems(const QList<QSGItem*> &items); + bool syncSelectedItems(const QList<QQuickItem*> &items); - QSGView *m_view; - QSGItem *m_overlay; + QQuickView *m_view; + QQuickItem *m_overlay; SGSelectionTool *m_selectionTool; - QList<QWeakPointer<QSGItem> > m_selectedItems; - QHash<QSGItem*, SGSelectionHighlight*> m_highlightItems; + QList<QWeakPointer<QQuickItem> > m_selectedItems; + QHash<QQuickItem*, SGSelectionHighlight*> m_highlightItems; bool m_designMode; }; |