From 1416c6ec1819ff4bd50e7ec964591ca67239e6e0 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 14 Aug 2009 10:54:45 +1000
Subject: Make calling base class focusChanged a protocol.

---
 src/declarative/fx/qfxitem.cpp     |  6 ++++--
 src/declarative/fx/qfxlineedit.cpp |  2 +-
 src/declarative/fx/qfxtextedit.cpp |  2 +-
 src/declarative/fx/qfxwebview.cpp  | 15 ++++-----------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index aba6bf1..aab371b 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -1822,8 +1822,10 @@ void QFxItem::activeFocusChanged(bool flag)
 
 /*!
   This function emits the \e focusChanged signal.
-  \a flag is not used.
- */
+
+  Subclasses overriding this function should call up
+  to their base class.
+*/
 void QFxItem::focusChanged(bool flag)
 {
     Q_UNUSED(flag);
diff --git a/src/declarative/fx/qfxlineedit.cpp b/src/declarative/fx/qfxlineedit.cpp
index ccb0637..6f2f079 100644
--- a/src/declarative/fx/qfxlineedit.cpp
+++ b/src/declarative/fx/qfxlineedit.cpp
@@ -467,7 +467,7 @@ void QFxLineEdit::focusChanged(bool hasFocus)
     Q_D(QFxLineEdit);
     d->focused = hasFocus;
     setCursorVisible(hasFocus);
-    emit QFxItem::focusChanged();
+    QFxItem::focusChanged(hasFocus);
 }
 
 void QFxLineEdit::keyPressEvent(QKeyEvent* ev)
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 379e12f..1391490 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -885,7 +885,7 @@ void QFxTextEdit::keyReleaseEvent(QKeyEvent *event)
 void QFxTextEdit::focusChanged(bool hasFocus)
 {
     setCursorVisible(hasFocus);
-    emit QFxItem::focusChanged();
+    QFxItem::focusChanged(hasFocus);
 }
 
 /*!
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 6645a0f..eb84097 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -440,18 +440,11 @@ QVariant QFxWebView::evaluateJavaScript(const QString &scriptSource)
     return this->page()->mainFrame()->evaluateJavaScript(scriptSource);
 }
 
-void QFxWebView::focusChanged(bool flag)
+void QFxWebView::focusChanged(bool hasFocus)
 {
-    QFocusEvent *e;
-    if (flag) {
-        e = new QFocusEvent (QEvent::FocusIn);
-    }
-    else {
-        e = new QFocusEvent (QEvent::FocusOut);
-    }
-    page()->event(e);
-    delete e;
-    emit QFxItem::focusChanged();
+    QFocusEvent e(hasFocus ? QEvent::FocusIn : QEvent::FocusOut);
+    page()->event(&e);
+    QFxItem::focusChanged(hasFocus);
 }
 
 void QFxWebView::expandToWebPage()
-- 
cgit v0.12