Query for FontFactories which implement the FontFactoryInterface on

QPEApplication creation.
Also update the comment in the API docu as now FontFactories are loaded

2 files changed, 5 insertions, 5 deletions

diff --git a/library/fontfactoryinterface.h b/library/fontfactoryinterface.h
index 68b0be5..36f430f 100644
--- a/library/fontfactoryinterface.h
+++ b/library/fontfactoryinterface.h
@@ -35,22 +35,20 @@ class QFontFactory;
 
 
 /**
  * \brief Interface for additional Font Factories
  *
  * To add special types of fonts TrueTypes or your very own
  * format. If you implement this Interface you can add
  * custom font loading.
  *
  * The dynamic shared object goes to
  * OPIEDIR/plugins/fontfactories.
  *
- * As of version Opie 1.0.2 loading of the plugins is not
- * yet implemented
  *
  */
 struct FontFactoryInterface : public QUnknownInterface
 {
     virtual QFontFactory *fontFactory() = 0;
 };
 
 #endif
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index b686e2e..f4a7f74 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -71,24 +71,25 @@
 
 #include <qpe/qlibrary.h>
 #endif
 #include "global.h"
 #include "resource.h"
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include "qutfcodec.h"
 #endif
 #include "config.h"
 #include "network.h"
 #ifdef QWS
 #include "fontmanager.h"
+#include "fontdatabase.h"
 #endif
 
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 #include "textcodecinterface.h"
 #include "imagecodecinterface.h"
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #ifndef QT_NO_SOUND
@@ -794,25 +795,24 @@ void QPEApplication::processQCopFile()
 
   For applications, \a t should be the default, GuiClient. Only
   the Qtopia server passes GuiServer.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
         : QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
     QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
 
     d = new QPEApplicationData;
     d->loadTextCodecs();
     d->loadImageCodecs();
-    int dw = desktop() ->width();
 
     setFont( QFont( d->fontFamily, d->fontSize ) );
     AppLnk::setSmallIconSize( d->smallIconSize );
     AppLnk::setBigIconSize( d->bigIconSize );
 
     QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
 
     connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
 
 
     sysChannel = new QCopChannel( "QPE/System", this );
     connect( sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
@@ -869,26 +869,28 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
             d->forceshow = TRUE;
             argc -= 1;
         }
     }
 
     /* overide stored arguments */
     setArgs( argc, argv );
 
 #endif
 #else
         initApp( argc, argv );
 #endif
-    //  qwsSetDecoration( new QPEDecoration() );
-
+#ifdef Q_WS_QWS
+    /* load the font renderer factories */
+    FontDatabase::loadRenderers();
+#endif
 #ifndef QT_NO_TRANSLATION
 
     d->langs = Global::languageList();
     for ( QStringList::ConstIterator it = d->langs.begin(); it != d->langs.end(); ++it ) {
         QString lang = *it;
 
                 installTranslation( lang + "/libopie.qm");
         installTranslation( lang + "/libqpe.qm" );
         installTranslation( lang + "/" + d->appName + ".qm" );
 
 
         //###language/font hack; should look it up somewhere