diff options
Diffstat (limited to 'src/widgets/widgets/qtoolbox.cpp')
-rw-r--r-- | src/widgets/widgets/qtoolbox.cpp | 71 |
1 files changed, 18 insertions, 53 deletions
diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index 4767394842..e0fac9be0f 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -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 #include "qtoolbox.h" @@ -47,15 +11,17 @@ #include <qscrollarea.h> #include <qstyle.h> #include <qstyleoption.h> +#if QT_CONFIG(tooltip) #include <qtooltip.h> +#endif #include <qabstractbutton.h> -#include <private/qmemory_p.h> - #include "qframe_p.h" QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + class QToolBoxButton : public QAbstractButton { Q_OBJECT @@ -96,7 +62,7 @@ public: inline void setText(const QString &text) { button->setText(text); } inline void setIcon(const QIcon &is) { button->setIcon(is); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) inline void setToolTip(const QString &tip) { button->setToolTip(tip); } inline QString toolTip() const { return button->toolTip(); } #endif @@ -189,8 +155,7 @@ QSize QToolBoxButton::sizeHint() const } QSize textSize = fontMetrics().size(Qt::TextShowMnemonic, text()) + QSize(0, 8); - QSize total(iconSize.width() + textSize.width(), qMax(iconSize.height(), textSize.height())); - return total.expandedTo(QApplication::globalStrut()); + return QSize(iconSize.width() + textSize.width(), qMax(iconSize.height(), textSize.height())); } QSize QToolBoxButton::minimumSizeHint() const @@ -348,11 +313,11 @@ int QToolBox::insertItem(int index, QWidget *widget, const QIcon &icon, const QS Q_D(QToolBox); connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(_q_widgetDestroyed(QObject*))); - auto newPage = qt_make_unique<QToolBoxPrivate::Page>(); + auto newPage = std::make_unique<QToolBoxPrivate::Page>(); auto &c = *newPage; c.widget = widget; c.button = new QToolBoxButton(this); - c.button->setObjectName(QLatin1String("qt_toolbox_toolboxbutton")); + c.button->setObjectName("qt_toolbox_toolboxbutton"_L1); connect(c.button, SIGNAL(clicked()), this, SLOT(_q_buttonClicked())); c.sv = new QScrollArea(this); @@ -559,7 +524,7 @@ QWidget *QToolBox::widget(int index) const exist. */ -int QToolBox::indexOf(QWidget *widget) const +int QToolBox::indexOf(const QWidget *widget) const { Q_D(const QToolBox); const QToolBoxPrivate::Page *c = (widget ? d->page(widget) : nullptr); @@ -639,7 +604,7 @@ void QToolBox::setItemIcon(int index, const QIcon &icon) c->setIcon(icon); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) /*! Sets the tooltip of the item at position \a index to \a toolTip. */ @@ -651,7 +616,7 @@ void QToolBox::setItemToolTip(int index, const QString &toolTip) if (c) c->setToolTip(toolTip); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) /*! Returns \c true if the item at position \a index is enabled; otherwise returns \c false. @@ -688,7 +653,7 @@ QIcon QToolBox::itemIcon(int index) const return (c ? c->icon() : QIcon()); } -#ifndef QT_NO_TOOLTIP +#if QT_CONFIG(tooltip) /*! Returns the tooltip of the item at position \a index, or an empty string if \a index is out of range. @@ -700,7 +665,7 @@ QString QToolBox::itemToolTip(int index) const const QToolBoxPrivate::Page *c = d->page(index); return (c ? c->toolTip() : QString()); } -#endif // QT_NO_TOOLTIP +#endif // QT_CONFIG(tooltip) /*! \reimp */ void QToolBox::showEvent(QShowEvent *e) @@ -712,7 +677,7 @@ void QToolBox::showEvent(QShowEvent *e) void QToolBox::changeEvent(QEvent *ev) { Q_D(QToolBox); - if(ev->type() == QEvent::StyleChange) + if (ev->type() == QEvent::StyleChange) d->updateTabs(); QFrame::changeEvent(ev); } @@ -725,7 +690,7 @@ void QToolBox::changeEvent(QEvent *ev) */ void QToolBox::itemInserted(int index) { - Q_UNUSED(index) + Q_UNUSED(index); } /*! @@ -736,7 +701,7 @@ void QToolBox::itemInserted(int index) */ void QToolBox::itemRemoved(int index) { - Q_UNUSED(index) + Q_UNUSED(index); } /*! \reimp */ |