Changeset 561 for trunk/src/gui/graphicsview/qgridlayoutengine_p.h
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/gui/graphicsview/qgridlayoutengine_p.h
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** 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. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 60 60 #include "qpair.h" 61 61 #include "qvector.h" 62 62 #include "qgraphicslayout_p.h" 63 63 #include <float.h> 64 64 … … 129 129 }; 130 130 131 class QLayoutStyleInfo132 {133 public:134 inline QLayoutStyleInfo() { invalidate(); }135 inline QLayoutStyleInfo(QStyle *style, QWidget *widget)136 : q_valid(true), q_style(style), q_widget(widget) {}137 138 inline void invalidate() { q_valid = false; q_style = 0; q_widget = 0; }139 140 inline QStyle *style() const { return q_style; }141 inline QWidget *widget() const { return q_widget; }142 143 inline bool operator==(const QLayoutStyleInfo &other)144 { return q_style == other.q_style && q_widget == other.q_widget; }145 inline bool operator!=(const QLayoutStyleInfo &other)146 { return !(*this == other); }147 148 private:149 bool q_valid;150 QStyle *q_style;151 QWidget *q_widget;152 };153 154 131 class QGridLayoutBox 155 132 { … … 268 245 public: 269 246 QGridLayoutItem(QGridLayoutEngine *engine, QGraphicsLayoutItem *layoutItem, int row, int column, 270 int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = 0); 247 int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = 0, 248 int itemAtIndex = -1); 271 249 272 250 inline int firstRow() const { return q_firstRows[Ver]; } … … 379 357 380 358 359 void insertItem(QGridLayoutItem *item, int index); 381 360 void addItem(QGridLayoutItem *item); 382 361 void removeItem(QGridLayoutItem *item);
Note:
See TracChangeset
for help on using the changeset viewer.