author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/fontdatabase.cpp | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/fontdatabase.cpp | 39 |
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,8 +1,8 @@ /********************************************************************** -** 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 ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the @@ -23,9 +23,11 @@ #include "fontdatabase.h" #include <qpe/qlibrary.h> +#ifdef QWS #include <qfontmanager_qws.h> +#endif #include <qdir.h> #include <qdict.h> #include <stdio.h> #include <stdlib.h> @@ -57,26 +59,24 @@ QValueList<FontFactory> *FontDatabase::factoryList = 0; /*! \class FontDatabase fontdatabase.h \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() #ifndef QT_NO_FONTDATABASE : QFontDatabase() @@ -86,9 +86,9 @@ FontDatabase::FontDatabase() loadRenderers(); } /*! - 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 { #ifndef QT_NO_FONTDATABASE @@ -140,10 +140,10 @@ QValueList<int> FontDatabase::standardSizes() #endif /*! - 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() { #ifndef QT_NO_COMPONENT @@ -187,9 +187,8 @@ void FontDatabase::loadRenderers() \internal */ void FontDatabase::readFonts( QFontFactory *factory ) { - // Load in font definition file QString fn = fontDir() + "fontdir"; FILE* fontdef=fopen(fn.local8Bit(),"r"); if(!fontdef) { @@ -219,13 +218,11 @@ void FontDatabase::readFonts( QFontFactory *factory ) if( factory->name() == render ) { QDiskFont * qdf=new QDiskFont(factory,name,isitalic[0]=='y', weight,size,flags,filename); qt_fontmanager->diskfonts.append(qdf); -#ifndef QT_NO_FONTDATABASE #if QT_VERSION >= 232 QFontDatabase::qwsAddDiskFont( qdf ); #endif -#endif } } } fgets(buf,200,fontdef); |