diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/i18n/hbstringutil.cpp --- a/src/hbcore/i18n/hbstringutil.cpp Mon Apr 19 14:02:13 2010 +0300 +++ b/src/hbcore/i18n/hbstringutil.cpp Mon May 03 12:48:33 2010 +0300 @@ -83,26 +83,6 @@ */ /*! - \deprecated HbStringUtil::collationMethods() - is deprecated. - - Returns the number of collation methods supported. - On Symbian platform uses Mem::CollationMethods, - elsewhere return 0. - - \return The number of collation methods available. - */ -int HbStringUtil::collationMethods() -{ - qWarning("HbStringUtil::collationMethods is DEPRECATED. Do not use this function."); -#if defined( Q_OS_SYMBIAN ) - return Mem::CollationMethods(); -#else - return 0; -#endif -} - -/*! Searches source string's collated data for a match with collated data supplied in pattern string @@ -325,28 +305,6 @@ } /*! - \deprecated HbStringUtil::collate( const uint chr ) - is deprecated. - - Converts the character to its collated form. - Collating is the process of removing differences between characters - that are considered unimportant for the purposes of ordering characters. - The result of the conversion depends on the locale - - \param chr The charcter to be collated. - \return The converted character. - */ -uint HbStringUtil::collate( const uint chr ) -{ - qWarning("HbStringUtil::collate is DEPRECATED. Do not use this function."); -#if defined( Q_OS_SYMBIAN ) - return User::Collate( chr ); -#else - return chr; -#endif -} - -/*! Returns the starting digit range of the native digit \param ch native digit \return starting digit range