aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickspinbox.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-30 16:56:51 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-30 20:44:13 +0000
commita4337a3bc7cc97fc9d707611dda99d512ef83ac0 (patch)
tree0b96715ed9826680b8082d8daf6a867ee75af5fb /src/templates/qquickspinbox.cpp
parent53a9c9e2c01199aec3c0848593226f8a3e7d5dee (diff)
Rename QQuickSpinner to QQuickSpinButton
The old name was a bit confusing, because Spinner is a synonym to SpinBox: https://en.wikipedia.org/wiki/Spinner_%28computing%29 Change-Id: Id1e70d58238b93366c387c453803eabd002368eb Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickspinbox.cpp')
-rw-r--r--src/templates/qquickspinbox.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/templates/qquickspinbox.cpp b/src/templates/qquickspinbox.cpp
index 9bb908e9..9e0bd723 100644
--- a/src/templates/qquickspinbox.cpp
+++ b/src/templates/qquickspinbox.cpp
@@ -111,8 +111,8 @@ public:
int stepSize;
int delayTimer;
int repeatTimer;
- QQuickSpinner *up;
- QQuickSpinner *down;
+ QQuickSpinButton *up;
+ QQuickSpinButton *down;
QLocale locale;
QValidator *validator;
QJSValue textFromValue;
@@ -236,8 +236,8 @@ QQuickSpinBox::QQuickSpinBox(QQuickItem *parent) :
QQuickControl(*(new QQuickSpinBoxPrivate), parent)
{
Q_D(QQuickSpinBox);
- d->up = new QQuickSpinner(this);
- d->down = new QQuickSpinner(this);
+ d->up = new QQuickSpinButton(this);
+ d->down = new QQuickSpinButton(this);
setFlag(ItemIsFocusScope);
setFiltersChildMouseEvents(true);
@@ -462,7 +462,7 @@ void QQuickSpinBox::setValueFromText(const QJSValue &callback)
\sa increase()
*/
-QQuickSpinner *QQuickSpinBox::up() const
+QQuickSpinButton *QQuickSpinBox::up() const
{
Q_D(const QQuickSpinBox);
return d->up;
@@ -477,7 +477,7 @@ QQuickSpinner *QQuickSpinBox::up() const
\sa decrease()
*/
-QQuickSpinner *QQuickSpinBox::down() const
+QQuickSpinButton *QQuickSpinBox::down() const
{
Q_D(const QQuickSpinBox);
return d->down;
@@ -613,43 +613,43 @@ QAccessible::Role QQuickSpinBox::accessibleRole() const
}
#endif
-class QQuickSpinnerPrivate : public QObjectPrivate
+class QQuickSpinButtonPrivate : public QObjectPrivate
{
public:
- QQuickSpinnerPrivate() : pressed(false), indicator(Q_NULLPTR) { }
+ QQuickSpinButtonPrivate() : pressed(false), indicator(Q_NULLPTR) { }
bool pressed;
QQuickItem *indicator;
};
-QQuickSpinner::QQuickSpinner(QQuickSpinBox *parent) :
- QObject(*(new QQuickSpinnerPrivate), parent)
+QQuickSpinButton::QQuickSpinButton(QQuickSpinBox *parent) :
+ QObject(*(new QQuickSpinButtonPrivate), parent)
{
}
-bool QQuickSpinner::isPressed() const
+bool QQuickSpinButton::isPressed() const
{
- Q_D(const QQuickSpinner);
+ Q_D(const QQuickSpinButton);
return d->pressed;
}
-void QQuickSpinner::setPressed(bool pressed)
+void QQuickSpinButton::setPressed(bool pressed)
{
- Q_D(QQuickSpinner);
+ Q_D(QQuickSpinButton);
if (d->pressed != pressed) {
d->pressed = pressed;
emit pressedChanged();
}
}
-QQuickItem *QQuickSpinner::indicator() const
+QQuickItem *QQuickSpinButton::indicator() const
{
- Q_D(const QQuickSpinner);
+ Q_D(const QQuickSpinButton);
return d->indicator;
}
-void QQuickSpinner::setIndicator(QQuickItem *indicator)
+void QQuickSpinButton::setIndicator(QQuickItem *indicator)
{
- Q_D(QQuickSpinner);
+ Q_D(QQuickSpinButton);
if (d->indicator != indicator) {
delete d->indicator;
d->indicator = indicator;