diff options
Diffstat (limited to 'src/widgets/widgets/qabstractspinbox_p.h')
| -rw-r--r-- | src/widgets/widgets/qabstractspinbox_p.h | 84 |
1 files changed, 27 insertions, 57 deletions
diff --git a/src/widgets/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h index fce88e43f4..4252a01423 100644 --- a/src/widgets/widgets/qabstractspinbox_p.h +++ b/src/widgets/widgets/qabstractspinbox_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 QABSTRACTSPINBOX_P_H #define QABSTRACTSPINBOX_P_H @@ -97,7 +61,7 @@ public: void init(); void reset(); void updateState(bool up, bool fromKeyboard = false); - QString stripped(const QString &text, int *pos = 0) const; + QString stripped(const QString &text, int *pos = nullptr) const; bool specialValue() const; virtual QVariant getZeroVariant() const; virtual void setRange(const QVariant &min, const QVariant &max); @@ -110,8 +74,8 @@ public: virtual QString textFromValue(const QVariant &n) const; virtual QVariant valueFromText(const QString &input) const; - void _q_editorTextChanged(const QString &); - virtual void _q_editorCursorPositionChanged(int oldpos, int newpos); + void editorTextChanged(const QString &); + virtual void editorCursorPositionChanged(int oldpos, int newpos); virtual QStyle::SubControl newHoverControl(const QPoint &pos); bool updateHoverControl(const QPoint &pos); @@ -124,17 +88,32 @@ public: virtual QVariant calculateAdaptiveDecimalStep(int steps) const; - QLineEdit *edit; QString prefix, suffix, specialValueText; QVariant value, minimum, maximum, singleStep; - QVariant::Type type; - int spinClickTimerId, spinClickTimerInterval, spinClickThresholdTimerId, spinClickThresholdTimerInterval; - int effectiveSpinRepeatRate; - uint buttonState; - mutable QString cachedText; + QRect hoverRect; + + mutable QString cachedText = { u'\x01' }; mutable QVariant cachedValue; - mutable QValidator::State cachedState; mutable QSize cachedSizeHint, cachedMinimumSizeHint; + QLineEdit *edit = nullptr; + QSpinBoxValidator *validator = nullptr; + QMetaType::Type type = QMetaType::UnknownType; + int spinClickTimerId = -1; + int spinClickTimerInterval = 100; + int spinClickThresholdTimerId = -1; + int spinClickThresholdTimerInterval = -1; + qreal effectiveSpinRepeatRate = 1; + int acceleration = 0; + int wheelDeltaRemainder = 0; + + Qt::KeyboardModifiers keyboardModifiers = Qt::NoModifier; + Qt::KeyboardModifier stepModifier = Qt::ControlModifier; + QAbstractSpinBox::CorrectionMode correctionMode = QAbstractSpinBox::CorrectToPreviousValue; + QAbstractSpinBox::StepType stepType = QAbstractSpinBox::StepType::DefaultStepType; + QAbstractSpinBox::ButtonSymbols buttonSymbols = QAbstractSpinBox::UpDownArrows; + QStyle::SubControl hoverControl = QStyle::SC_None; + mutable QValidator::State cachedState = QValidator::Invalid; + uint buttonState = None; uint pendingEmit : 1; uint readOnly : 1; uint wrapping : 1; @@ -144,16 +123,7 @@ public: uint keyboardTracking : 1; uint cleared : 1; uint ignoreUpdateEdit : 1; - QAbstractSpinBox::CorrectionMode correctionMode; - QAbstractSpinBox::StepType stepType = QAbstractSpinBox::StepType::DefaultStepType; - Qt::KeyboardModifier stepModifier = Qt::ControlModifier; - int acceleration; - QStyle::SubControl hoverControl; - QRect hoverRect; - QAbstractSpinBox::ButtonSymbols buttonSymbols; - QSpinBoxValidator *validator; uint showGroupSeparator : 1; - int wheelDeltaRemainder; }; class QSpinBoxValidator : public QValidator |