Changeset 561 for trunk/src/gui/graphicsview/qgraphicsgridlayout.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/qgraphicsgridlayout.cpp (modified) (10 diffs)

trunk/src/gui/graphicsview/qgraphicsgridlayout.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
     widgets in Graphics View.
     \since 4.4
-    \ingroup multimedia
+
     \ingroup graphicsview-api
 
@@ -64 +64 @@
     removeAt() will remove an item from the layout, without
     destroying it.
-    
+
     \sa QGraphicsLinearLayout, QGraphicsWidget
 */
@@ -90 +90 @@
 
     QGridLayoutEngine engine;
-#ifdef QT_DEBUG    
+#ifdef QT_DEBUG
     void dump(int indent) const;
 #endif
@@ -101 +101 @@
         wid = new QWidget;
     QGraphicsItem *item = parentItem();
-    QStyle *style = (item && item->isWidget()) ? static_cast<QGraphicsWidget*>(item)->style() : qApp->style();
+    QStyle *style = (item && item->isWidget()) ? static_cast<QGraphicsWidget*>(item)->style() : QApplication::style();
     return QLayoutStyleInfo(style, wid);
 }
@@ -122 +122 @@
         QGraphicsLayoutItem *item = itemAt(i);
         // The following lines can be removed, but this removes the item
-        // from the layout more efficiently than the implementation of 
+        // from the layout more efficiently than the implementation of
         // ~QGraphicsLayoutItem.
         removeAt(i);
@@ -142 +142 @@
     Q_D(QGraphicsGridLayout);
     if (row < 0 || column < 0) {
-        qWarning("QGraphicsGridLayout::addItem: invalid row/column: %d",
-                 row < 0 ? row : column);
-        return;
+        qWarning("QGraphicsGridLayout::addItem: invalid row/column: %d",
+                 row < 0 ? row : column);
+        return;
     }
     if (columnSpan < 1 || rowSpan < 1) {
-        qWarning("QGraphicsGridLayout::addItem: invalid row span/column span: %d",
-                 rowSpan < 1 ? rowSpan : columnSpan);
-        return;
+        qWarning("QGraphicsGridLayout::addItem: invalid row span/column span: %d",
+                 rowSpan < 1 ? rowSpan : columnSpan);
+        return;
     }
     if (!item) {
-        qWarning("QGraphicsGridLayout::addItem: cannot add null item");
-        return;
+        qWarning("QGraphicsGridLayout::addItem: cannot add null item");
+        return;
+    }
+    if (item == this) {
+        qWarning("QGraphicsGridLayout::addItem: cannot insert itself");
+        return;
     }
 
@@ -648 +652 @@
 
 QT_END_NAMESPACE
-        
-#endif //QT_NO_GRAPHICSVIEW        
+
+#endif //QT_NO_GRAPHICSVIEW