diff options
Diffstat (limited to 'src/widgets/kernel/qlayout.h')
| -rw-r--r-- | src/widgets/kernel/qlayout.h | 55 |
1 files changed, 11 insertions, 44 deletions
diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index ff04c4d334..ee7b5e047c 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QLAYOUT_H #define QLAYOUT_H @@ -64,6 +28,8 @@ class Q_WIDGETS_EXPORT QLayout : public QObject, public QLayoutItem Q_DECLARE_PRIVATE(QLayout) Q_PROPERTY(int spacing READ spacing WRITE setSpacing) + Q_PROPERTY(QMargins contentsMargins READ contentsMargins WRITE setContentsMargins + RESET unsetContentsMargins) Q_PROPERTY(SizeConstraint sizeConstraint READ sizeConstraint WRITE setSizeConstraint) public: enum SizeConstraint { @@ -76,8 +42,7 @@ public: }; Q_ENUM(SizeConstraint) - QLayout(QWidget *parent); - QLayout(); + explicit QLayout(QWidget *parent = nullptr); ~QLayout(); virtual int spacing() const; @@ -85,6 +50,7 @@ public: void setContentsMargins(int left, int top, int right, int bottom); void setContentsMargins(const QMargins &margins); + void unsetContentsMargins(); void getContentsMargins(int *left, int *top, int *right, int *bottom) const; QMargins contentsMargins() const; QRect contentsRect() const; @@ -117,15 +83,16 @@ public: virtual void setGeometry(const QRect&) override; virtual QLayoutItem *itemAt(int index) const = 0; virtual QLayoutItem *takeAt(int index) = 0; - virtual int indexOf(QWidget *) const; - QT6_VIRTUAL int indexOf(QLayoutItem *) const; + virtual int indexOf(const QWidget *) const; + virtual int indexOf(const QLayoutItem *) const; virtual int count() const = 0; bool isEmpty() const override; QSizePolicy::ControlTypes controlTypes() const override; - QT6_VIRTUAL QLayoutItem *replaceWidget(QWidget *from, QWidget *to, - Qt::FindChildOptions options = Qt::FindChildrenRecursively); + virtual QLayoutItem *replaceWidget(QWidget *from, QWidget *to, + Qt::FindChildOptions options = Qt::FindChildrenRecursively); + int totalMinimumHeightForWidth(int w) const; int totalHeightForWidth(int w) const; QSize totalMinimumSize() const; QSize totalMaximumSize() const; |