summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsitem.h
diff options
context:
space:
mode:
authorAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-07-29 00:32:48 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-07-29 03:07:52 (GMT)
commit509a04338bc2b556c15f494a73947e82e3cdcc62 (patch)
treec64ee27efbf20350c3530817f369a1a6ab3f8156 /src/gui/graphicsview/qgraphicsitem.h
parent2c9bf5d611cbc293851c80d4df5a46c36eac41f7 (diff)
downloadQt-509a04338bc2b556c15f494a73947e82e3cdcc62.zip
Qt-509a04338bc2b556c15f494a73947e82e3cdcc62.tar.gz
Qt-509a04338bc2b556c15f494a73947e82e3cdcc62.tar.bz2
Disambiguate QGraphicsObject::children().
Add using to prefer QObject::children() over the obsolete QGraphicsItem::children() function. Reviewed-by: Henrik Hartz
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.h')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index 945163f..b94fb97 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -514,6 +514,13 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem
public:
QGraphicsObject(QGraphicsItem *parent = 0);
+ // ### Qt 5: Disambiguate
+#ifdef Q_NO_USING_KEYWORD
+ const QObjectList &children() const { return QObject::children(); }
+#else
+ using QObject::children;
+#endif
+
Q_SIGNALS:
void parentChanged();
void opacityChanged();