summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsitem.cpp
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2009-04-07 13:04:31 (GMT)
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2009-04-07 13:04:31 (GMT)
commit9904f77b26d3b75f8ed53e82c14ff8e9baf710dc (patch)
treea211ec300ef7c0361c8c6b531435617b3d5f2696 /src/gui/graphicsview/qgraphicsitem.cpp
parent0ea43e7d28815c133e8029f3d966871a10fef8e0 (diff)
downloadQt-9904f77b26d3b75f8ed53e82c14ff8e9baf710dc.zip
Qt-9904f77b26d3b75f8ed53e82c14ff8e9baf710dc.tar.gz
Qt-9904f77b26d3b75f8ed53e82c14ff8e9baf710dc.tar.bz2
BT: compilefix for Qt in namespace
RevBy: mauricek Details: using prefix qt_ instead of ::global namespace
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 9d320b7..b520a3f 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -3707,7 +3707,7 @@ void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly, bool maybeDirtyCl
dirtyChildren = 1;
}
-static inline bool allChildrenCombineOpacity(QGraphicsItem *parent)
+static inline bool qt_allChildrenCombineOpacity(QGraphicsItem *parent)
{
Q_ASSERT(parent);
if (parent->flags() & QGraphicsItem::ItemDoesntPropagateOpacityToChildren)
@@ -3726,11 +3726,11 @@ void QGraphicsItemPrivate::updateEffectiveOpacity()
Q_Q(QGraphicsItem);
if (parent) {
resolveEffectiveOpacity(parent->effectiveOpacity());
- parent->d_ptr->allChildrenCombineOpacity = ::allChildrenCombineOpacity(parent);
+ parent->d_ptr->allChildrenCombineOpacity = qt_allChildrenCombineOpacity(parent);
} else {
resolveEffectiveOpacity(1.0);
}
- allChildrenCombineOpacity = ::allChildrenCombineOpacity(q);
+ allChildrenCombineOpacity = qt_allChildrenCombineOpacity(q);
}
/*!