diff options
Diffstat (limited to 'src/widgets/kernel/qgridlayout.h')
| -rw-r--r-- | src/widgets/kernel/qgridlayout.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 3e579e3dfd..ef95d29cd1 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -68,13 +68,6 @@ public: explicit QGridLayout(QWidget *parent); QGridLayout(); -#ifdef QT3_SUPPORT - QT3_SUPPORT_CONSTRUCTOR QGridLayout(QWidget *parent, int nRows , int nCols = 1, int border = 0, - int spacing = -1, const char *name = 0); - QT3_SUPPORT_CONSTRUCTOR QGridLayout(int nRows , int nCols = 1, int spacing = -1, const char *name = 0); - QT3_SUPPORT_CONSTRUCTOR QGridLayout(QLayout *parentLayout, int nRows = 1, int nCols = 1, int spacing = -1, - const char *name = 0); -#endif ~QGridLayout(); QSize sizeHint() const; @@ -102,9 +95,6 @@ public: int rowCount() const; QRect cellRect(int row, int column) const; -#ifdef QT3_SUPPORT - inline QT3_SUPPORT QRect cellGeometry(int row, int column) const {return cellRect(row, column);} -#endif bool hasHeightForWidth() const; int heightForWidth(int) const; @@ -122,10 +112,6 @@ public: void setOriginCorner(Qt::Corner); Qt::Corner originCorner() const; -#ifdef QT3_SUPPORT - inline QT3_SUPPORT void setOrigin(Qt::Corner corner) { setOriginCorner(corner); } - inline QT3_SUPPORT Qt::Corner origin() const { return originCorner(); } -#endif QLayoutItem *itemAt(int index) const; QLayoutItem *itemAtPosition(int row, int column) const; QLayoutItem *takeAt(int index); @@ -138,35 +124,11 @@ public: void getItemPosition(int idx, int *row, int *column, int *rowSpan, int *columnSpan); protected: -#ifdef QT3_SUPPORT - QT3_SUPPORT bool findWidget(QWidget* w, int *r, int *c); -#endif void addItem(QLayoutItem *); private: Q_DISABLE_COPY(QGridLayout) -#ifdef QT3_SUPPORT -public: - QT3_SUPPORT void expand(int rows, int cols); - inline QT3_SUPPORT void addRowSpacing(int row, int minsize) { addItem(new QSpacerItem(0,minsize), row, 0); } - inline QT3_SUPPORT void addColSpacing(int col, int minsize) { addItem(new QSpacerItem(minsize,0), 0, col); } - inline QT3_SUPPORT void addMultiCellWidget(QWidget *w, int fromRow, int toRow, int fromCol, int toCol, Qt::Alignment _align = 0) - { addWidget(w, fromRow, fromCol, (toRow < 0) ? -1 : toRow - fromRow + 1, (toCol < 0) ? -1 : toCol - fromCol + 1, _align); } - inline QT3_SUPPORT void addMultiCell(QLayoutItem *l, int fromRow, int toRow, int fromCol, int toCol, Qt::Alignment _align = 0) - { addItem(l, fromRow, fromCol, (toRow < 0) ? -1 : toRow - fromRow + 1, (toCol < 0) ? -1 : toCol - fromCol + 1, _align); } - inline QT3_SUPPORT void addMultiCellLayout(QLayout *layout, int fromRow, int toRow, int fromCol, int toCol, Qt::Alignment _align = 0) - { addLayout(layout, fromRow, fromCol, (toRow < 0) ? -1 : toRow - fromRow + 1, (toCol < 0) ? -1 : toCol - fromCol + 1, _align); } - - inline QT3_SUPPORT int numRows() const { return rowCount(); } - inline QT3_SUPPORT int numCols() const { return columnCount(); } - inline QT3_SUPPORT void setColStretch(int col, int stretch) {setColumnStretch(col, stretch); } - inline QT3_SUPPORT int colStretch(int col) const {return columnStretch(col); } - inline QT3_SUPPORT void setColSpacing(int col, int minSize) { setColumnMinimumWidth(col, minSize); } - inline QT3_SUPPORT int colSpacing(int col) const { return columnMinimumWidth(col); } - inline QT3_SUPPORT void setRowSpacing(int row, int minSize) {setRowMinimumHeight(row, minSize); } - inline QT3_SUPPORT int rowSpacing(int row) const {return rowMinimumHeight(row); } -#endif }; QT_END_NAMESPACE |