Changeset 561 for trunk/examples/layouts/flowlayout/flowlayout.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)
• examples/layouts/flowlayout/flowlayout.cpp (modified) (14 diffs)

trunk/examples/layouts/flowlayout/flowlayout.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 examples 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$
 **
@@ -43 +43 @@
 
 #include "flowlayout.h"
-
+//! [1]
 FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing)
     : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
 {
-    setMargin(margin);
+    setmargin);
 }
 
@@ -53 +53 @@
     : m_hSpace(hSpacing), m_vSpace(vSpacing)
 {
-    setMargin(margin);
-}
-
+    setContentsMargins(margin, margin, margin, margin);
+}
+//! [1]
+
+//! [2]
 FlowLayout::~FlowLayout()
 {
@@ -62 +64 @@
         delete item;
 }
-
+//! [2]
+
+//! [3]
 void FlowLayout::addItem(QLayoutItem *item)
 {
     itemList.append(item);
 }
-
+//! [3]
+
+//! [4]
 int FlowLayout::horizontalSpacing() const
 {
@@ -85 +91 @@
     }
 }
-
+//! [4]
+
+//! [5]
 int FlowLayout::count() const
 {
@@ -103 +111 @@
         return 0;
 }
-
+//! [5]
+
+//! [6]
 Qt::Orientations FlowLayout::expandingDirections() const
 {
     return 0;
 }
-
+//! [6]
+
+//! [7]
 bool FlowLayout::hasHeightForWidth() const
 {
@@ -119 +131 @@
     return height;
 }
-
+//! [7]
+
+//! [8]
 void FlowLayout::setGeometry(const QRect &rect)
 {
@@ -141 +155 @@
     return size;
 }
-
+//! [8]
+
+//! [9]
 int FlowLayout::doLayout(const QRect &rect, bool testOnly) const
 {
@@ -150 +166 @@
     int y = effectiveRect.y();
     int lineHeight = 0;
-
+//! [9]
+
+//! [10]
     QLayoutItem *item;
     foreach (item, itemList) {
@@ -162 +180 @@
             spaceY = wid->style()->layoutSpacing(
                 QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical);
+
+
         int nextX = x + item->sizeHint().width() + spaceX;
         if (nextX - spaceX > effectiveRect.right() && lineHeight > 0) {
@@ -178 +198 @@
     return y + lineHeight - rect.y() + bottom;
 }
-
+//! [11]
+//! [12]
 int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const
 {
@@ -191 +212 @@
     }
 }
-
+//! [12]