FCL/sf/mw/hb: comparison src/hbcore/i18n/hbstringutil.cpp

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 #ifndef QT_NO_REGEXP
 #include <QRegExp>
 #endif
 /*!
-@beta
+@stable
 @hbcore
 \class HbStringUtil
 \brief The HbStringUtil class can be used to execute operations on strings,
 such as comparisons and finding data sequences.
-\ingroup i18n
-\warning This class is only useful in Symbian platforms since it uses Symbian
-methods in order to implement different functionalities.
 \sa HbStringUtil
 */
 /*!
 \enum HbStringUtil::Option
 */
 /*!
 Searches source string's collated data for a
 match with collated data supplied in pattern string
+\attention Cross-Platform API
 \param strFrom Source string.
 \param strToMatch Pattern string.
 \param maxLevel Determines the tightness of the collation.
 Level 0 - Character identity;
 Level 3 - Character identity, accents, case and Unicode value;
 \param flags The flags that will be used. Default value is Default.
 \param wildChar Wild card character.
 \param wildSequenceChar Wild card sequence character.
 \param escapeChar The escape character, for example,  '?', '*'.
 \return If a match is found the offset within source string's
 data where the match first occurs. -1 if match is not found.
-Example
+Example:
 \snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,3}
 */
 int HbStringUtil::matchC( const QString &strFrom, const QString &strToMatch,
 int maxLevel, Options flags,
 int wildChar, int wildSequenceChar, int escapeChar )
 /*!
 Compares source string's data with the other string's
 data using the specified collation method.
+\attention Cross-Platform API
 \param string1 Source string.
 \param string2 String whose data is to be compared with the source string.
 \param maxLevel Maximum level to use for comparing.
 Level 0 - Character identity;
 Level 1 - Character identity and accents;
 Level 2 - Character identity, accents and case;
 Level 3 - Character identity, accents, case and Unicode value;
 \param flags The flags that will be used. Default value is Default.
 \return Positive if source string is greater, negative if it is less and
 zero	if the content of both strings match.
-Example
+Example:
 \snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,1}
 */
 int HbStringUtil::compareC( const QString &string1, const QString &string2,
 int maxLevel, Options flags )
 {
 return string1.localeAwareCompare( string2 );
 #endif
 }
 /*!
-Searches for the first occurence of the specified collated
+Searches for the first occurrence of the specified collated
 data sequence in the aStrFrom to the specified maximum
 collation level.
+\attention Cross-Platform API
 \param strFrom Source string.
 \param strToFind String whose data is to be compared with the source string.
 \param maxLevel The maximum collation level.
 Level 0 - Character identity;
 Level 1 - Character identity and accents;
 Level 2 - Character identity, accents and case;
 Level 3 - Character identity, accents, case and Unicode value;
 \return Offset of the data sequence from the beginning of the
 aStrFrom. -1 if the data sequence cannot be found.
-Example
+Example:
 \snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,5}
 */
 int HbStringUtil::findC( const QString &strFrom,
 const QString &strToFind,
 int           maxLevel )
 /*!
 Searches source string's folded data for a
 match with folded data supplied in pattern string
+\attention Cross-Platform API
 \param strFrom Source string.
 \param strToMatch Pattern string.
 \return If a match is found the offset within source string's
 data where the match first occurs. -1 if match is not found.
-Example
+Example:
 \snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,4}
 */
 int HbStringUtil::matchF( const QString &strFrom,
 const QString &strToMatch )
 {
 #endif
 }
 /*!
-Searches for the first occurence of the specified folded
+Searches for the first occurrence of the specified folded
 data sequence in the strFrom.
+\attention Cross-Platform API
 \param strFrom Source string.
 \param strToFind String whose data is to be compared with the source string.
 \return Offset of the data sequence from the beginning of the
 strFrom. -1 if the data sequence cannot be found. Zero,
 if the length of search data sequence is zero.
-Example
+Example:
 \snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,6}
 */
 int HbStringUtil::findF( const QString &strFrom,
 const QString &strToFind )
 {
 /*!
 Compares source string's folded data with the other string's
 folded data.
+\attention Cross-Platform API
 \param string1 Source string.
 \param string2 String whose data is to be compared with the source string.
 \return Positive if source string is greater, negative if it is less and
 zero if the content of both strings match.
-Example
+Example:
 \snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,2}
 */
 int HbStringUtil::compareF( const QString &string1,
 const QString &string2 )
 {
 \param ch native digit
 \return starting digit range
 */
 static QChar nativeDigitBase(QChar ch)
 {
-	DigitType d[] = { WesternDigit, ArabicIndicDigit, EasternArabicIndicDigit, DevanagariDigit, ThaiDigit };
+DigitType d[] = { WesternDigit, ArabicIndicDigit, EasternArabicIndicDigit, DevanagariDigit, ThaiDigit };
 int i = 0;
 int num = sizeof(d)/sizeof(d[0]);
 while(i<num) {
 if (ch>QChar(d[i]) && ch<QChar(d[i]+10)) { return d[i]; }
 i++;
 return ch;
 }
 /*!
 Converts digits to native digits based on current UI language.
+\attention Cross-Platform API
 \param str digits to be converted.
 */
 QString HbStringUtil::convertDigits( const QString str )
 {
 	HbExtendedLocale locale = HbExtendedLocale::system();
 	DigitType digitType = WesternDigit;
 	if (locale.language() == HbExtendedLocale::Arabic) {
 		digitType = ArabicIndicDigit;
-	}
+	} else if (locale.language() == HbExtendedLocale::Persian || locale.language() == HbExtendedLocale::Urdu) {
-	if (locale.language() == HbExtendedLocale::Persian) {
-		digitType = EasternArabicIndicDigit;
-	}
-	if (locale.language() == HbExtendedLocale::Urdu) {
 		digitType = EasternArabicIndicDigit;
 	}
 	QString converted = HbStringUtil::convertDigitsTo(str, digitType);
 	return converted;
 }
 /*!
 Converts the digit from Latin to native or native to latin or native to native
+\attention Cross-Platform API
 \param str digits to be converted.
 \param digitType type of the digit to be converted to
 */
 QString HbStringUtil::convertDigitsTo( const QString str, const DigitType digitType )
 {
 QString convDigit;
-	int length = str.length();
+int length = str.length();
 for(int i=0; i<length; i++)
 {
 ushort digit = str[i].unicode();
 ushort digitBase = nativeDigitBase(str[i]).unicode();
 ushort convertedDigit = 0;
 }
 /*!
 Sorts QStrings into alphabetically order (overwrites the strList's original content)
+\attention Cross-Platform API
 \param strList List of QStrings which need to be sorted.
-Example
+Example:
 \snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,7}
 */
 void HbStringUtil::sort( QStringList &strList )
 {
 	if ( strList.size() > 1 ) {

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 7	923ff622b8b9
child 23	e6ad4ef83b23
child 34	ed14f46c0e55