--- a/src/hbcore/inputfw/hbinputstandardfilters.cpp Fri Jun 11 13:58:22 2010 +0300
+++ b/src/hbcore/inputfw/hbinputstandardfilters.cpp Wed Jun 23 18:33:25 2010 +0300
@@ -46,37 +46,37 @@
/* Returns true if the character is a valid number in the current input language
*/
-
+
static bool isValidNumber(QChar aChar)
{
bool ret = false;
QLocale::Language language = HbInputSettingProxy::instance()->globalInputLanguage().language();
- QLocale::Language systemLanguage = QLocale::system().language();
+ QLocale::Language systemLanguage = QLocale::system().language();
- // If both phone language and writing language are same, then language specific
- // digits should be allowed in phone number and digits only editors. If the current
- // language is Arabic, then Arabic-indic digits are supported. Eastern-Arabic digits
- // are supported in Persian and Urdu languages.
- if (language == systemLanguage) {
- if (language == QLocale::Arabic &&
- (aChar >= HB_DIGIT_ARABIC_INDIC_START_VALUE &&
- aChar <= HB_DIGIT_ARABIC_INDIC_END_VALUE)) {
+ // If both phone language and writing language are same, then language specific
+ // digits should be allowed in phone number and digits only editors. If the current
+ // language is Arabic, then Arabic-indic digits are supported. Eastern-Arabic digits
+ // are supported in Persian and Urdu languages.
+ if (language == systemLanguage) {
+ if (language == QLocale::Arabic &&
+ (aChar >= HB_DIGIT_ARABIC_INDIC_START_VALUE &&
+ aChar <= HB_DIGIT_ARABIC_INDIC_END_VALUE)) {
ret = true;
} else if ((language == QLocale::Persian ||
- language == QLocale::Urdu) &&
- (aChar >= HB_DIGIT_EASTERN_ARABIC_START_VALUE &&
- aChar <= HB_DIGIT_EASTERN_ARABIC_END_VALUE)) {
+ language == QLocale::Urdu) &&
+ (aChar >= HB_DIGIT_EASTERN_ARABIC_START_VALUE &&
+ aChar <= HB_DIGIT_EASTERN_ARABIC_END_VALUE)) {
ret = true;
} else if (aChar >= '0' && aChar <= '9') {
ret = true;
- }
+ }
} else if (aChar >= '0' && aChar <= '9') {
ret = true;
- }
- return ret;
+ }
+ return ret;
}
-HbPhoneNumberFilter* HbPhoneNumberFilter::instance()
+HbPhoneNumberFilter *HbPhoneNumberFilter::instance()
{
static HbPhoneNumberFilter myInstance;
return &myInstance;
@@ -101,7 +101,7 @@
return true;
} else if (isValidNumber(character)) {
return true;
- }
+ }
return false;
}
@@ -118,7 +118,7 @@
\sa HbEditorInterface
*/
-HbFormattedNumbersFilter* HbFormattedNumbersFilter::instance()
+HbFormattedNumbersFilter *HbFormattedNumbersFilter::instance()
{
static HbFormattedNumbersFilter myInstance;
return &myInstance;
@@ -157,7 +157,7 @@
\sa HbEditorInterface
*/
-HbDigitsOnlyFilter* HbDigitsOnlyFilter::instance()
+HbDigitsOnlyFilter *HbDigitsOnlyFilter::instance()
{
static HbDigitsOnlyFilter myInstance;
return &myInstance;
@@ -194,7 +194,7 @@
\sa HbEditorInterface
*/
-HbUrlFilter* HbUrlFilter::instance()
+HbUrlFilter *HbUrlFilter::instance()
{
static HbUrlFilter myInstance;
return &myInstance;
@@ -233,7 +233,7 @@
\sa HbEditorInterface
*/
-HbEmailAddressFilter* HbEmailAddressFilter::instance()
+HbEmailAddressFilter *HbEmailAddressFilter::instance()
{
static HbEmailAddressFilter myInstance;
return &myInstance;
@@ -255,10 +255,10 @@
if ((character >= 'a' && character <= 'z') ||
(character >= 'A' && character <= 'Z') ||
(character >= '0' && character <= '9')) {
- return true;
+ return true;
}
- const QString others(".@,;?'-_&/~*+=");
+ const QString others(".@,;?'-_&/~*+=");
for (int i = 0; i < others.size(); i++) {
if (others[i] == character) {
return true;
@@ -283,7 +283,7 @@
/*!
Returns the singleton instance.
*/
-HbInputLowerCaseFilter* HbInputLowerCaseFilter::instance()
+HbInputLowerCaseFilter *HbInputLowerCaseFilter::instance()
{
static HbInputLowerCaseFilter theInstance;
return &theInstance;
@@ -317,7 +317,7 @@
/*!
Returns the singleton instance.
*/
-HbInputUpperCaseFilter* HbInputUpperCaseFilter::instance()
+HbInputUpperCaseFilter *HbInputUpperCaseFilter::instance()
{
static HbInputUpperCaseFilter theInstance;
return &theInstance;