diff options
Diffstat (limited to 'src/widgets/widgets/qtoolbarlayout_p.h')
-rw-r--r-- | src/widgets/widgets/qtoolbarlayout_p.h | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h index 1a406a3d29..a7d3810d61 100644 --- a/src/widgets/widgets/qtoolbarlayout_p.h +++ b/src/widgets/widgets/qtoolbarlayout_p.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 QTOOLBARLAYOUT_P_H #define QTOOLBARLAYOUT_P_H @@ -54,7 +18,7 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qlayout.h> #include <private/qlayoutengine_p.h> -#include <QVector> +#include <QList> QT_REQUIRE_CONFIG(toolbar); @@ -96,7 +60,7 @@ public: QSize sizeHint() const override; void insertAction(int index, QAction *action); - int indexOf(const QGuiAction *action) const; + int indexOf(const QAction *action) const; using QLayout::indexOf; // bring back the hidden members bool layoutActions(const QSize &size); @@ -118,7 +82,7 @@ private: QList<QToolBarItem*> items; QSize hint, minSize; bool dirty, expanding, empty, expandFlag; - QVector<QLayoutStruct> geomArray; + QList<QLayoutStruct> geomArray; QRect handRect; QToolBarExtension *extension; |