diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-07 08:28:54 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-07 08:28:54 (GMT) |
| commit | fe6ca9332cf4516c84d9a1b8ca9ea2846458f98f (patch) | |
| tree | beaff8d9ba6af51e2c2ccaefe799fe129e68e702 | |
| parent | 96d3be9039baaebc64f5de5d6917dd56d7ed192b (diff) | |
| download | Qt-fe6ca9332cf4516c84d9a1b8ca9ea2846458f98f.zip Qt-fe6ca9332cf4516c84d9a1b8ca9ea2846458f98f.tar.gz Qt-fe6ca9332cf4516c84d9a1b8ca9ea2846458f98f.tar.bz2 | |
Forgot to bring in the change to QAbstractSpinBox
QAbstractSpinBox had some code using QLineEdit internals, this had to
be move to use QLineControl as well.
This commit also includes fixing some typos in my last commit.
| -rw-r--r-- | src/gui/widgets/qabstractspinbox.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qlinecontrol_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp index 25acd6e..1d62ab4 100644 --- a/src/gui/widgets/qabstractspinbox.cpp +++ b/src/gui/widgets/qabstractspinbox.cpp @@ -970,7 +970,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event) #endif case Qt::Key_Enter: case Qt::Key_Return: - d->edit->d_func()->modifiedState = d->edit->d_func()->undoState = 0; + d->edit->d_func()->control->clearUndo(); d->interpret(d->keyboardTracking ? AlwaysEmit : EmitIfChanged); selectAll(); event->ignore(); diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/widgets/qlinecontrol_p.h index 600206d..4ecedcd 100644 --- a/src/gui/widgets/qlinecontrol_p.h +++ b/src/gui/widgets/qlinecontrol_p.h @@ -710,12 +710,12 @@ inline int QLineControl::cursorBlinkPeriod() const return m_blinkPeriod; } -QString QLineControl::cancelText() const +inline QString QLineControl::cancelText() const { return m_cancelText; } -void QLineControl::setCancelText(QString s) +inline void QLineControl::setCancelText(QString s) { m_cancelText = s; } |