Changeset 561 for trunk/src/gui/graphicsview/qgridlayoutengine.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/graphicsview/qgridlayoutengine.cpp (modified) (16 diffs)

trunk/src/gui/graphicsview/qgridlayoutengine.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -52 +52 @@
 
 #include <QtDebug>
+
 
 QT_BEGIN_NAMESPACE
@@ -71 +72 @@
 {
     Q_ASSERT(sumDesired != 0.0);
-    return desired * ::pow(sumAvailable / sumDesired, desired / sumDesired);
+    return desired * ow(sumAvailable / sumDesired, desired / sumDesired);
 }
 
@@ -276 +277 @@
                             factors[i] = (stretch < 0) ? 1.0 : 0.0;
                         } else {
-                            factors[i] = (stretch < 0) ? sizes[i] : 0.0;                        
+                            factors[i] = (stretch < 0) ? sizes[i] : 0.0;
                         }
                     } else if (stretch == sumStretches) {
@@ -462 +463 @@
 QGridLayoutItem::QGridLayoutItem(QGridLayoutEngine *engine, QGraphicsLayoutItem *layoutItem,
                                  int row, int column, int rowSpan, int columnSpan,
-                                 Qt::Alignment alignment)
+                                 Qt::Alignment alignment)
     : q_engine(engine), q_layoutItem(layoutItem), q_alignment(alignment)
 {
@@ -472 +473 @@
     q_stretches[Ver] = -1;
 
-    q_engine->addItem(this);
+    q_engine->);
 }
 
@@ -616 +617 @@
         width = size.width();
         height = size.height();
-        
+
         Qt::Alignment align = q_engine->effectiveAlignment(this);
         switch (align & Qt::AlignHorizontal_Mask) {
@@ -718 +719 @@
 {
     count += delta;
-    
+
     insertOrRemoveItems(stretches, row, delta);
     insertOrRemoveItems(spacings, row, delta);
@@ -938 +939 @@
 }
 
-void QGridLayoutEngine::addItem(QGridLayoutItem *item)
+/*!
+    \internal
+    The \a index is only used by QGraphicsLinearLayout to ensure that itemAt() reflects the order
+    of visual arrangement. Strictly speaking it does not have to, but most people expect it to.
+    (And if it didn't we would have to add itemArrangedAt(int index) or something..)
+ */
+void QGridLayoutEngine::insertItem(QGridLayoutItem *item, int index)
 {
     maybeExpandGrid(item->lastRow(), item->lastColumn());
 
-    q_items.append(item);
+    if (index == -1)
+        q_items.append(item);
+    else
+        q_items.insert(index, item);
 
     for (int i = item->firstRow(); i <= item->lastRow(); ++i) {
@@ -951 +961 @@
         }
     }
+
+
+
+
+
 }
 
@@ -1077 +1092 @@
     }
     return QSizeF();
-} 
+}
 
 QSizePolicy::ControlTypes QGridLayoutEngine::controlTypes(LayoutSide side) const
@@ -1132 +1147 @@
         for (int column = 0; column < internalGridColumnCount(); ++column) {
             message += QString::number(q_items.indexOf(itemAt(row, column))).rightJustified(3);
-            message += QLatin1String(" ");
-        }
-        message += QLatin1String("]");
+            message += QLatin1);
+        }
+        message += QLatin1);
         qDebug("%*s  %s", indent, "", qPrintable(message));
     }
@@ -1151 +1166 @@
 
     qDebug("%*s Geometries output", indent, "");
+
     for (int pass = 0; pass < 2; ++pass) {
-        QVector<qreal> &cellPos = q_yy;
         QString message;
-        for (i = 0; i < cellPos.count(); ++i) {
+        for (i = 0; i < cellPoscount(); ++i) {
             message += QLatin1String((message.isEmpty() ? "[" : ", "));
-            message += QString::number(cellPos.at(i));
-        }
-        message += QLatin1String("]");
+            message += QString::number(cellPosat(i));
+        }
+        message += QLatin1);
         qDebug("%*s %s %s", indent, "", (pass == 0 ? "rows:" : "columns:"), qPrintable(message));
-        cellPos = q_xx;
+        cellPos = q_xx;
     }
 }
@@ -1539 +1554 @@
 
 QT_END_NAMESPACE
-        
+
 #endif //QT_NO_GRAPHICSVIEW