diff -r f7ac710697a9 -r 06ff229162e9 src/hbcore/inputfw/hbinputsettingproxy.cpp
--- a/src/hbcore/inputfw/hbinputsettingproxy.cpp	Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.cpp	Fri May 14 16:09:54 2010 +0300
@@ -367,7 +367,6 @@
 
 \sa disconnectObservingObject
 \sa globalInputLanguageChanged
-\sa activeHwKeyboardChanged
 \sa predictiveInputStateChanged
 \sa orientationAboutToChange
 \sa orientationChanged
@@ -383,18 +382,8 @@
         connect(this, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalInputLanguageChanged(const HbInputLanguage &)));
         connect(this, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalSecondaryInputLanguageChanged(const HbInputLanguage &)));
         connect(this, SIGNAL(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType)));
-        connect(this, SIGNAL(activeHwKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeHwKeyboardChanged(HbKeyboardType)));
-        connect(this, SIGNAL(activeTouchKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeTouchKeyboardChanged(HbKeyboardType)));
-        connect(this, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)));
         connect(this, SIGNAL(orientationAboutToChange()), aObserver, SLOT(orientationAboutToChange()));
         connect(this, SIGNAL(orientationChanged(Qt::Orientation)), aObserver, SLOT(orientationChanged(Qt::Orientation)));
-/* Setting listeners not implemented yet
-        connect(this, SIGNAL(characterPreviewStateForQwertyChanged(bool)), aObserver, SLOT(characterPreviewStateForQwertyChanged(bool)));
-        connect(this, SIGNAL(keypressTimeoutChanged(int)), aObserver, SLOT(keypressTimeoutChanged(int)));
-        connect(this, SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(autocompletionStateChanged(HbKeyboardSettingFlags, bool)));
-        connect(this, SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), aObserver, SLOT(typingCorrectionLevelChanged(HbTypingCorrectionLevel)));
-        connect(this, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), aObserver, SLOT(primaryCandidateModeChanged(HbPrimaryCandidateMode)));
-*/
     }
 }
 
@@ -408,19 +397,9 @@
     if (aObserver) {
         disconnect(this, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalInputLanguageChanged(const HbInputLanguage &)));
         disconnect(this, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalSecondaryInputLanguageChanged(const HbInputLanguage &)));
-        disconnect(this, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)));
         disconnect(this, SIGNAL(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType)));
-        disconnect(this, SIGNAL(activeHwKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeHwKeyboardChanged(HbKeyboardType)));
-        disconnect(this, SIGNAL(activeTouchKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeTouchKeyboardChanged(HbKeyboardType)));
         disconnect(this, SIGNAL(orientationAboutToChange()), aObserver, SLOT(orientationAboutToChange()));
         disconnect(this, SIGNAL(orientationChanged(Qt::Orientation)), aObserver, SLOT(orientationChanged(Qt::Orientation)));
-/* Setting listeners not implemented yet
-        disconnect(this, SIGNAL(characterPreviewStateForQwertyChanged(bool)), aObserver, SLOT(characterPreviewStateForQwertyChanged(bool)));
-        disconnect(this, SIGNAL(keypressTimeoutChanged(int)), aObserver, SLOT(keypressTimeoutChanged(int)));
-        disconnect(this, SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(autocompletionStateChanged(HbKeyboardSettingFlags, bool)));
-        disconnect(this, SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), aObserver, SLOT(typingCorrectionLevelChanged(HbTypingCorrectionLevel)));
-        disconnect(this, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), aObserver, SLOT(primaryCandidateModeChanged(HbPrimaryCandidateMode)));
-*/
     }
 }
 
@@ -474,8 +453,6 @@
 {
     aListOfAvailableKeyboards.append(HbKeyboard12Key);
     aListOfAvailableKeyboards.append(HbKeyboardQwerty);
-
-//Read the prData and get the list of keyboards from the device profile
 }
 
 /*!
@@ -659,24 +636,6 @@
 }
 
 /*!
-\deprecated HbInputSettingProxy::predictiveInputStatus()
-    is deprecated. Use predictiveInputStatusForITUT or predictiveInputStatusForQwerty instead.
-*/
-int HbInputSettingProxy::predictiveInputStatus() const
-{
-    return predictiveInputStatusForActiveKeyboard();
-}
-
-/*!
-\deprecated HbInputSettingProxy::setPredictiveInputStatus(int newStatus)
-    is deprecated. Use setPredictiveInputStatusForITUT or setPredictiveInputStatusForQwerty instead.
-*/
-void HbInputSettingProxy::setPredictiveInputStatus(int newStatus)
-{
-    setPredictiveInputStatusForActiveKeyboard(newStatus);
-}
-
-/*!
 Returns the status of predictive input feature. Returns true if any one of given
 keyboard types has the prediction enabled. An editor instance may still forbid
 predictive input feature, even if the device wide status allows it.