Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

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,10 +1,10 @@
 /**********************************************************************
-** 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
 ** packaging of this file.
 **
@@ -21,13 +21,15 @@
 #include "qpeapplication.h"
 #include "fontfactoryinterface.h"
 #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>
 
 static QString fontDir()
@@ -55,42 +57,40 @@ static QString fontFamily( const QString& key )
 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()
 #endif
 {
     if ( !factoryList )
 	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
     return QFontDatabase::families();
 #else
@@ -138,14 +138,14 @@ QValueList<int> FontDatabase::standardSizes()
     return sList;
 }
 
 #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
     if ( !factoryList )
 	factoryList = new QValueList<FontFactory>;
@@ -185,13 +185,12 @@ 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) {
 	QCString temp=fn.local8Bit();
 	qWarning("Cannot find font definition file %s - is $QTDIR set correctly?",
@@ -217,17 +216,15 @@ void FontDatabase::readFonts( QFontFactory *factory )
 	    filename += file;
 	    if ( QFile::exists(filename) ) {
 		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);
     }
     fclose(fontdef);