diff options
Diffstat (limited to 'src/widgets/widgets/qabstractscrollarea_p.h')
| -rw-r--r-- | src/widgets/widgets/qabstractscrollarea_p.h | 51 |
1 files changed, 7 insertions, 44 deletions
diff --git a/src/widgets/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h index 6d78b9db6d..7224d489ce 100644 --- a/src/widgets/widgets/qabstractscrollarea_p.h +++ b/src/widgets/widgets/qabstractscrollarea_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 QABSTRACTSCROLLAREA_P_H #define QABSTRACTSCROLLAREA_P_H @@ -54,6 +18,7 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qframe_p.h" #include "qabstractscrollarea.h" +#include <QtGui/private/qgridlayoutengine_p.h> QT_BEGIN_NAMESPACE @@ -62,8 +27,7 @@ QT_BEGIN_NAMESPACE class QScrollBar; class QAbstractScrollAreaScrollBarContainer; -// ### Qt 6: is the export still needed? If not, unexport QFramePrivate, too. -class Q_WIDGETS_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate +class Q_AUTOTEST_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate { Q_DECLARE_PUBLIC(QAbstractScrollArea) @@ -73,7 +37,7 @@ public: void replaceScrollBar(QScrollBar *scrollBar, Qt::Orientation orientation); - QAbstractScrollAreaScrollBarContainer *scrollBarContainers[Qt::Vertical + 1]; + QHVContainer<QAbstractScrollAreaScrollBarContainer *> scrollBarContainers; QScrollBar *hbar, *vbar; Qt::ScrollBarPolicy vbarpolicy, hbarpolicy; @@ -94,9 +58,8 @@ public: void init(); void layoutChildren(); void layoutChildren_helper(bool *needHorizontalScrollbar, bool *needVerticalScrollbar); - // ### Fix for 4.4, talk to Bjoern E or Girish. virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) {} - bool canStartScrollingAt( const QPoint &startPos ); + virtual bool canStartScrollingAt( const QPoint &startPos ) const; void flashScrollBars(); void setScrollBarTransient(QScrollBar *scrollBar, bool transient); @@ -117,7 +80,7 @@ class QAbstractScrollAreaFilter : public QObject Q_OBJECT public: QAbstractScrollAreaFilter(QAbstractScrollAreaPrivate *p) : d(p) - { setObjectName(QLatin1String("qt_abstractscrollarea_filter")); } + { setObjectName(QLatin1StringView("qt_abstractscrollarea_filter")); } bool eventFilter(QObject *o, QEvent *e) override { return (o == d->viewport ? d->viewportEvent(e) : false); } private: |