diff options
Diffstat (limited to 'src/widgets/kernel/qboxlayout.h')
| -rw-r--r-- | src/widgets/kernel/qboxlayout.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index c2da23f34c..5ce9ca26f6 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWidgets module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -67,7 +67,7 @@ public: void addWidget(QWidget *, int stretch = 0, Qt::Alignment alignment = 0); void addLayout(QLayout *layout, int stretch = 0); void addStrut(int); - void addItem(QLayoutItem *); + void addItem(QLayoutItem *) Q_DECL_OVERRIDE; void insertSpacing(int index, int size); void insertStretch(int index, int stretch = 0); @@ -84,20 +84,20 @@ public: void setStretch(int index, int stretch); int stretch(int index) const; - QSize sizeHint() const; - QSize minimumSize() const; - QSize maximumSize() const; + QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSize() const Q_DECL_OVERRIDE; + QSize maximumSize() const Q_DECL_OVERRIDE; - bool hasHeightForWidth() const; - int heightForWidth(int) const; - int minimumHeightForWidth(int) const; + bool hasHeightForWidth() const Q_DECL_OVERRIDE; + int heightForWidth(int) const Q_DECL_OVERRIDE; + int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections() const; - void invalidate(); - QLayoutItem *itemAt(int) const; - QLayoutItem *takeAt(int); - int count() const; - void setGeometry(const QRect&); + Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + void invalidate() Q_DECL_OVERRIDE; + QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; + QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; + int count() const Q_DECL_OVERRIDE; + void setGeometry(const QRect&) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QBoxLayout) |