aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/scenegraph
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-23 16:07:09 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-04-23 12:13:20 +0200
commit9fd4160307ab54b89d0145ebde0a91d293fa95a5 (patch)
tree4931fac50b7237d23a8d2064c665c9da841ef96a /examples/quick/scenegraph
parent05293cde367678cca78a46f7a050a1fd41686e87 (diff)
QQuickItem: rename geometryChanged to geometryChange
This brings it in line with the existing convention in this and other modules, where virtual handlers are named "nounChange"; e.g. itemChange. Signals are named "nounChanged". This also allows adding a geometryChanged signal, which would enable users to listen to one signal for all changes to x/y/width/height. [ChangeLog][QQuickItem] Renamed geometryChanged to geometryChange in order to follow existing naming conventions and have consistency with existing API, such as itemChange. Task-number: QTBUG-82994 Change-Id: I0547358c796a0047982ccfbf2c38bab952e7a634 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'examples/quick/scenegraph')
-rw-r--r--examples/quick/scenegraph/graph/graph.cpp4
-rw-r--r--examples/quick/scenegraph/graph/graph.h2
-rw-r--r--examples/quick/scenegraph/metaltextureimport/metaltextureimport.h2
-rw-r--r--examples/quick/scenegraph/metaltextureimport/metaltextureimport.mm4
-rw-r--r--examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.cpp4
-rw-r--r--examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/examples/quick/scenegraph/graph/graph.cpp b/examples/quick/scenegraph/graph/graph.cpp
index ccf98ef813..2df1aca91b 100644
--- a/examples/quick/scenegraph/graph/graph.cpp
+++ b/examples/quick/scenegraph/graph/graph.cpp
@@ -77,11 +77,11 @@ void Graph::removeFirstSample()
update();
}
-void Graph::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void Graph::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
{
m_geometryChanged = true;
update();
- QQuickItem::geometryChanged(newGeometry, oldGeometry);
+ QQuickItem::geometryChange(newGeometry, oldGeometry);
}
diff --git a/examples/quick/scenegraph/graph/graph.h b/examples/quick/scenegraph/graph/graph.h
index e32e657e0e..428f877049 100644
--- a/examples/quick/scenegraph/graph/graph.h
+++ b/examples/quick/scenegraph/graph/graph.h
@@ -62,7 +62,7 @@ public:
protected:
QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+ void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry);
public slots:
void appendSample(qreal value);
diff --git a/examples/quick/scenegraph/metaltextureimport/metaltextureimport.h b/examples/quick/scenegraph/metaltextureimport/metaltextureimport.h
index 49a29565a7..3ed7c548d7 100644
--- a/examples/quick/scenegraph/metaltextureimport/metaltextureimport.h
+++ b/examples/quick/scenegraph/metaltextureimport/metaltextureimport.h
@@ -73,7 +73,7 @@ signals:
protected:
QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+ void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
private slots:
void invalidateSceneGraph();
diff --git a/examples/quick/scenegraph/metaltextureimport/metaltextureimport.mm b/examples/quick/scenegraph/metaltextureimport/metaltextureimport.mm
index 5a86cacbfe..61f5e7f8e1 100644
--- a/examples/quick/scenegraph/metaltextureimport/metaltextureimport.mm
+++ b/examples/quick/scenegraph/metaltextureimport/metaltextureimport.mm
@@ -147,9 +147,9 @@ QSGNode *CustomTextureItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *
}
//! [2]
-void CustomTextureItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void CustomTextureItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
{
- QQuickItem::geometryChanged(newGeometry, oldGeometry);
+ QQuickItem::geometryChange(newGeometry, oldGeometry);
if (newGeometry.size() != oldGeometry.size())
update();
diff --git a/examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.cpp b/examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.cpp
index a09a05e735..964984085e 100644
--- a/examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.cpp
+++ b/examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.cpp
@@ -163,9 +163,9 @@ QSGNode *CustomTextureItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *
return n;
}
-void CustomTextureItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void CustomTextureItem::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
{
- QQuickItem::geometryChanged(newGeometry, oldGeometry);
+ QQuickItem::geometryChange(newGeometry, oldGeometry);
if (newGeometry.size() != oldGeometry.size())
update();
diff --git a/examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.h b/examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.h
index b8c13b44f6..401b5546f9 100644
--- a/examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.h
+++ b/examples/quick/scenegraph/vulkantextureimport/vulkantextureimport.h
@@ -73,7 +73,7 @@ signals:
protected:
QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) override;
- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+ void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
private slots:
void invalidateSceneGraph();