--- a/src/hbcore/inputfw/hbinputsettingproxy.cpp Fri Jun 11 13:58:22 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.cpp Wed Jun 23 18:33:25 2010 +0300
@@ -22,6 +22,9 @@
** Nokia at developer.feedback@nokia.com.
**
****************************************************************************/
+#include "hbinputsettingproxy.h"
+#include "hbinputsettingproxy_p.h"
+
#include <qbytearray.h>
#include <QFile>
#include <QBuffer>
@@ -31,8 +34,6 @@
#include <QVector>
#include <QDir>
-#include "hbinputsettingproxy.h"
-#include "hbinputsettingproxy_p.h"
#include "hbinputmodecache_p.h"
#include "hbinputfilter.h"
@@ -89,16 +90,16 @@
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();
}
}
@@ -145,12 +146,10 @@
{
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;
}
@@ -160,8 +159,6 @@
int mCount;
};
-/// @endcond
-
HbInputSettingProxyPrivate::HbInputSettingProxyPrivate()
{
iSharedMemory = new QSharedMemory(KInputSettingProxyKey);
@@ -182,7 +179,7 @@
lock();
- HbSettingProxyInternalData* prData = proxyData();
+ HbSettingProxyInternalData *prData = proxyData();
if (prData) {
++prData->iReferences;
}
@@ -201,7 +198,7 @@
void HbInputSettingProxyPrivate::shutdownDataArea()
{
lock();
- HbSettingProxyInternalData* prData = proxyData();
+ HbSettingProxyInternalData *prData = proxyData();
if (prData) {
prData->iReferences--;
if (prData->iReferences <= 0) {
@@ -213,12 +210,12 @@
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()
@@ -226,7 +223,7 @@
lock();
bool wasLoaded = load();
- HbSettingProxyInternalData* prData = proxyData();
+ HbSettingProxyInternalData *prData = proxyData();
if (prData) {
prData->iReferences = 0;
prData->iOrientationChangeCompleted = true;
@@ -240,8 +237,8 @@
prData->iGlobalSecondaryInputLanguage = QLocale::Language(0);
prData->iActiveKeyboard = HbKeyboardVirtual12Key;
prData->iTouchKeyboard = HbKeyboardVirtual12Key;
- prData->iHwKeyboard = HbKeyboardQwerty;
- prData->iPredictiveInputState = (HbKeyboardSettingFlags)HbKeyboardSetting12key|HbKeyboardSettingQwerty;
+ prData->iHwKeyboard = HbKeyboardQwerty;
+ prData->iPredictiveInputState = (HbKeyboardSettingFlags)HbKeyboardSetting12key | HbKeyboardSettingQwerty;
prData->iDigitType = HbDigitTypeLatin;
prData->iQwertyTextCasing = true;
prData->iQwertyCharacterPreview = true;
@@ -249,7 +246,7 @@
prData->iKeypressTimeout = 1000;
prData->iAutocompletion = (HbKeyboardSettingFlags)(HbKeyboardSetting12key | HbKeyboardSettingQwerty);
prData->iTypingCorrectionLevel = HbTypingCorrectionLevelHigh;
- prData->iPrimaryCandidateMode = HbPrimaryCandidateModeBestPrediction;
+ prData->iPrimaryCandidateMode = HbPrimaryCandidateModeBestPrediction;
prData->iPreferredMethodHorizontal = HbInputMethodDescriptor();
prData->iPreferredMethodHorizontal.setData(QByteArray());
prData->iPreferredMethodVertical = HbInputMethodDescriptor();
@@ -268,12 +265,12 @@
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();
- memcpy((void*)prData, (void*)ldData, sizeof(HbSettingProxyInternalData));
+ HbSettingProxyInternalData *prData = proxyData();
+ memcpy((void *)prData, (void *)ldData, sizeof(HbSettingProxyInternalData));
prData->iActiveKeyboard = ldData->iActiveKeyboard;
// Temporarily like this, will be moved as part of shared data later...
@@ -282,7 +279,7 @@
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);
}
@@ -302,19 +299,19 @@
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*)iTopScs.constData(), numItems * sizeof(HbScClassifier));
+ file.write((const char *)&numItems, sizeof(int));
+ file.write((const char *)iTopScs.constData(), numItems * sizeof(HbScClassifier));
file.close();
}
}
@@ -338,9 +335,9 @@
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()
@@ -350,13 +347,13 @@
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();
@@ -369,7 +366,7 @@
if (HbInputSettingProxy::instance()->screenOrientation() == Qt::Vertical) {
keyboard = HbKeyboardVirtual12Key;
} else {
- if(flipStatus()) {
+ if (flipStatus()) {
keyboard = HbKeyboardQwerty;
} else {
keyboard = HbKeyboardVirtualQwerty;
@@ -379,14 +376,12 @@
HbInputSettingProxy::instance()->setActiveKeyboard(keyboard);
}
-//
-// HbInputSettingProxy
-//
+/// @endcond
/*!
Returns pointer to the singleton object.
*/
-HbInputSettingProxy* HbInputSettingProxy::instance()
+HbInputSettingProxy *HbInputSettingProxy::instance()
{
static HbInputSettingProxy theProxy;
return &theProxy;
@@ -449,7 +444,7 @@
\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 &)));
@@ -465,7 +460,7 @@
\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 &)));
@@ -489,7 +484,7 @@
HbInputLanguage res;
d->lock();
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iGlobalPrimaryInputLanguage;
}
@@ -510,7 +505,7 @@
HbInputLanguage res;
d->lock();
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iGlobalSecondaryInputLanguage;
}
@@ -539,7 +534,7 @@
Q_D(const HbInputSettingProxy);
HbKeyboardType res = HbKeyboardNone;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iHwKeyboard;
}
@@ -558,7 +553,7 @@
Q_D(const HbInputSettingProxy);
HbKeyboardType res = HbKeyboardNone;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iTouchKeyboard;
}
@@ -576,7 +571,7 @@
Q_D(const HbInputSettingProxy);
HbKeyboardType res = HbKeyboardNone;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iActiveKeyboard;
}
@@ -596,7 +591,7 @@
HbInputMethodDescriptor result;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
d->lock();
if (orientation == Qt::Horizontal) {
@@ -622,7 +617,7 @@
HbInputMethodDescriptor result;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
d->lock();
if (prData->iScreenOrientation == Qt::Horizontal) {
@@ -647,7 +642,7 @@
QByteArray result;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
d->lock();
if (orientation == Qt::Horizontal) {
@@ -673,7 +668,7 @@
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) {
@@ -692,10 +687,10 @@
\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();
@@ -718,7 +713,7 @@
void HbInputSettingProxy::setGlobalSecondaryInputLanguage(const HbInputLanguage &language)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -744,7 +739,7 @@
void HbInputSettingProxy::setActiveHwKeyboard(HbKeyboardType keyboard)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -770,7 +765,7 @@
void HbInputSettingProxy::setActiveTouchKeyboard(HbKeyboardType keyboard)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -796,7 +791,7 @@
void HbInputSettingProxy::setActiveKeyboard(HbKeyboardType keyboard)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -823,7 +818,7 @@
Q_D(const HbInputSettingProxy);
bool res = false;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iPredictiveInputState & keyboardType;
}
@@ -839,11 +834,11 @@
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;
@@ -872,7 +867,7 @@
Q_D(const HbInputSettingProxy);
bool res = false;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
if (activeKeyboard() & HbQwertyKeyboardMask) {
res = prData->iPredictiveInputState & HbKeyboardSettingQwerty;
@@ -912,7 +907,7 @@
return QString(HB_INSTALL_DIR) + QDir::separator() + QString(".hbinputs");
} else {
#ifdef Q_OS_UNIX
- return QDir::homePath() + QDir::separator() + QString(".hbinputs");
+ return QDir::homePath() + QDir::separator() + QString(".hbinputs");
#else
return HBI_BASE_WRITABLE_PATH ;
#endif
@@ -948,12 +943,12 @@
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
@@ -1026,7 +1021,7 @@
Q_D(const HbInputSettingProxy);
HbInputDigitType res = HbDigitTypeLatin;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iDigitType;
}
@@ -1042,7 +1037,7 @@
void HbInputSettingProxy::setGlobalDigitType(HbInputDigitType digitType)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
d->lock();
if (prData->iDigitType != digitType) {
@@ -1062,7 +1057,7 @@
Q_D(HbInputSettingProxy);
bool res = false;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iQwertyTextCasing;
}
@@ -1078,7 +1073,7 @@
void HbInputSettingProxy::setAutomaticTextCasingForQwerty(bool status)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -1091,7 +1086,7 @@
emit automaticTextCasingStateForQwertyChanged(status);
}
}
-
+
}
/*!
@@ -1102,7 +1097,7 @@
void HbInputSettingProxy::setCharacterPreviewForQwerty(bool previewEnabled)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -1115,7 +1110,7 @@
emit characterPreviewStateForQwertyChanged(previewEnabled);
}
}
-
+
}
/*!
@@ -1129,7 +1124,7 @@
bool res = false;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iQwertyCharacterPreview;
}
@@ -1138,6 +1133,8 @@
}
/*!
+\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
@@ -1148,6 +1145,8 @@
}
/*!
+\deprecated HbInputSettingProxy::setActiveCustomInputMethod(const HbInputMethodDescriptor&)
+ is deprecated. Use setPreferredInputMethod instead.
\sa activeCustomInputMethod
*/
void HbInputSettingProxy::setActiveCustomInputMethod(const HbInputMethodDescriptor &inputMethod)
@@ -1156,14 +1155,14 @@
}
/*!
-Returns the current screen orientation in settings
+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;
}
@@ -1172,32 +1171,31 @@
/*!
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 (screenOrientation != prData->iScreenOrientation) {
- prData->iScreenOrientation = screenOrientation;
- notify = true;
+ if (prData->iOrientationChangeCompleted) {
+ d->unlock();
+ return;
}
+ prData->iScreenOrientation = screenOrientation;
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();
- }
+ // notify everyone that the orientation has changed.
+ d->handleDeviceSpecificOriantationAndFlipChange();
+ emit orientationChanged(screenOrientation);
+
+ // set orientation change operation completed.
+ d->lock();
+ prData->iOrientationChangeCompleted = true;
+ d->unlock();
}
}
@@ -1213,13 +1211,20 @@
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
+ bool notify = false;
d->lock();
- prData->iOrientationChangeCompleted = false;
+ if (prData->iOrientationChangeCompleted) {
+ prData->iOrientationChangeCompleted = false;
+ notify = true;
+ }
d->unlock();
+ if (notify) {
+ emit orientationAboutToChange();
+ }
}
- emit orientationAboutToChange();
+
}
/*!
@@ -1230,7 +1235,7 @@
Q_D(const HbInputSettingProxy);
bool completed = true;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
completed = prData->iOrientationChangeCompleted;
}
@@ -1246,7 +1251,7 @@
Q_D(HbInputSettingProxy);
// call handleDeviceSpecificOriantationAndFlipChange method
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
d->lock();
prData->iScreenOrientation = screenOrientation;
@@ -1260,7 +1265,7 @@
}
/*!
-Returns the status of regional input correction feature.
+Returns the status of regional input correction feature.
\sa enableRegionalCorrection.
*/
@@ -1268,7 +1273,7 @@
{
Q_D(const HbInputSettingProxy);
bool res = false;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iRegionalCorrectionStatus;
}
@@ -1283,7 +1288,7 @@
void HbInputSettingProxy::enableRegionalCorrection(bool newStatus)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -1306,7 +1311,7 @@
void HbInputSettingProxy::setKeypressTimeout(int timeout)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -1322,7 +1327,7 @@
}
/*!
-Returns the keypress timeout value.
+Returns the keypress timeout value.
\sa setKeypressTimeout.
*/
@@ -1330,7 +1335,7 @@
{
Q_D(const HbInputSettingProxy);
int res = 0;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iKeypressTimeout;
}
@@ -1345,7 +1350,7 @@
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();
@@ -1376,7 +1381,7 @@
{
Q_D(const HbInputSettingProxy);
bool res = false;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iAutocompletion & keyboardType;
}
@@ -1391,7 +1396,7 @@
void HbInputSettingProxy::setTypingCorrectionLevel(HbTypingCorrectionLevel level)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -1416,7 +1421,7 @@
{
Q_D(const HbInputSettingProxy);
HbTypingCorrectionLevel res = HbTypingCorrectionLevelHigh;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iTypingCorrectionLevel;
}
@@ -1431,7 +1436,7 @@
void HbInputSettingProxy::setPrimaryCandidateMode(HbPrimaryCandidateMode mode)
{
Q_D(HbInputSettingProxy);
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
bool notify = false;
d->lock();
@@ -1455,7 +1460,7 @@
{
Q_D(const HbInputSettingProxy);
HbPrimaryCandidateMode res = HbPrimaryCandidateModeExactTyping;
- HbSettingProxyInternalData* prData = d->proxyData();
+ HbSettingProxyInternalData *prData = d->proxyData();
if (prData) {
res = prData->iPrimaryCandidateMode;
}