1 files changed, 41 insertions, 35 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 187a7e2..8448352 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -488,5 +488,5 @@ static void setScreenSaverInterval( int interval )
   \brief The QPEApplication class implements various system services
     that are available to all Qtopia applications.
- 
+
   Simply by using QPEApplication instead of QApplication, a plain Qt
   application becomes a Qtopia application. It automatically follows
@@ -498,5 +498,5 @@ static void setScreenSaverInterval( int interval )
 /*!
   \fn void QPEApplication::clientMoused()
- 
+
   \internal
 */
@@ -504,5 +504,5 @@ static void setScreenSaverInterval( int interval )
 /*!
   \fn void QPEApplication::timeChanged();
- 
+
   This signal is emitted when the time jumps forward or backwards
   by more than the normal passage of time.
@@ -511,5 +511,5 @@ static void setScreenSaverInterval( int interval )
 /*!
   \fn void QPEApplication::clockChanged( bool ampm );
- 
+
   This signal is emitted when the user changes the style
   of clock. If \a ampm is TRUE, the user wants a 12-hour
@@ -519,11 +519,11 @@ static void setScreenSaverInterval( int interval )
 /*!
   \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
- 
+
   This signal is emitted when a message is received on the
   QPE/Application/<i>appname</i> QCop channel for this application.
- 
+
   The slot to which you connect this signal uses \a msg and \a data
   in the following way:
- 
+
 \code
     void MyWidget::receive( const QCString& msg, const QByteArray& data )
@@ -539,5 +539,5 @@ static void setScreenSaverInterval( int interval )
     }
 \endcode
- 
+
   \sa qcop.html
 */
@@ -644,11 +644,17 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
                         delete trans;
 
-                //###language/font hack; should look it up somewhere
-                if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
-                        QFont fn = FontManager::unicodeFont( FontManager::Proportional );
-                        setFont( fn );
-                }
-                else {
-                        Config config( "qpe" );
+                /*
+                 * not required. if using one of these languages, you might as well install
+                 * a custom font.
+
+                 //###language/font hack; should look it up somewhere
+                 if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
+                 QFont fn = FontManager::unicodeFont( FontManager::Proportional );
+                 setFont( fn );
+                 }
+
+                 else {
+                */
+                    Config config( "qpe" );
                         config.setGroup( "Appearance" );
                         QString familyStr = config.readEntry( "FontFamily", "helvetica" );
@@ -661,5 +667,5 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
                         QFont selectedFont = fdb.font( familyStr, styleStr, i_size, charSetStr );
                         setFont( selectedFont );
-                }
+                        //}
         }
 
@@ -694,5 +700,5 @@ static void createInputMethodDict()
   Returns the currently set hint to the system as to whether
   \a w has any use for text input methods.
- 
+
   \sa setInputMethodHint()
 */
@@ -706,5 +712,5 @@ QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
 /*!
     \enum QPEApplication::InputMethodHint
- 
+
     \value Normal the application sometimes needs text input (the default).
     \value AlwaysOff the application never needs text input.
@@ -715,5 +721,5 @@ QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
   Hints to the system that \a w has use for text input methods
   as specified by \a mode.
- 
+
   \sa inputMethodHint()
 */
@@ -1270,7 +1276,7 @@ static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appNa
             // for the main widget. This saves duplicating translations for
             // the app name in the program and in the .desktop files.
-         
+
             AppLnkSet apps( appsPath );
-         
+
             QList<AppLnk> appsList = apps.children();
             for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
@@ -1280,5 +1286,5 @@ static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appNa
           }
             }
-        */ 
+        */
         return FALSE;
 }
@@ -1288,5 +1294,5 @@ static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appNa
   Sets \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
- 
+
   \sa showMainDocumentWidget()
 */
@@ -1323,10 +1329,10 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
   Sets \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
- 
+
   This calls designates the application as
   a \link docwidget.html document-oriented\endlink application.
- 
+
   The \a mw widget must have a slot: setDocument(const QString&).
- 
+
   \sa showMainWidget()
 */
@@ -1369,5 +1375,5 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
   processing the qcop message it calls this function, then the application
   will show and start proper once it has finished processing qcop messages.
- 
+
   \sa keepRunning()
 */
@@ -1382,6 +1388,6 @@ void QPEApplication::setKeepRunning()
 /*!
   Returns whether the application will quit after processing the current
-  list of qcop messages.  
- 
+  list of qcop messages.
+
   \sa setKeepRunning()
 */
@@ -1465,5 +1471,5 @@ void QPEApplication::internalSetStyle( const QString &style )
                                 iface-> release ( );
                         delete lib;
-                        
+
                         setStyle ( new QPEStyle ( ));
                 }
@@ -1565,5 +1571,5 @@ static void createDict()
 /*!
   Returns the current StylusMode for \a w.
- 
+
   \sa setStylusOperation()
 */
@@ -1577,10 +1583,10 @@ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget * w )
 /*!
     \enum QPEApplication::StylusMode
- 
+
     \value LeftOnly the stylus only generates LeftButton
       events (the default).
     \value RightOnHold the stylus generates RightButton events
       if the user uses the press-and-hold gesture.
- 
+
     See setStylusOperation().
 */
@@ -1588,5 +1594,5 @@ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget * w )
 /*!
   Causes \a w to receive mouse events according to \a mode.
- 
+
   \sa stylusOperation()
 */
@@ -1721,5 +1727,5 @@ void QPEApplication::ungrabKeyboard()
   keys no longer work, and instead they are receivable by this
   application.
- 
+
   \sa ungrabKeyboard()
 */