author | zecke <zecke> | 2002-10-15 21:42:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-15 21:42:20 (UTC) |
commit | 676be5604cbdb3213c00775e0ff66f4e766f8dcb (patch) (unidiff) | |
tree | 63c29adab530a60371f78880ff75e2689398e239 /library/fontdatabase.h | |
parent | b774e015816e51ac65e5d1c685306f8404a3a19e (diff) | |
download | opie-676be5604cbdb3213c00775e0ff66f4e766f8dcb.zip opie-676be5604cbdb3213c00775e0ff66f4e766f8dcb.tar.gz opie-676be5604cbdb3213c00775e0ff66f4e766f8dcb.tar.bz2 |
Actually most of them are -+ cause I opened them in xemacs..
The main goal is to
replace some header names to let them be overwritten by external once
so "qpeapplication.h" is now <qpe/qpeapplication.h>
I'll check if it's building on non Qt2/X11 systems...
-rw-r--r-- | library/fontdatabase.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/fontdatabase.h b/library/fontdatabase.h index 10aec91..991847b 100644 --- a/library/fontdatabase.h +++ b/library/fontdatabase.h | |||
@@ -23,32 +23,33 @@ | |||
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 | #undef QT_NO_FONTDATABASE | ||
39 | class FontDatabase | 40 | class FontDatabase |
40 | #ifndef QT_NO_FONTDATABASE | 41 | #ifndef QT_NO_FONTDATABASE |
41 | : public QFontDatabase | 42 | : public QFontDatabase |
42 | #endif | 43 | #endif |
43 | { | 44 | { |
44 | public: | 45 | public: |
45 | FontDatabase(); | 46 | FontDatabase(); |
46 | 47 | ||
47 | // minimal functionality | 48 | // minimal functionality |
48 | QStringList families () const; | 49 | QStringList families () const; |
49 | #ifdef QT_NO_FONTDATABASE | 50 | #ifdef QT_NO_FONTDATABASE |
50 | static QValueList<int> standardSizes (); | 51 | static QValueList<int> standardSizes (); |
51 | #endif | 52 | #endif |
52 | 53 | ||
53 | static void loadRenderers(); | 54 | static void loadRenderers(); |
54 | 55 | ||