From 61084f0e8dcbd9b7ecaa250c74cd53ba042210e1 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 10 Jul 2009 10:33:20 +1000 Subject: Fix some minor mistakes --- src/gui/widgets/qlineedit.cpp | 6 +++--- src/gui/widgets/qvalidator.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index 2d6ef03..977d00c 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -1409,7 +1409,7 @@ void QLineEdit::mousePressEvent(QMouseEvent* e) if (d->tripleClickTimer.isActive() && (e->pos() - d->tripleClick).manhattanLength() < QApplication::startDragDistance()) { selectAll(); - return; + return; } bool mark = e->modifiers() & Qt::ShiftModifier; int cursor = d->xToPos(e->pos().x()); @@ -1593,8 +1593,6 @@ void QLineEdit::inputMethodEvent(QInputMethodEvent *e) clear(); } - d->control->processInputMethodEvent(e); - #ifdef QT_KEYPAD_NAVIGATION // Focus in if currently in navigation focus on the widget // Only focus in on preedits, to allow input methods to @@ -1607,6 +1605,8 @@ void QLineEdit::inputMethodEvent(QInputMethodEvent *e) } #endif + d->control->processInputMethodEvent(e); + #ifndef QT_NO_COMPLETER if (!e->commitString().isEmpty()) d->control->complete(Qt::Key_unknown); diff --git a/src/gui/widgets/qvalidator.h b/src/gui/widgets/qvalidator.h index 5ddc44e..5c27d1d 100644 --- a/src/gui/widgets/qvalidator.h +++ b/src/gui/widgets/qvalidator.h @@ -120,7 +120,7 @@ public: #endif private: - /*Q_DISABLE_COPY(QIntValidator)*/ + Q_DISABLE_COPY(QIntValidator) int b; int t; -- cgit v0.12