Remove emitingEditingFinished from QLineControl

Doesn't seem to hurt anything, and it was ugly API.

3 files changed, 5 insertions, 20 deletions

diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index ba85182..97f4a45 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -1497,9 +1497,7 @@ void QLineControl::processKeyEvent(QKeyEvent* event)
     if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
         if (hasAcceptableInput() || fixup()) {
             emit accepted();
-            m_emitingEditingFinished = true;
             emit editingFinished();
-            m_emitingEditingFinished = false;
         }
         if (inlineCompletionAccepted)
             event->accept();
diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/widgets/qlinecontrol_p.h
index 68ff66b..1e5c144 100644
--- a/src/gui/widgets/qlinecontrol_p.h
+++ b/src/gui/widgets/qlinecontrol_p.h
@@ -78,8 +78,7 @@ class Q_GUI_EXPORT QLineControl : public QObject
 
 public:
     QLineControl(const QString &txt = QString())
-        : m_emitingEditingFinished(0),
-        m_cursor(0), m_preeditCursor(0), m_layoutDirection(Qt::LeftToRight),
+        : m_cursor(0), m_preeditCursor(0), m_layoutDirection(Qt::LeftToRight),
         m_hideCursor(false), m_separator(0), m_readOnly(0),
         m_dragEnabled(0), m_echoMode(0), m_textDirty(0), m_selDirty(0),
         m_validInput(1), m_blinkPeriod(0), m_blinkTimer(0), m_deleteAllTimer(0),
@@ -230,8 +229,6 @@ public:
 
     bool processEvent(QEvent *ev);
 
-    bool m_emitingEditingFinished; //Needed in QLineEdit FocusOut event
-
 private:
     void init(const QString &txt);
     void removeSelectedText();
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp
index 6deb196..e0f5bc9 100644
--- a/src/gui/widgets/qlineedit.cpp
+++ b/src/gui/widgets/qlineedit.cpp
@@ -1393,15 +1393,10 @@ bool QLineEdit::event(QEvent * e)
         } else if (e->type() == QEvent::LeaveEditFocus) {
             d->setCursorVisible(false);
             d->control->setCursorBlinkPeriod(0);
-            if (!d->control->emitingEditingFinished) {
-                if (d->control->hasAcceptableInput() || d->control->fixup()) {
-                    d->control->emitingEditingFinished = true;
-                    emit editingFinished();
-                    d->control->emitingEditingFinished = false;
-                }
-            }
+            if (d->control->hasAcceptableInput() || d->control->fixup())
+                emit editingFinished();
         }
-        return;
+        return true;
     }
 #endif
     return QWidget::event(e);
@@ -1727,13 +1722,8 @@ void QLineEdit::focusOutEvent(QFocusEvent *e)
 #endif
     if (reason != Qt::PopupFocusReason
         || !(QApplication::activePopupWidget() && QApplication::activePopupWidget()->parentWidget() == this)) {
-        if (!d->control->m_emitingEditingFinished) {
-            if (hasAcceptableInput() || d->control->fixup()) {
-                d->control->m_emitingEditingFinished = true;
+            if (hasAcceptableInput() || d->control->fixup())
                 emit editingFinished();
-                d->control->m_emitingEditingFinished = false;
-            }
-        }
 #ifdef QT3_SUPPORT
         emit lostFocus();
 #endif