--- a/src/hbcore/inputfw/hbinputmethod.cpp	Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.cpp	Fri May 14 16:09:54 2010 +0300
@@ -233,33 +233,6 @@
 }
 
 /*!
-\deprecated HbInputMethod::activeHwKeyboardChanged(HbKeyboardType)
-    is deprecated.
-*/
-void HbInputMethod::activeHwKeyboardChanged(HbKeyboardType newKeyboard)
-{
-    Q_UNUSED(newKeyboard);
-    Q_D(HbInputMethod);
-
-    // Do here whatever needs to be done on HbInputMethod level, then
-    // call virtual ActiveKeyboardChanged() in case plugin needs to do something.
-    // ...
-    d->refreshState();
-}
-
-/*!
-\deprecated HbInputMethod::activeTouchKeyboardChanged(HbKeyboardType)
-    is deprecated.
-*/
-void HbInputMethod::activeTouchKeyboardChanged(HbKeyboardType newKeyboard)
-{
-    Q_UNUSED(newKeyboard);
-    Q_D(HbInputMethod);
-
-    d->refreshState();
-}
-
-/*!
 This slot is connected to the setting proxy activeKeyboard attribute. It will
 activate proper state when the signal is received.
 */
@@ -284,25 +257,6 @@
 }
 
 /*!
-\deprecated HbInputMethod::predictiveInputStateChanged(int newStatus)
-    is deprecated.
-*/
-void HbInputMethod::predictiveInputStateChanged(int newStatus)
-{
-    Q_UNUSED(newStatus);
-}
-
-/*!
-\deprecated HbInputMethod::predictiveInputStateChanged(HbKeyboardSettingFlags, bool)
-    is deprecated.
-*/
-void HbInputMethod::predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState)
-{
-    Q_UNUSED(keyboardType);
-    Q_UNUSED(newState);
-}
-
-/*!
 The framework calls this method when an input capable widget receives UI focus. This is empty
 default implementation and the inheriting class should override it.
 
@@ -373,7 +327,7 @@
     bool readOnly = false;
     if (HbEditorInterface::isConnected(widget)) {
         HbEditorInterface eInt(widget);
-        if (eInt.constraints() & HbEditorConstraintIgnoreFocus) {
+        if (eInt.inputConstraints() & HbEditorConstraintIgnoreFocus) {
             readOnly = true;
         }
     }
@@ -426,28 +380,14 @@
 /*!
 Checks if the destroyed widget is currently focused and clears the focus
 if needed. This method should not be overridden.
-
-\sa focusObjectDestroyed
 */
 void HbInputMethod::widgetDestroyed(QWidget* widget)
 {
     Q_D(HbInputMethod);
 
     if (d->mFocusObject && d->mFocusObject->object() == widget) {
-        releaseFocus();
-    }
-}
-
-/*!
-\deprecated HbInputMethod::focusObjectDestroyed(const HbInputFocusObject*)
-    is deprecated.
-*/
-void HbInputMethod::focusObjectDestroyed(const HbInputFocusObject* focusObject)
-{
-    Q_D(HbInputMethod);
-
-    if (focusObject && focusObject == d->mFocusObject) {
-        releaseFocus();
+        delete d->mFocusObject;
+        d->mFocusObject = 0;
     }
 }
 
@@ -526,25 +466,6 @@
 }
 
 /*!
-\deprecated HbInputMethod::receiveText(const QString&)
-    is deprecated.
-*/
-void HbInputMethod::receiveText(const QString& string)
-{
-    Q_UNUSED(string);
-}
-
-/*!
-\deprecated HbInputMethod::candidatePopupClosed(int closingKey)
-    is deprecated.
-*/
-void HbInputMethod::candidatePopupClosed(int closingKey)
-{
-    Q_UNUSED(closingKey);
-    // Empty default implementation
-}
-
-/*!
 The framework calls this method when device-wide input language changes.
 The base class implementation is empty so any input method interested in
 language switch events should implement it. Note that this method reports
@@ -571,16 +492,6 @@
 }
 
 /*!
-\deprecated HbInputMethod::predictiveInputStatusChanged(int newStatus)
-    is deprecated.
-*/
-void HbInputMethod::predictiveInputStatusChanged(int newStatus)
-{
-    Q_UNUSED(newStatus);
-    // Empty default implementation.
-}
-
-/*!
 Returns true if given input mode is allowed in active editor.
 */
 bool HbInputMethod::modeAllowedInEditor(HbInputModeType mode) const
@@ -725,18 +636,6 @@
 }
 
 /*!
-\deprecated HbInputMethod::releaseFocus()
-    is deprecated.
-*/
-void HbInputMethod::releaseFocus()
-{
-    Q_D(HbInputMethod);
-
-    delete d->mFocusObject;
-    d->mFocusObject = 0;
-}
-
-/*!
 Receives the screen orientation signal. Will determine correct input state for new
 orientation and find state handler for it.
 */
@@ -828,8 +727,7 @@
     HbInputMethod* active = activeInputMethod();
 
     if (active) {
-        active->focusLost(false);
-        active->releaseFocus();
+        active->focusLost(false);       
         delete active->d_ptr->mFocusObject;
         active->d_ptr->mFocusObject = 0;
     }
@@ -872,21 +770,15 @@
 */
 void HbInputMethod::editorDeleted(QObject *obj)
 {
+    Q_D(HbInputMethod);
     Q_UNUSED(obj);
 
     focusLost();
-    releaseFocus();
-    reset();
-}
 
-/*!
-\deprecated HbInputMethod::orientationContextSwitchInProgress()
-    is deprecated.
-*/
-bool HbInputMethod::orientationContextSwitchInProgress()
-{
-    Q_D(HbInputMethod);
-    return d->mIsOrientationContextSwitchInProgress;
+    delete d->mFocusObject;
+    d->mFocusObject = 0;
+
+    reset();
 }
 
 // End of file