Hospital Hacking Session

Install libopie.qm make apps fully translatable...
refactor installing trans into a method instead of having the same code copy
and pasted three times

2 files changed, 18 insertions, 15 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index e5da48c..f4db1ab 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -594,40 +594,28 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 	setArgs( argc, argv );
 
 #endif
 
 	//  qwsSetDecoration( new QPEDecoration() );
 
 #ifndef QT_NO_TRANSLATION
 
 	QStringList langs = Global::languageList();
 	for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) {
 		QString lang = *it;
 
-		QTranslator * trans;
-		QString tfn;
+                installTranslation( lang + "/libopie.qm");
+		installTranslation( lang + "/libqpe.qm" );
+		installTranslation( lang + "/" + d->appName + ".qm" );
 
-		trans = new QTranslator( this );
-		tfn = qpeDir() + "/i18n/" + lang + "/libqpe.qm";
-		if ( trans->load( tfn ) )
-			installTranslator( trans );
-		else
-			delete trans;
-
-		trans = new QTranslator( this );
-		tfn = qpeDir() + "/i18n/" + lang + "/" + d->appName + ".qm";
-		if ( trans->load( tfn ) )
-			installTranslator( trans );
-		else
-			delete trans;
 
 		//###language/font hack; should look it up somewhere
 #ifdef QWS
 
 		if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
 			QFont fn = FontManager::unicodeFont( FontManager::Proportional );
 			setFont( fn );
 		}
 #endif
 
 	}
 #endif
@@ -1718,24 +1706,36 @@ void QPEApplication::tryQuit()
 	{
 		QCopEnvelope e( "QPE/System", "closing(QString)" );
 		e << d->appName;
 	}
 #endif
 	processEvents();
 
 	quit();
 }
 
 /*!
   \internal
+*/
+void QPEApplication::installTranslation( const QString& baseName ) {
+    QTranslator* trans = new QTranslator(this);
+    QString tfn = qpeDir() + "/i18n/"+baseName;
+    if ( trans->load( tfn ) )
+        installTranslator( trans );
+    else
+        delete trans;
+}
+
+/*!
+  \internal
   User initiated quit.  Makes the window 'Go Away'.  If preloaded this means
   hiding the window.  If not it means quitting the application.
   As this is user initiated we don't need to check state.
 */
 void QPEApplication::hideOrQuit()
 {
 	processEvents();
 
 	// If we are a preloaded application we don't actually quit, so emit
 	// a System message indicating we're quasi-closing.
 	if ( d->preloaded && d->qpe_main_widget )
 #ifndef QT_NO_COP
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 0bad8b7..e35c008 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -113,24 +113,27 @@ protected:
     void internalSetStyle( const QString &style );
     void prepareForTermination(bool willrestart);
     virtual void restart();
     virtual void shutdown();
     bool eventFilter( QObject *, QEvent * );
     void timerEvent( QTimerEvent * );
     bool raiseAppropriateWindow();
     virtual void tryQuit();
 
     virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!)
 
 private:
+#ifndef QT_NO_TRANSLATION
+    void installTranslation( const QString& baseName );
+#endif
     void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel *sysChannel;
     QCopChannel *pidChannel;
 #endif
     QPEApplicationData *d;
 
     bool reserved_sh;