Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/graphicsview/qgridlayoutengine_p.h

    r2 r561  
    22**
    33** 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)
    56**
    67** This file is part of the QtGui module of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    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.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** 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.
    3838** $QT_END_LICENSE$
    3939**
     
    6060#include "qpair.h"
    6161#include "qvector.h"
    62 
     62#include "qgraphicslayout_p.h"
    6363#include <float.h>
    6464
     
    129129};
    130130
    131 class QLayoutStyleInfo
    132 {
    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 
    154131class QGridLayoutBox
    155132{
     
    268245public:
    269246    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);
    271249
    272250    inline int firstRow() const { return q_firstRows[Ver]; }
     
    379357
    380358
     359    void insertItem(QGridLayoutItem *item, int index);
    381360    void addItem(QGridLayoutItem *item);
    382361    void removeItem(QGridLayoutItem *item);
Note: See TracChangeset for help on using the changeset viewer.