summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2009-04-07 12:34:05 (GMT)
committerhjk <qtc-committer@nokia.com>2009-04-07 12:34:05 (GMT)
commit1562ae67a1be7a16e1e2f6a5c40528da61e40cec (patch)
tree67afdcbb1028cd71529469dd4af3d6beeecbe4a6
parent3934e698b00e5ee89cd3b2b4474bc50a4947a174 (diff)
downloadQt-1562ae67a1be7a16e1e2f6a5c40528da61e40cec.zip
Qt-1562ae67a1be7a16e1e2f6a5c40528da61e40cec.tar.gz
Qt-1562ae67a1be7a16e1e2f6a5c40528da61e40cec.tar.bz2
compile fix with namespaces
-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 742b711..26fc485 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -3713,7 +3713,7 @@ void QGraphicsItemPrivate::fullUpdateHelper(bool childrenOnly, bool maybeDirtyCl
dirtyChildren = 1;
}
-static inline bool allChildrenCombineOpacity(QGraphicsItem *parent)
+static inline bool allChildrenCombineOpacityHelper(QGraphicsItem *parent)
{
Q_ASSERT(parent);
if (parent->flags() & QGraphicsItem::ItemDoesntPropagateOpacityToChildren)
@@ -3732,11 +3732,11 @@ void QGraphicsItemPrivate::updateEffectiveOpacity()
Q_Q(QGraphicsItem);
if (parent) {
resolveEffectiveOpacity(parent->effectiveOpacity());
- parent->d_ptr->allChildrenCombineOpacity = ::allChildrenCombineOpacity(parent);
+ parent->d_ptr->allChildrenCombineOpacity = allChildrenCombineOpacityHelper(parent);
} else {
resolveEffectiveOpacity(1.0);
}
- allChildrenCombineOpacity = ::allChildrenCombineOpacity(q);
+ allChildrenCombineOpacity = allChildrenCombineOpacityHelper(q);
}
/*!