FCL/sf/mw/hb: comparison src/hbcore/inputfw/hbinputsettingproxy.cpp

equal deleted inserted replaced

-:627c4a0fd0e7
+:c3690ec91ef8
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+#include "hbinputsettingproxy.h"
+#include "hbinputsettingproxy_p.h"
 #include <qbytearray.h>
 #include <QFile>
 #include <QBuffer>
 #include <QDataStream>
 #include <QCoreApplication>
 #include <QSharedMemory>
 #include <QVector>
 #include <QDir>
-#include "hbinputsettingproxy.h"
-#include "hbinputsettingproxy_p.h"
 #include "hbinputmodecache_p.h"
 #include "hbinputfilter.h"
 #ifdef Q_OS_SYMBIAN
 displayNameSize = 0;
 if (!descriptor.pluginNameAndPath().isEmpty() &&
 (descriptor.pluginNameAndPath().size() * sizeof(QChar) < HbActiveMethodNameMax)) {
 pluginNameAndPathSize = descriptor.pluginNameAndPath().size();
-memcpy((void*)pluginNameAndPath, (void*)descriptor.pluginNameAndPath().unicode(), descriptor.pluginNameAndPath().size() * sizeof(QChar));
+memcpy((void *)pluginNameAndPath, (void *)descriptor.pluginNameAndPath().unicode(), descriptor.pluginNameAndPath().size() * sizeof(QChar));
 }
 if (!descriptor.key().isEmpty() &&
 (descriptor.key().size() * sizeof(QChar) < HbActiveMethodKeyMax)) {
-memcpy((void*)key, (void*)descriptor.key().unicode(), descriptor.key().size() * sizeof(QChar));
+memcpy((void *)key, (void *)descriptor.key().unicode(), descriptor.key().size() * sizeof(QChar));
 keySize = descriptor.key().size();
 }
 if (!descriptor.displayName().isEmpty() &&
 (descriptor.displayName().size() * sizeof(QChar) < HbActiveMethodKeyMax)) {
-memcpy((void*)displayName, (void*)descriptor.displayName().unicode(), descriptor.displayName().size() * sizeof(QChar));
+memcpy((void *)displayName, (void *)descriptor.displayName().unicode(), descriptor.displayName().size() * sizeof(QChar));
 displayNameSize = descriptor.displayName().size();
 }
 }
 HbInputMethodDescriptor HbSettingProxyInputMethodDescriptor::descriptor() const
 // of how popular a SC is.
 class HbScClassifier
 {
 public:
 HbScClassifier(QChar aChar = 0, int aCount = 0)
-: mChar(aChar), mCount(aCount)
+: mChar(aChar), mCount(aCount) {
-{
+}
-}
+void operator=(const HbScClassifier &aOther) {
-void operator=(const HbScClassifier& aOther)
-{
 mChar = aOther.mChar;
 mCount = aOther.mCount;
 }
 public:
 QChar mChar;
 int mCount;
 };
-/// @endcond
 HbInputSettingProxyPrivate::HbInputSettingProxyPrivate()
 {
 iSharedMemory = new QSharedMemory(KInputSettingProxyKey);
 if (!iSharedMemory->attach()) {
 initializeDataArea();
 }
 lock();
-HbSettingProxyInternalData* prData = proxyData();
+HbSettingProxyInternalData *prData = proxyData();
 if (prData) {
 ++prData->iReferences;
 }
 unlock();
 }
 void HbInputSettingProxyPrivate::shutdownDataArea()
 {
 lock();
-HbSettingProxyInternalData* prData = proxyData();
+HbSettingProxyInternalData *prData = proxyData();
 if (prData) {
 prData->iReferences--;
 if (prData->iReferences <= 0) {
 save();
 }
 unlock();
 }
 QString HbInputSettingProxyPrivate::dataFilePath()
 {
-return HbInputSettingProxy::writablePath()+QDir::separator()+QString("settings");
+return HbInputSettingProxy::writablePath() + QDir::separator() + QString("settings");
 }
 QString HbInputSettingProxyPrivate::dataFileNameAndPath()
 {
-return dataFilePath()+QDir::separator()+QString("proxy.dat");
+return dataFilePath() + QDir::separator() + QString("proxy.dat");
 }
 void HbInputSettingProxyPrivate::initializeDataArea()
 {
 lock();
 bool wasLoaded = load();
-HbSettingProxyInternalData* prData = proxyData();
+HbSettingProxyInternalData *prData = proxyData();
 if (prData) {
 prData->iReferences = 0;
 prData->iOrientationChangeCompleted = true;
 // Default values, real ones should be set by calling initializeOrientation()
 prData->iScreenOrientation = Qt::Vertical;
 prData->iVersion = HbProxyDataRequiredVersion;
 prData->iGlobalPrimaryInputLanguage = HbInputLanguage(QLocale::English, QLocale::UnitedKingdom);
 prData->iGlobalSecondaryInputLanguage = QLocale::Language(0);
 prData->iActiveKeyboard = HbKeyboardVirtual12Key;
 prData->iTouchKeyboard = HbKeyboardVirtual12Key;
 prData->iHwKeyboard = HbKeyboardQwerty;
-prData->iPredictiveInputState = (HbKeyboardSettingFlags)HbKeyboardSetting12key|HbKeyboardSettingQwerty;
+prData->iPredictiveInputState = (HbKeyboardSettingFlags)HbKeyboardSetting12key | HbKeyboardSettingQwerty;
 prData->iDigitType = HbDigitTypeLatin;
 prData->iQwertyTextCasing = true;
 prData->iQwertyCharacterPreview = true;
 prData->iRegionalCorrectionStatus = true;
 prData->iKeypressTimeout = 1000;
 prData->iAutocompletion = (HbKeyboardSettingFlags)(HbKeyboardSetting12key | HbKeyboardSettingQwerty);
 prData->iTypingCorrectionLevel = HbTypingCorrectionLevelHigh;
 prData->iPrimaryCandidateMode = HbPrimaryCandidateModeBestPrediction;
 prData->iPreferredMethodHorizontal = HbInputMethodDescriptor();
 prData->iPreferredMethodHorizontal.setData(QByteArray());
 prData->iPreferredMethodVertical = HbInputMethodDescriptor();
 prData->iPreferredMethodVertical.setData(QByteArray());
 }
 return false;
 }
 QByteArray rawData = file.read(sizeof(HbSettingProxyInternalData));
 if (rawData.size() == sizeof(HbSettingProxyInternalData)) {
-HbSettingProxyInternalData* ldData = (HbSettingProxyInternalData*)rawData.constData();
+HbSettingProxyInternalData *ldData = (HbSettingProxyInternalData *)rawData.constData();
 if (ldData) {
 if (ldData->iVersion == HbProxyDataRequiredVersion) {
-HbSettingProxyInternalData* prData = proxyData();
+HbSettingProxyInternalData *prData = proxyData();
-memcpy((void*)prData, (void*)ldData, sizeof(HbSettingProxyInternalData));
+memcpy((void *)prData, (void *)ldData, sizeof(HbSettingProxyInternalData));
 prData->iActiveKeyboard = ldData->iActiveKeyboard;
 // Temporarily like this, will be moved as part of shared data later...
 int numItems = 0;
 file.read((char *)&numItems, sizeof(int));
 iTopScs.clear();
 for (int jj = 0; jj < numItems; jj++) {
 HbScClassifier tmpItem;
-file.read((char*)&tmpItem, sizeof(HbScClassifier));
+file.read((char *)&tmpItem, sizeof(HbScClassifier));
 iTopScs.append(tmpItem);
 }
 file.close();
 return true;
 {
 // Make sure that the path exists
 QDir settingDir;
 settingDir.mkpath(dataFilePath());
-HbSettingProxyInternalData* prData = proxyData();
+HbSettingProxyInternalData *prData = proxyData();
 if (prData) {
 QFile file(iSaveFile);
 if (!file.open(QIODevice::WriteOnly)) {
 return;
 }
-file.write((const char*)prData, sizeof(HbSettingProxyInternalData));
+file.write((const char *)prData, sizeof(HbSettingProxyInternalData));
 // Temporarily like this, will be moved to shared data later...
 int numItems = iTopScs.count();
-file.write((const char*)&numItems, sizeof(int));
+file.write((const char *)&numItems, sizeof(int));
-file.write((const char*)iTopScs.constData(), numItems * sizeof(HbScClassifier));
+file.write((const char *)iTopScs.constData(), numItems * sizeof(HbScClassifier));
 file.close();
 }
 }
 QString HbInputSettingProxyPrivate::stringFromProxyDataElement(QChar *string) const
 string[i] = source[i];
 }
 string[i] = 0;
 }
-HbSettingProxyInternalData* HbInputSettingProxyPrivate::proxyData() const
+HbSettingProxyInternalData *HbInputSettingProxyPrivate::proxyData() const
 {
-return static_cast<HbSettingProxyInternalData*>(iSharedMemory->data());
+return static_cast<HbSettingProxyInternalData *>(iSharedMemory->data());
 }
 void HbInputSettingProxyPrivate::flipToggle()
 {
 setFlipStatus(!flipStatus());
 }
 bool HbInputSettingProxyPrivate::flipStatus()
 {
-HbSettingProxyInternalData* prData = proxyData();
+HbSettingProxyInternalData *prData = proxyData();
 return prData->iFlipStatus;
 }
 void HbInputSettingProxyPrivate::setFlipStatus(bool flipStatus)
 {
-HbSettingProxyInternalData* prData = proxyData();
+HbSettingProxyInternalData *prData = proxyData();
 prData->iFlipStatus = flipStatus;
 handleDeviceSpecificOriantationAndFlipChange();
 }
 HbKeyboardType  keyboard = HbKeyboardNone;
 if (HbInputSettingProxy::instance()->screenOrientation() == Qt::Vertical) {
 keyboard = HbKeyboardVirtual12Key;
 } else {
-if(flipStatus()) {
+if (flipStatus()) {
 keyboard = HbKeyboardQwerty;
 } else {
 keyboard = HbKeyboardVirtualQwerty;
 }
 }
 HbInputSettingProxy::instance()->setActiveKeyboard(keyboard);
 }
-//
+/// @endcond
-// HbInputSettingProxy
-//
 /*!
 Returns pointer to the singleton object.
 */
-HbInputSettingProxy* HbInputSettingProxy::instance()
+HbInputSettingProxy *HbInputSettingProxy::instance()
 {
 static HbInputSettingProxy theProxy;
 return &theProxy;
 }
 \sa keypressTimeoutChanged
 \sa autocompletionStateChanged
 \sa typingCorrectionLevelChanged
 \sa primaryCandidateModeChanged
 */
-void HbInputSettingProxy::connectObservingObject(QObject* aObserver)
+void HbInputSettingProxy::connectObservingObject(QObject *aObserver)
 {
 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)));
 /*!
 Disconnects given object from the setting proxy.
 \sa connectObservingObject
 */
-void HbInputSettingProxy::disconnectObservingObject(QObject* aObserver)
+void HbInputSettingProxy::disconnectObservingObject(QObject *aObserver)
 {
 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)));
 {
 Q_D(const HbInputSettingProxy);
 HbInputLanguage res;
 d->lock();
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iGlobalPrimaryInputLanguage;
 }
 d->unlock();
 {
 Q_D(const HbInputSettingProxy);
 HbInputLanguage res;
 d->lock();
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iGlobalSecondaryInputLanguage;
 }
 d->unlock();
 HbKeyboardType HbInputSettingProxy::activeHwKeyboard() const
 {
 Q_D(const HbInputSettingProxy);
 HbKeyboardType res = HbKeyboardNone;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iHwKeyboard;
 }
 return res;
 HbKeyboardType HbInputSettingProxy::activeTouchKeyboard() const
 {
 Q_D(const HbInputSettingProxy);
 HbKeyboardType res = HbKeyboardNone;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iTouchKeyboard;
 }
 return res;
 HbKeyboardType HbInputSettingProxy::activeKeyboard() const
 {
 Q_D(const HbInputSettingProxy);
 HbKeyboardType res = HbKeyboardNone;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iActiveKeyboard;
 }
 return res;
 {
 Q_D(const HbInputSettingProxy);
 HbInputMethodDescriptor result;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 d->lock();
 if (orientation == Qt::Horizontal) {
 result = prData->iPreferredMethodHorizontal.descriptor();
 } else {
 {
 Q_D(const HbInputSettingProxy);
 HbInputMethodDescriptor result;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 d->lock();
 if (prData->iScreenOrientation == Qt::Horizontal) {
 result = prData->iPreferredMethodHorizontal.descriptor();
 } else {
 {
 Q_D(const HbInputSettingProxy);
 QByteArray result;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 d->lock();
 if (orientation == Qt::Horizontal) {
 result = prData->iPreferredMethodHorizontal.data();
 } else {
 \sa preferredInputMethod
 */
 void HbInputSettingProxy::setPreferredInputMethod(Qt::Orientation orientation, const HbInputMethodDescriptor &inputMethod, const QByteArray &customData)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 d->lock();
 if (orientation == Qt::Horizontal) {
 prData->iPreferredMethodHorizontal = inputMethod;
 prData->iPreferredMethodHorizontal.setData(customData);
 /*!
 Sets system wide input language. Will emit signal globalInputLanguageChanged if language is changed.
 \sa globalInputLanguage
 */
-void HbInputSettingProxy::setGlobalInputLanguage(const HbInputLanguage& language)
+void HbInputSettingProxy::setGlobalInputLanguage(const HbInputLanguage &language)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iGlobalPrimaryInputLanguage != language) {
 prData->iGlobalPrimaryInputLanguage = language;
 \sa globalSecondaryInputLanguage
 */
 void HbInputSettingProxy::setGlobalSecondaryInputLanguage(const HbInputLanguage &language)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iGlobalSecondaryInputLanguage != language) {
 prData->iGlobalSecondaryInputLanguage = language;
 \sa setActiveHwKeyboard
 */
 void HbInputSettingProxy::setActiveHwKeyboard(HbKeyboardType keyboard)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iHwKeyboard != keyboard) {
 prData->iHwKeyboard = keyboard;
 \sa setActiveHwKeyboard
 */
 void HbInputSettingProxy::setActiveTouchKeyboard(HbKeyboardType keyboard)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iTouchKeyboard != keyboard) {
 prData->iTouchKeyboard = keyboard;
 \sa setActiveHwKeyboard
 */
 void HbInputSettingProxy::setActiveKeyboard(HbKeyboardType keyboard)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iActiveKeyboard != keyboard) {
 prData->iActiveKeyboard = keyboard;
 bool HbInputSettingProxy::predictiveInputStatus(HbKeyboardSettingFlags keyboardType) const
 {
 Q_D(const HbInputSettingProxy);
 bool res = false;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iPredictiveInputState & keyboardType;
 }
 return res;
 \sa predictiveInputStatus
 */
 void HbInputSettingProxy::setPredictiveInputStatus(HbKeyboardSettingFlags keyboardType, bool newStatus)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 HbKeyboardSettingFlags newValue = prData->iPredictiveInputState;
 if (newStatus) {
 newValue |= keyboardType;
 } else {
 newValue &= ~keyboardType;
 bool HbInputSettingProxy::predictiveInputStatusForActiveKeyboard() const
 {
 Q_D(const HbInputSettingProxy);
 bool res = false;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 if (activeKeyboard() & HbQwertyKeyboardMask) {
 res = prData->iPredictiveInputState & HbKeyboardSettingQwerty;
 } else {
 res = prData->iPredictiveInputState & HbKeyboardSetting12key;
 if (QString(HB_BUILD_DIR) == QString(HB_INSTALL_DIR)) {
 // This is local build so also use local writable path.
 return QString(HB_INSTALL_DIR) + QDir::separator() + QString(".hbinputs");
 } else {
 #ifdef Q_OS_UNIX
 return QDir::homePath() + QDir::separator() + QString(".hbinputs");
 #else
 return HBI_BASE_WRITABLE_PATH ;
 #endif
 }
 #endif
 {
 QStringList result;
 QFileInfoList list = QDir::drives();
 #ifdef Q_OS_SYMBIAN
-for(int counter = 0; counter < list.count(); counter ++) {
+for (int counter = 0; counter < list.count(); counter ++) {
 result.append(list.at(counter).absoluteFilePath() + QString("/resource/keymaps"));
 }
 #else
 result.append(HB_RESOURCES_DIR + (QDir::separator() + QString("keymaps")));
-for(int counter = 0; counter < list.count(); counter ++) {
+for (int counter = 0; counter < list.count(); counter ++) {
 result.append(list.at(counter).absoluteFilePath() + QString("resource/keymaps"));
 }
 #endif
 result.sort();
 //Append the default resource at the end
 HbInputDigitType HbInputSettingProxy::globalDigitType() const
 {
 Q_D(const HbInputSettingProxy);
 HbInputDigitType res = HbDigitTypeLatin;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iDigitType;
 }
 return res;
 \sa globalDigitType
 */
 void HbInputSettingProxy::setGlobalDigitType(HbInputDigitType digitType)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 d->lock();
 if (prData->iDigitType != digitType) {
 prData->iDigitType = digitType;
 }
 bool HbInputSettingProxy::automaticTextCasingForQwerty()
 {
 Q_D(HbInputSettingProxy);
 bool res = false;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iQwertyTextCasing;
 }
 return res;
 \sa automaticTextCasingForQwerty
 */
 void HbInputSettingProxy::setAutomaticTextCasingForQwerty(bool status)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iQwertyTextCasing != status) {
 prData->iQwertyTextCasing = status;
 d->unlock();
 if (notify) {
 emit automaticTextCasingStateForQwertyChanged(status);
 }
 }
 }
 /*!
 Enables/Disables character preview in Qwerty keypad. Will emit signal characterPreviewStateForQwertyChanged if status is changed.
 \sa characterPreviewForQwerty
 */
 void HbInputSettingProxy::setCharacterPreviewForQwerty(bool previewEnabled)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iQwertyCharacterPreview != previewEnabled) {
 prData->iQwertyCharacterPreview = previewEnabled;
 d->unlock();
 if (notify) {
 emit characterPreviewStateForQwertyChanged(previewEnabled);
 }
 }
 }
 /*!
 Returns true if the character preview is enabled in Qwerty keypad.
 {
 Q_D(HbInputSettingProxy);
 bool res = false;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iQwertyCharacterPreview;
 }
 return res;
 }
 /*!
+\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)
 }
 /*!
 Returns the current screen orientation in settings
 */
 Qt::Orientation HbInputSettingProxy::screenOrientation()
 {
 Q_D(HbInputSettingProxy);
 Qt::Orientation orientation = Qt::Vertical;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 orientation = prData->iScreenOrientation;
 }
 return orientation;
 }
 /*!
 Sets the current screen orientation in settings. This completes orientation change
-started with notifyScreenOrientationChange.
+started with notifyScreenOrientationChange. Nothing is done, If
+notifyScreenOrientationChange has not been called before calling this.
 */
 void HbInputSettingProxy::setScreenOrientation(Qt::Orientation screenOrientation)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
-bool notify = false;
+d->lock();
+if (prData->iOrientationChangeCompleted) {
-d->lock();
-if (screenOrientation != prData->iScreenOrientation) {
-prData->iScreenOrientation = screenOrientation;
-notify = true;
-}
-d->unlock();
-if (notify) {
-// notify everyone that the orientation has changed.
-d->handleDeviceSpecificOriantationAndFlipChange();
-emit orientationChanged(screenOrientation);
-// set orientation change operation completed.
-d->lock();
-prData->iOrientationChangeCompleted = true;
 d->unlock();
-}
+return;
+}
+prData->iScreenOrientation = screenOrientation;
+d->unlock();
+// notify everyone that the orientation has changed.
+d->handleDeviceSpecificOriantationAndFlipChange();
+emit orientationChanged(screenOrientation);
+// set orientation change operation completed.
+d->lock();
+prData->iOrientationChangeCompleted = true;
+d->unlock();
 }
 }
 /*!
 Starts screen orientation change sequence. Emits orientationAboutToChange signal
 */
 void HbInputSettingProxy::notifyScreenOrientationChange()
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
-d->lock();
+bool notify = false;
-prData->iOrientationChangeCompleted = false;
+d->lock();
-d->unlock();
+if (prData->iOrientationChangeCompleted) {
-}
+prData->iOrientationChangeCompleted = false;
-emit orientationAboutToChange();
+notify = true;
+}
+d->unlock();
+if (notify) {
+emit orientationAboutToChange();
+}
+}
 }
 /*!
 Returns true if the orientation change is completed
 */
 bool HbInputSettingProxy::orientationChangeCompleted() const
 {
 Q_D(const HbInputSettingProxy);
 bool completed = true;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 completed = prData->iOrientationChangeCompleted;
 }
 return completed;
 }
 void HbInputSettingProxy::initializeOrientation(Qt::Orientation screenOrientation)
 {
 Q_D(HbInputSettingProxy);
 // call handleDeviceSpecificOriantationAndFlipChange method
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 d->lock();
 prData->iScreenOrientation = screenOrientation;
 if (screenOrientation == Qt::Vertical) {
 prData->iActiveKeyboard = HbKeyboardVirtual12Key;
 d->unlock();
 }
 }
 /*!
 Returns the status of regional input correction feature.
 \sa enableRegionalCorrection.
 */
 bool HbInputSettingProxy::regionalCorrectionEnabled()
 {
 Q_D(const HbInputSettingProxy);
 bool res = false;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iRegionalCorrectionStatus;
 }
 return res;
 }
 \sa regionalCorrectionEnabled.
 */
 void HbInputSettingProxy::enableRegionalCorrection(bool newStatus)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iRegionalCorrectionStatus != newStatus) {
 prData->iRegionalCorrectionStatus = newStatus;
 \sa keypressTimeout.
 */
 void HbInputSettingProxy::setKeypressTimeout(int timeout)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iKeypressTimeout != timeout) {
 prData->iKeypressTimeout = timeout;
 }
 }
 }
 /*!
 Returns the keypress timeout value.
 \sa setKeypressTimeout.
 */
 int HbInputSettingProxy::keypressTimeout() const
 {
 Q_D(const HbInputSettingProxy);
 int res = 0;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iKeypressTimeout;
 }
 return res;
 }
 \sa isAutocompletionEnabled.
 */
 void HbInputSettingProxy::setAutocompletionStatus(HbKeyboardSettingFlags keyboardType, bool state)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 HbKeyboardSettingFlags newValue = prData->iAutocompletion;
 if (state) {
 */
 bool HbInputSettingProxy::isAutocompletionEnabled(HbKeyboardSettingFlags keyboardType) const
 {
 Q_D(const HbInputSettingProxy);
 bool res = false;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iAutocompletion & keyboardType;
 }
 return res;
 }
 \sa typingCorrectionLevel.
 */
 void HbInputSettingProxy::setTypingCorrectionLevel(HbTypingCorrectionLevel level)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iTypingCorrectionLevel != level) {
 prData->iTypingCorrectionLevel = level;
 */
 HbTypingCorrectionLevel HbInputSettingProxy::typingCorrectionLevel() const
 {
 Q_D(const HbInputSettingProxy);
 HbTypingCorrectionLevel res = HbTypingCorrectionLevelHigh;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iTypingCorrectionLevel;
 }
 return res;
 }
 \sa primaryCandidateMode.
 */
 void HbInputSettingProxy::setPrimaryCandidateMode(HbPrimaryCandidateMode mode)
 {
 Q_D(HbInputSettingProxy);
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 bool notify = false;
 d->lock();
 if (prData->iPrimaryCandidateMode != mode) {
 prData->iPrimaryCandidateMode = mode;
 */
 HbPrimaryCandidateMode HbInputSettingProxy::primaryCandidateMode() const
 {
 Q_D(const HbInputSettingProxy);
 HbPrimaryCandidateMode res = HbPrimaryCandidateModeExactTyping;
-HbSettingProxyInternalData* prData = d->proxyData();
+HbSettingProxyInternalData *prData = d->proxyData();
 if (prData) {
 res = prData->iPrimaryCandidateMode;
 }
 return res;
 }

changeset 6	c3690ec91ef8
parent 5	627c4a0fd0e7
child 21	4633027730f5
child 34	ed14f46c0e55