Changeset 651 for trunk/src/gui/graphicsview/qgraphicsitem_p.h

Timestamp:

Mar 8, 2010, 12:52:58 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/graphicsview/qgraphicsitem_p.h (modified) (12 diffs)

trunk/src/gui/graphicsview/qgraphicsitem_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -154 +154 @@
         localCollisionHack(0),
         inSetPosHelper(0),
-        needSortChildren(1), // ### can be 0 by default?
+        needSortChildren(
         allChildrenDirty(0),
         fullUpdatePending(0),
@@ -179 +179 @@
         updateDueToGraphicsEffect(0),
         scenePosDescendants(0),
+
+
         globalStackingOrder(-1),
         q_ptr(0)
@@ -196 +198 @@
     }
 
+
     void updateAncestorFlag(QGraphicsItem::GraphicsItemFlag childFlag,
                             AncestorFlag flag = NoFlag, bool enabled = false, bool root = true);
+
     void setIsMemberOfGroup(bool enabled);
     void remapItemPos(QEvent *event, QGraphicsItem *item);
@@ -224 +228 @@
     int depth() const;
 #ifndef QT_NO_GRAPHICSEFFECT
-    void invalidateGraphicsEffectsRecursively();
+    enum InvalidateReason {
+        OpacityChanged
+    };
+    void invalidateParentGraphicsEffectsRecursively();
+    void invalidateChildGraphicsEffectsRecursively(InvalidateReason reason);
 #endif //QT_NO_GRAPHICSEFFECT
     void invalidateDepthRecursively();
@@ -230 +238 @@
     void addChild(QGraphicsItem *child);
     void removeChild(QGraphicsItem *child);
-    void setParentItemHelper(QGraphicsItem *parent);
+    void setParentItemHelper(QGraphicsItem *parent, const QVariant *newParentVariant,
+                             const QVariant *thisPointerVariant);
     void childrenBoundingRectHelper(QTransform *x, QRectF *rect);
     void initStyleOption(QStyleOptionGraphicsItem *option, const QTransform &worldTransform,
@@ -350 +359 @@
     }
 
+
+
+
+
+
+
     inline bool isFullyTransparent() const
     {
-        if (opacity < 0.001)
+        if ()
             return true;
         if (!parent)
             return false;
 
-        return calcEffectiveOpacity() < 0.001;
+        return ;
     }
 
@@ -397 +412 @@
         return !visible || (childrenCombineOpacity() && isFullyTransparent());
     }
+
+
 
     void setFocusHelper(Qt::FocusReason focusReason, bool climb);
@@ -485 +502 @@
     quint32 updateDueToGraphicsEffect : 1;
     quint32 scenePosDescendants : 1;
+
+
 
     // Optional stacking order
@@ -610 +629 @@
                    QPoint *offset,
                    QGraphicsEffect::PixmapPadMode mode) const;
+
 
     QGraphicsItem *item;
@@ -721 +741 @@
 {
     if (needSortChildren) {
-        qSort(children.begin(), children.end(), qt_notclosestLeaf);
         needSortChildren = 0;
         sequentialOrdering = 1;
+
+
+
         for (int i = 0; i < children.size(); ++i) {
-            if (children[i]->d_ptr->siblingIndex != i) {
+            if (children->d_ptr->siblingIndex != i) {
                 sequentialOrdering = 0;
                 break;
@@ -741 +763 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE