--- a/phoneapp/phoneui2/src/phoneuihousehold_p.cpp Wed Jun 23 18:12:20 2010 +0300
+++ b/phoneapp/phoneui2/src/phoneuihousehold_p.cpp Tue Jul 06 14:15:47 2010 +0300
@@ -19,7 +19,7 @@
#include <starterclient.h>
#include <telinternalpskeys.h>
#include <QLocale>
-#include <QTranslator>
+#include <HbTranslator>
#include <telremotepartyinformationpskeys.h>
#include <telinformationpskeys.h>
#include <UikonInternalPSKeys.h>
@@ -54,8 +54,7 @@
PhoneUiHouseHoldPrivate::~PhoneUiHouseHoldPrivate()
{
while (!m_translators.isEmpty()) {
- QTranslator *translator = m_translators.takeFirst();
- qApp->removeTranslator(translator);
+ HbTranslator *translator = m_translators.takeFirst();
delete translator;
translator = 0;
}
@@ -177,40 +176,24 @@
new( ELeave ) CPhoneLogger( KUidPhoneUILoggerSingleton );
FeatureManager::InitializeLibL();
- QString locale = QLocale::system ().name ();
- QTranslator *translator = new QTranslator;
- QString path = QString("z:\\resource\\qt\\translations\\");
+ HbTranslator *translator = new HbTranslator(QString("telephone"));
- bool translatorLoaded = translator->load(QString(path + "telephone_" + locale));
- PHONE_DEBUG2("PhoneUiHouseHoldPrivate::ConstructL() translator.load:", translatorLoaded);
- if (translatorLoaded) {
- qApp->installTranslator(translator);
+ if (translator) {
+ translator->loadCommon();
m_translators.append(translator);
- }else {
- delete translator;
- translator = 0;
- }
+ } else {
+ delete translator;
+ translator = 0;
+}
- QTranslator *translator2 = new QTranslator;
- translatorLoaded = translator2->load(path + "telephone_cp_" + locale);
- if (translatorLoaded) {
- qApp->installTranslator(translator2);
+ HbTranslator *translator2 = new HbTranslator(QString("telephone_cp"));
+ if (translator2) {
m_translators.append(translator2);
} else {
delete translator2;
translator2 = 0;
}
- QTranslator *translator3 = new QTranslator;
- translatorLoaded = translator3->load(path + "common_" + locale);
- if (translatorLoaded) {
- qApp->installTranslator(translator3);
- m_translators.append(translator3);
- } else {
- delete translator3;
- translator3 = 0;
- }
-
PhoneUIQtView *view = new PhoneUIQtView(m_window);
iViewAdapter = new PhoneUIQtViewAdapter(*view);
iPhoneUIController = CPhoneUIController::NewL(iViewAdapter);