author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/fontdatabase.h | |
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/fontdatabase.h b/library/fontdatabase.h index 9160ab0..10aec91 100644 --- a/library/fontdatabase.h +++ b/library/fontdatabase.h | |||
@@ -1,52 +1,52 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef FONTFACTORY_H | 20 | #ifndef FONTFACTORY_H |
21 | #define FONTFACTORY_H | 21 | #define FONTFACTORY_H |
22 | 22 | ||
23 | #include <qpe/fontfactoryinterface.h> | 23 | #include <qpe/fontfactoryinterface.h> |
24 | 24 | ||
25 | #include <qfontdatabase.h> | 25 | #include <qfontdatabase.h> |
26 | #include <qvaluelist.h> | 26 | #include <qvaluelist.h> |
27 | 27 | ||
28 | class QLibrary; | 28 | class QLibrary; |
29 | 29 | ||
30 | struct FontFactory | 30 | struct FontFactory |
31 | { | 31 | { |
32 | #ifndef QT_NO_COMPONENT | 32 | #ifndef QT_NO_COMPONENT |
33 | QLibrary *library; | 33 | QLibrary *library; |
34 | #endif | 34 | #endif |
35 | FontFactoryInterface *interface; | 35 | FontFactoryInterface *interface; |
36 | QFontFactory *factory; | 36 | QFontFactory *factory; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | class FontDatabase | 39 | class FontDatabase |
40 | #ifndef QT_NO_FONTDATABASE | 40 | #ifndef QT_NO_FONTDATABASE |
41 | : public QFontDatabase | 41 | : public QFontDatabase |
42 | #endif | 42 | #endif |
43 | { | 43 | { |
44 | public: | 44 | public: |
45 | FontDatabase(); | 45 | FontDatabase(); |
46 | 46 | ||
47 | // minimal functionality | 47 | // minimal functionality |
48 | QStringList families () const; | 48 | QStringList families () const; |
49 | #ifdef QT_NO_FONTDATABASE | 49 | #ifdef QT_NO_FONTDATABASE |
50 | static QValueList<int> standardSizes (); | 50 | static QValueList<int> standardSizes (); |
51 | #endif | 51 | #endif |
52 | 52 | ||