--- a/src/hbcore/inputfw/hbinputlanguagedatabase.h	Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputlanguagedatabase.h	Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
 #define HB_LANGUAGE_DATABASE_H
 
 #include <QObject>
-#include <QVector>
+#include <QList>
 
 #include <hbinputdef.h>
 
@@ -37,10 +37,10 @@
     {
     }
 
-    virtual int HostId() const=0;
-    virtual int LanguageCode() const=0;
-    virtual char* LanguageData(void* aNativeParams=0) const=0;
-    virtual int NativeId() const=0;
+    virtual int hostId() const = 0;
+    virtual int languageCode() const = 0;
+    virtual char* languageData(void* aNativeParams = 0) const = 0;
+    virtual int nativeId() const = 0;
 };
 
 class HB_CORE_EXPORT HbLanguageDatabaseInterface : public QObject
@@ -51,40 +51,10 @@
     virtual ~HbLanguageDatabaseInterface()
     {
     }
-    virtual void ListLanguages(QVector<int>& aResult) = 0;
-    virtual HbLanguageDatabase* LanguageDatabase(int aLanguage) = 0;
+    virtual QList<int> listLanguages() = 0;
+    virtual HbLanguageDatabase* languageDatabase(int aLanguage) = 0;
 };
 
-/*!
-\deprecated HbLanguageDatabase::HostId() const
-    is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabase::LanguageCode() const
-    is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabase::LanguageData(void*) const
-    is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabase::NativeId() const
-    is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabaseInterface::ListLanguages(QVector<int>&)
-    is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabaseInterface::LanguageDatabase(int)
-    is deprecated. Use upcoming lower case version instead.
-*/
-
 #endif // HB_LANGUAGE_DATABASE_H
 
 // End of file