diff options
Diffstat (limited to 'src/quick/items/qquickborderimage_p_p.h')
-rw-r--r-- | src/quick/items/qquickborderimage_p_p.h | 57 |
1 files changed, 7 insertions, 50 deletions
diff --git a/src/quick/items/qquickborderimage_p_p.h b/src/quick/items/qquickborderimage_p_p.h index 17dab7d121..02d5ac9067 100644 --- a/src/quick/items/qquickborderimage_p_p.h +++ b/src/quick/items/qquickborderimage_p_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 QtQuick 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 QQUICKBORDERIMAGE_P_P_H #define QQUICKBORDERIMAGE_P_P_H @@ -67,11 +31,6 @@ class QQuickBorderImagePrivate : public QQuickImageBasePrivate public: QQuickBorderImagePrivate() - : border(0), horizontalTileMode(QQuickBorderImage::Stretch), - verticalTileMode(QQuickBorderImage::Stretch), pixmapChanged(false) -#if QT_CONFIG(qml_network) - , sciReply(0), redirectCount(0) -#endif { } @@ -79,7 +38,6 @@ public: { } - QQuickScaleGrid *getScaleGrid() { Q_Q(QQuickBorderImage); @@ -102,15 +60,14 @@ public: QRectF *innerSourceRect, QRectF *subSourceRect); - QQuickScaleGrid *border; QUrl sciurl; - QQuickBorderImage::TileMode horizontalTileMode; - QQuickBorderImage::TileMode verticalTileMode; - bool pixmapChanged : 1; + QQuickScaleGrid *border = nullptr; + QQuickBorderImage::TileMode horizontalTileMode = QQuickBorderImage::Stretch; + QQuickBorderImage::TileMode verticalTileMode = QQuickBorderImage::Stretch; + bool pixmapChanged = false; #if QT_CONFIG(qml_network) - QNetworkReply *sciReply; - int redirectCount; + QNetworkReply *sciReply = nullptr; #endif }; |