diff options
Diffstat (limited to 'src/plugins/styles/android/qandroidstyle_p.h')
-rw-r--r-- | src/plugins/styles/android/qandroidstyle_p.h | 84 |
1 files changed, 24 insertions, 60 deletions
diff --git a/src/plugins/styles/android/qandroidstyle_p.h b/src/plugins/styles/android/qandroidstyle_p.h index 6cb30a2f79..38abc24b02 100644 --- a/src/plugins/styles/android/qandroidstyle_p.h +++ b/src/plugins/styles/android/qandroidstyle_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2013 BogDan Vatra <bogdan@kde.org> -** 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) 2013 BogDan Vatra <bogdan@kde.org> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QANDROIDSTYLE_P_H #define QANDROIDSTYLE_P_H @@ -89,9 +53,9 @@ public: struct Android9PatchChunk { - QVector<int> xDivs; - QVector<int> yDivs; - QVector<int> colors; + QList<int> xDivs; + QList<int> yDivs; + QList<int> colors; }; struct AndroidItemStateInfo @@ -169,7 +133,7 @@ public: static int calculateStretch(int boundsLimit, int startingPoint, int srcSpace, int numStrechyPixelsRemaining, int numFixedPixelsRemaining); - void extractIntArray(const QVariantList &values, QVector<int> &array); + void extractIntArray(const QVariantList &values, QList<int> &array); private: Android9PatchChunk m_chunkData; }; @@ -257,10 +221,10 @@ public: virtual void drawControl(const QStyleOption *opt, QPainter *p, const QWidget *w); virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const; @@ -294,7 +258,7 @@ public: virtual void drawControl(const QStyleOption *option, QPainter *p, const QWidget *w); virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, @@ -315,7 +279,7 @@ public: QSize sizeFromContents(const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const; QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; private: AndroidDrawable *m_seekBarThumb; }; @@ -327,7 +291,7 @@ public: virtual ~AndroidSpinnerControl(){} virtual QRect subControlRect(const QStyleOptionComplex *option, SubControl sc, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; }; typedef QList<AndroidItemStateInfo *> AndroidItemStateInfoList; @@ -337,34 +301,34 @@ public: ~QAndroidStyle(); virtual void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; virtual void drawControl(QStyle::ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = nullptr) const; virtual QRect subElementRect(SubElement subElement, const QStyleOption *option, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *widget = 0) const; + const QWidget *widget = nullptr) const; virtual SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *widget = 0) const; + const QPoint &pt, const QWidget *widget = nullptr) const; virtual QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget = 0) const; + SubControl sc, const QWidget *widget = nullptr) const; - virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + virtual int pixelMetric(PixelMetric metric, const QStyleOption *option = nullptr, + const QWidget *widget = nullptr) const; virtual QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *w = 0) const; + const QSize &contentsSize, const QWidget *w = nullptr) const; - virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + virtual QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt = nullptr, + const QWidget *widget = nullptr) const; virtual QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const; - int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const; + int styleHint(StyleHint hint, const QStyleOption *option = nullptr, const QWidget *widget = nullptr, + QStyleHintReturn *returnData = nullptr) const; virtual QPalette standardPalette() const; void polish(QWidget *widget); |