author | zecke <zecke> | 2004-07-12 20:01:26 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-12 20:01:26 (UTC) |
commit | 5d2ec2e9b1dce49e914c260fe16a82ddccbaa92d (patch) (unidiff) | |
tree | cbac9fa8c94900e3486c3251206bdc22028b4a66 /library | |
parent | e18cb7bddb3461a40ae1e8810ef408ceef101d38 (diff) | |
download | opie-5d2ec2e9b1dce49e914c260fe16a82ddccbaa92d.zip opie-5d2ec2e9b1dce49e914c260fe16a82ddccbaa92d.tar.gz opie-5d2ec2e9b1dce49e914c260fe16a82ddccbaa92d.tar.bz2 |
Query for FontFactories which implement the FontFactoryInterface on
QPEApplication creation.
Also update the comment in the API docu as now FontFactories are loaded
-rw-r--r-- | library/fontfactoryinterface.h | 2 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 8 |
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 | |||
@@ -44,8 +44,6 @@ class QFontFactory; | |||
44 | * The dynamic shared object goes to | 44 | * The dynamic shared object goes to |
45 | * OPIEDIR/plugins/fontfactories. | 45 | * OPIEDIR/plugins/fontfactories. |
46 | * | 46 | * |
47 | * As of version Opie 1.0.2 loading of the plugins is not | ||
48 | * yet implemented | ||
49 | * | 47 | * |
50 | */ | 48 | */ |
51 | struct FontFactoryInterface : public QUnknownInterface | 49 | struct FontFactoryInterface : public QUnknownInterface |
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index b686e2e..f4a7f74 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -80,6 +80,7 @@ | |||
80 | #include "network.h" | 80 | #include "network.h" |
81 | #ifdef QWS | 81 | #ifdef QWS |
82 | #include "fontmanager.h" | 82 | #include "fontmanager.h" |
83 | #include "fontdatabase.h" | ||
83 | #endif | 84 | #endif |
84 | 85 | ||
85 | #include "alarmserver.h" | 86 | #include "alarmserver.h" |
@@ -803,7 +804,6 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
803 | d = new QPEApplicationData; | 804 | d = new QPEApplicationData; |
804 | d->loadTextCodecs(); | 805 | d->loadTextCodecs(); |
805 | d->loadImageCodecs(); | 806 | d->loadImageCodecs(); |
806 | int dw = desktop() ->width(); | ||
807 | 807 | ||
808 | setFont( QFont( d->fontFamily, d->fontSize ) ); | 808 | setFont( QFont( d->fontFamily, d->fontSize ) ); |
809 | AppLnk::setSmallIconSize( d->smallIconSize ); | 809 | AppLnk::setSmallIconSize( d->smallIconSize ); |
@@ -878,8 +878,10 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
878 | #else | 878 | #else |
879 | initApp( argc, argv ); | 879 | initApp( argc, argv ); |
880 | #endif | 880 | #endif |
881 | // qwsSetDecoration( new QPEDecoration() ); | 881 | #ifdef Q_WS_QWS |
882 | 882 | /* load the font renderer factories */ | |
883 | FontDatabase::loadRenderers(); | ||
884 | #endif | ||
883 | #ifndef QT_NO_TRANSLATION | 885 | #ifndef QT_NO_TRANSLATION |
884 | 886 | ||
885 | d->langs = Global::languageList(); | 887 | d->langs = Global::languageList(); |