Remove outdated refactor comments.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Tue, 3 Jul 2012 00:16:08 +0000 (10:16 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 3 Jul 2012 02:35:06 +0000 (04:35 +0200)
It's not necessary to check whether the canvas has focus when gaining
active focus, as the focus of the root item follows the window focus
so an item should never gain active focus if the window doesn't have
focus.

Change-Id: I8992f673fb64467869d5fb9d23d011f19219feed
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
src/quick/items/qquicktextedit.cpp
src/quick/items/qquicktextinput.cpp

index 7f31eb4..6c070ad 100644 (file)
@@ -1541,7 +1541,7 @@ void QQuickTextEdit::itemChange(ItemChange change, const ItemChangeData &value)
 {
     Q_D(QQuickTextEdit);
     if (change == ItemActiveFocusHasChanged) {
-        setCursorVisible(value.boolValue); // ### refactor: focus handling && d->canvas && d->canvas->hasFocus());
+        setCursorVisible(value.boolValue);
         QFocusEvent focusEvent(value.boolValue ? QEvent::FocusIn : QEvent::FocusOut);
         d->control->processEvent(&focusEvent, QPointF(0, -d->yoff));
         if (value.boolValue) {
index 30512a1..c1e30a9 100644 (file)
@@ -2385,7 +2385,7 @@ void QQuickTextInput::itemChange(ItemChange change, const ItemChangeData &value)
     Q_D(QQuickTextInput);
     if (change == ItemActiveFocusHasChanged) {
         bool hasFocus = value.boolValue;
-        setCursorVisible(hasFocus); // ### refactor:  && d->canvas && d->canvas->hasFocus()
+        setCursorVisible(hasFocus);
         if (!hasFocus && (d->m_passwordEchoEditing || d->m_passwordEchoTimer.isActive())) {
             d->updatePasswordEchoEditing(false);//QQuickTextInputPrivate sets it on key events, but doesn't deal with focus events
         }