1 files changed, 18 insertions, 21 deletions

diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index 50dcf3d..c64e645 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -26,3 +26,5 @@
 
+#ifdef QWS
 #include <qfontmanager_qws.h>
+#endif
 #include <qdir.h>
@@ -60,16 +62,14 @@ QValueList<FontFactory> *FontDatabase::factoryList = 0;
 
-  Provides information about available fonts. 
-
-  FontDatabase provides information about the available fonts of the
-  underlying window system. 
+  Most often you will simply want to query the database for the
+  available font families().
 
-  Most often you will simply want to query the database for all font
-  families(), and their respective pointSizes(), styles() and charSets().
+  Use FontDatabase rather than QFontDatabase when you may need access
+  to fonts that are not normally available. For example, if the
+  freetype library and the Qtopia freetype plugin are installed,
+  TrueType fonts will be available to your application. Font renderer
+  plugins have greater resource requirements than system fonts so they
+  should be used only when necessary. You can force the loading of
+  font renderer plugins with loadRenderers().
 
-  Use FontDatabase rather than QFontDatabase when you may need access to
-  fonts not normally available.  For example, if the freetype library and
-  Qtopia freetype plugin are installed TrueType fonts will be available
-  to your application.  Font renderer plugins have greater resource
-  requirements than the system fonts so they should be used only when
-  necessary.
+  \ingroup qtopiaemb
 */
@@ -77,3 +77,3 @@ QValueList<FontFactory> *FontDatabase::factoryList = 0;
 /*!
-  Constructs the FontDatabase class.
+  Constructs a FontDatabase object.
 */
@@ -89,3 +89,3 @@ FontDatabase::FontDatabase()
 /*!
-  Returns a list of names of all available font families.
+  Returns a list of names of all the available font families.
 */
@@ -143,4 +143,4 @@ QValueList<int> FontDatabase::standardSizes()
 /*!
-  Load any font renderer plugins that are available and make fonts that
-  the plugins can read available.
+  Load any font renderer plugins that are available and make the fonts
+  that the plugins can read available.
 */
@@ -190,3 +190,2 @@ void FontDatabase::readFonts( QFontFactory *factory )
 {
-
     // Load in font definition file
@@ -222,3 +221,2 @@ void FontDatabase::readFonts( QFontFactory *factory )
                     qt_fontmanager->diskfonts.append(qdf);
-#ifndef QT_NO_FONTDATABASE
 #if QT_VERSION >= 232
@@ -226,3 +224,2 @@ void FontDatabase::readFonts( QFontFactory *factory )
 #endif
-#endif
                 }