--- a/src/hbcore/inputfw/hbinputmethod.cpp	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.cpp	Wed Aug 18 10:05:37 2010 +0300
@@ -328,29 +328,12 @@
 }
 
 /*!
-This slot is connected to the setting proxy activeKeyboard attribute. It will
-activate proper state when the signal is received.
+\deprecated HbInputMethod::activeKeyboardChanged(HbKeyboardType)
+    is deprecated. No need to call this outside of framework.
 */
 void HbInputMethod::activeKeyboardChanged(HbKeyboardType newKeyboard)
 {
-    if (!isActiveMethod() || !HbInputSettingProxy::instance()->orientationChangeCompleted()) {
-        return;
-    }
-
-    Q_D(HbInputMethod);
-
-    d->mInputState.setKeyboard(newKeyboard);
-    HbInputMethod *stateHandler = d->findStateHandler(d->mInputState);
-    if (stateHandler) {
-        d->inputStateToEditor(d->mInputState);
-        if (stateHandler != this) {
-            // Context switch needed.
-            d->contextSwitch(stateHandler);
-        } else {
-            // Same method handles new state, just report the state change.
-            inputStateActivated(d->mInputState);
-        }
-    }
+    Q_UNUSED(newKeyboard);
 }
 
 /*!
@@ -473,8 +456,10 @@
     d->mFocusObject = 0;
 
     // Attach focus.
-    d->mFocusObject = new HbInputFocusObject(widget);
+    d->mFocusObject = d->createAndSetupFocusObject(widget);
     connect(widget, SIGNAL(destroyed(QObject *)), this, SLOT(editorDeleted(QObject *)));
+    connect(d->mFocusObject, SIGNAL(aboutToChangeOrientation()), this, SLOT(_q_startOrientationSequence()));
+    connect(d->mFocusObject, SIGNAL(orientationChanged()), this, SLOT(_q_endOrientationSequence()));
 
     d->setFocusCommon();
 
@@ -556,6 +541,8 @@
     // Attach focus.
     d->mFocusObject = focusObject;
     connect(d->mFocusObject->object(), SIGNAL(destroyed(QObject *)), this, SLOT(editorDeleted(QObject *)));
+    connect(d->mFocusObject, SIGNAL(aboutToChangeOrientation()), this, SLOT(_q_startOrientationSequence()));
+    connect(d->mFocusObject, SIGNAL(orientationChanged()), this, SLOT(_q_endOrientationSequence()));
 
     d->setFocusCommon();
 
@@ -740,39 +727,20 @@
 }
 
 /*!
-Receives the screen orientation signal. Will determine correct input state for new
-orientation and find state handler for it.
+\deprecated HbInputMethod::orientationChanged(Qt::Orientation)
+    is deprecated. No need to call this from outside of the framework.
 */
 void HbInputMethod::orientationChanged(Qt::Orientation orientation)
 {
-    Q_D(HbInputMethod);
     Q_UNUSED(orientation);
-
-    if (d->mOldFocusObject) {
-        setFocusObject(d->mOldFocusObject);
-        d->mOldFocusObject = 0;
-    }
-
 }
 
 /*!
-This slot is connected to setting proxy's orientation change warning signal. The default
-base class implementation is empty.
-
-\sa HbInputSettingProxy
+\deprecated HbInputMethod::orientationAboutToChange()
+    is deprecated. No need to call this from outside of the framework.
 */
 void HbInputMethod::orientationAboutToChange()
 {
-    Q_D(HbInputMethod);
-	if(isActiveMethod()) {
-		reset();
-	}
-    d->inputStateToEditor(d->mInputState);
-    if (d->mFocusObject) {
-        d->mOldFocusObject = d->mFocusObject;
-        d->mFocusObject = 0;
-    }
-    HbVkbHostBridge::instance()->closeKeypad(true);
 }
 
 /*!
@@ -889,6 +857,7 @@
     d->hideMainWindow();
     delete d->mFocusObject;
     d->mFocusObject = 0;
+    d->mFocusLocked = false;
 
     reset();
 }
@@ -903,5 +872,7 @@
     return HbInputModeCache::instance()->descriptor(this);
 }
 
+#include "moc_hbinputmethod.cpp"
+
 // End of file