summaryrefslogtreecommitdiff
path: root/library/fontdatabase.cpp
Side-by-side diff
Diffstat (limited to 'library/fontdatabase.cpp') (more/less context) (show whitespace changes)
-rw-r--r--library/fontdatabase.cpp39
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,6 +1,6 @@
/**********************************************************************
-** 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.
**
** This file may be distributed and/or modified under the terms of the
@@ -25,5 +25,7 @@
#include <qpe/qlibrary.h>
+#ifdef QWS
#include <qfontmanager_qws.h>
+#endif
#include <qdir.h>
#include <qdict.h>
@@ -59,22 +61,20 @@ QValueList<FontFactory> *FontDatabase::factoryList = 0;
\brief The FontDatabase class provides information about available fonts.
- 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
*/
/*!
- Constructs the FontDatabase class.
+ Constructs a FontDatabase object.
*/
FontDatabase::FontDatabase()
@@ -88,5 +88,5 @@ FontDatabase::FontDatabase()
/*!
- Returns a list of names of all available font families.
+ Returns a list of names of all the available font families.
*/
QStringList FontDatabase::families() const
@@ -142,6 +142,6 @@ 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.
*/
void FontDatabase::loadRenderers()
@@ -189,5 +189,4 @@ void FontDatabase::loadRenderers()
void FontDatabase::readFonts( QFontFactory *factory )
{
-
// Load in font definition file
QString fn = fontDir() + "fontdir";
@@ -221,9 +220,7 @@ void FontDatabase::readFonts( QFontFactory *factory )
weight,size,flags,filename);
qt_fontmanager->diskfonts.append(qdf);
-#ifndef QT_NO_FONTDATABASE
#if QT_VERSION >= 232
QFontDatabase::qwsAddDiskFont( qdf );
#endif
-#endif
}
}