--- a/src/hbcore/inputfw/hbinputsettingproxy.cpp	Wed Aug 18 10:05:37 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.cpp	Thu Sep 02 20:44:51 2010 +0300
@@ -424,7 +424,6 @@
     if (aObserver) {
         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)));
     }
 }
 
@@ -438,7 +437,6 @@
     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(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType)));
     }
 }
 
@@ -495,25 +493,8 @@
 }
 
 /*!
-\deprecated HbInputSettingProxy::activeHwKeyboard() const
-    is deprecated. Use HbInputSettingProxy::activeKeyboard(Qt::Orientation) instead.
-Returns active hardware keyboard type.
+Stores speed attribute for handwriting recognition.
 */
-HbKeyboardType HbInputSettingProxy::activeHwKeyboard() const
-{
-    return HbKeyboardNone;
-}
-
-/*!
-\deprecated HbInputSettingProxy::activeTouchKeyboard() const
-    is deprecated. Use HbInputSettingProxy::activeKeyboard(Qt::Orientation) instead.
-Returns active touch keyboard type.
-*/
-HbKeyboardType HbInputSettingProxy::activeTouchKeyboard() const
-{
-    return HbKeyboardNone;
-}
-
 void HbInputSettingProxy::setHwrWritingSpeed(HbHwrWritingSpeed speed)
 {
     Q_D(HbInputSettingProxy);
@@ -532,6 +513,9 @@
     }
 }
 
+/*!
+Returns handwriting recignition speed attribute.
+*/
 HbHwrWritingSpeed HbInputSettingProxy::hwrWritingSpeed() const
 {
     Q_D(const HbInputSettingProxy);
@@ -545,6 +529,9 @@
     return res;
 }
 
+/*!
+Strores detail mode for Chinese CangJie input mode.
+*/
 void HbInputSettingProxy::setDetailedCangjieMode(HbCangjieDetailMode cangjieDetail)
 {
     Q_D(HbInputSettingProxy);
@@ -563,6 +550,9 @@
     }
 }
 
+/*!
+Returns detail mode for Chinese CangJie input mode.
+*/
 HbCangjieDetailMode HbInputSettingProxy::detailedCangjieMode() const
 {
     Q_D(const HbInputSettingProxy);
@@ -577,16 +567,6 @@
 }
 
 /*!
-\deprecated HbInputSettingProxy::activeKeyboard() const
-    is deprecated. Use HbInputSettingProxy::activeKeyboard(Qt::Orientation) instead.
-*/
-HbKeyboardType HbInputSettingProxy::activeKeyboard() const
-{
-    Q_D(const HbInputSettingProxy);
-    return activeKeyboard(d->inputFrameworkScreenOrientation());
-}
-
-/*!
 Returns active keyboard for given screen oriention.
 */
 HbKeyboardType HbInputSettingProxy::activeKeyboard(Qt::Orientation orientation) const
@@ -635,30 +615,6 @@
 }
 
 /*!
-\deprecated HbInputSettingProxy::preferredInputMethod() const
-    is deprecated. Use HbInputSettingProxy::preferredInputMethod(Qt::Orientation) const instead.
-*/
-HbInputMethodDescriptor HbInputSettingProxy::preferredInputMethod() const
-{
-    Q_D(const HbInputSettingProxy);
-
-    HbInputMethodDescriptor result;
-
-    HbSettingProxyInternalData *prData = d->proxyData();
-    if (prData) {
-        d->lock();
-        if (d->inputFrameworkScreenOrientation() == Qt::Horizontal) {
-            result = prData->iPreferredMethodHorizontal.descriptor();
-        } else {
-            result = prData->iPreferredMethodVertical.descriptor();
-        }
-        d->unlock();
-    }
-
-    return result;
-}
-
-/*!
 Returns custom data associated to preferred input method.
 
 \sa setPreferredInputMethod
@@ -756,33 +712,6 @@
 }
 
 /*!
-\deprecated HbInputSettingProxy::setActiveHwKeyboard(HbKeyboardType)
-    is deprecated.
-*/
-void HbInputSettingProxy::setActiveHwKeyboard(HbKeyboardType keyboard)
-{
-    Q_UNUSED(keyboard);
-}
-
-/*!
-\deprecated HbInputSettingProxy::setActiveTouchKeyboard(HbKeyboardType)
-    is deprecated.
-*/
-void HbInputSettingProxy::setActiveTouchKeyboard(HbKeyboardType keyboard)
-{
-    Q_UNUSED(keyboard);
-}
-
-/*!
-\deprecated HbInputSettingProxy::setActiveKeyboard(HbKeyboardType)
-    is deprecated.
-*/
-void HbInputSettingProxy::setActiveKeyboard(HbKeyboardType keyboard)
-{
-    Q_UNUSED(keyboard);
-}
-
-/*!
 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.
@@ -1117,73 +1046,6 @@
 }
 
 /*!
-\deprecated HbInputSettingProxy::activeCustomInputMethod() const
-    is deprecated. Use preferredInputMethod instead.
-Returns active custom input method. The pluginNameAndPath field is empty if no custom input methid is active.
-
-\sa setActiveCustomInputMethod
-*/
-HbInputMethodDescriptor HbInputSettingProxy::activeCustomInputMethod() const
-{
-    return HbInputMethodDescriptor();
-}
-
-/*!
-\deprecated HbInputSettingProxy::setActiveCustomInputMethod(const HbInputMethodDescriptor&)
-    is deprecated. Use setPreferredInputMethod instead.
-\sa activeCustomInputMethod
-*/
-void HbInputSettingProxy::setActiveCustomInputMethod(const HbInputMethodDescriptor &inputMethod)
-{
-    Q_UNUSED(inputMethod)
-}
-
-/*!
-\deprecated HbInputSettingProxy::screenOrientation()
-    is deprecated. Use HbInputFocusObject::screenOrientation() instead.
-*/
-Qt::Orientation HbInputSettingProxy::screenOrientation()
-{
-    Q_D(HbInputSettingProxy);
-    return d->inputFrameworkScreenOrientation();
-}
-
-/*!
-\deprecated HbInputSettingProxy::setScreenOrientation(Qt::Orientation)
-    is deprecated.
-*/
-void HbInputSettingProxy::setScreenOrientation(Qt::Orientation screenOrientation)
-{
-    Q_UNUSED(screenOrientation);
-}
-
-/*!
-\deprecated HbInputSettingProxy::notifyScreenOrientationChange()
-    is deprecated.
-*/
-void HbInputSettingProxy::notifyScreenOrientationChange()
-{
-}
-
-/*!
-\deprecated HbInputSettingProxy::orientationChangeCompleted() const
-    is deprecated.
-*/
-bool HbInputSettingProxy::orientationChangeCompleted() const
-{
-    return false;
-}
-
-/*!
-\deprecated HbInputSettingProxy::initializeOrientation(Qt::Orientation)
-    is deprecated.
-*/
-void HbInputSettingProxy::initializeOrientation(Qt::Orientation screenOrientation)
-{
-    Q_UNUSED(screenOrientation);
-}
-
-/*!
 Returns the status of regional input correction feature.
 
 \sa enableRegionalCorrection.
@@ -1386,4 +1248,55 @@
     return res;
 }
 
+/*!
+Set the variable to true if the default keypad is western for chinese input method
+
+\sa useWesternDefaultKeypadForChinese
+*/
+void HbInputSettingProxy::setWesternDefaultKeypadForChinese(bool set)
+{
+    Q_D(const HbInputSettingProxy);
+
+    HbSettingProxyInternalData *prData = d->proxyData();
+    if (prData) {
+        bool notify = false;
+        d->lock();
+        if(prData->iUseWesternDefaultKeypadForChinese != set) {
+            prData->iUseWesternDefaultKeypadForChinese = set;
+            notify = true;
+        }
+        d->unlock();
+        if(notify) {
+            emit chineseDefaultKeypadChanged(prData->iUseWesternDefaultKeypadForChinese);
+        }
+    }
+}
+
+/*!
+Get whether the default keypad is western for chinese input method
+
+\sa setWesternDefaultKeypadForChinese
+*/
+bool HbInputSettingProxy::useWesternDefaultKeypadForChinese() const
+{
+    Q_D(const HbInputSettingProxy);
+    
+    HbSettingProxyInternalData *prData = d->proxyData();
+
+    if (prData) {
+        return prData->iUseWesternDefaultKeypadForChinese;
+    }
+
+    return false;
+}
+
+/*!
+\deprecated HbInputSettingProxy::setActiveKeyboard(HbKeyboardType)
+    is deprecated.
+*/
+void HbInputSettingProxy::setActiveKeyboard(HbKeyboardType keyboard)
+{
+    Q_UNUSED(keyboard);
+}
+
 // End of file