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.cpp | |
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.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index c64e645..2b5e0d2 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp | |||
@@ -1,45 +1,45 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the 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 | 20 | ||
21 | #include "qpeapplication.h" | 21 | #include <qpe/qpeapplication.h> |
22 | #include "fontfactoryinterface.h" | 22 | #include "fontfactoryinterface.h" |
23 | #include "fontdatabase.h" | 23 | #include "fontdatabase.h" |
24 | 24 | ||
25 | #include <qpe/qlibrary.h> | 25 | #include <qpe/qlibrary.h> |
26 | 26 | ||
27 | #ifdef QWS | 27 | #ifdef QWS |
28 | #include <qfontmanager_qws.h> | 28 | #include <qfontmanager_qws.h> |
29 | #endif | 29 | #endif |
30 | #include <qdir.h> | 30 | #include <qdir.h> |
31 | #include <qdict.h> | 31 | #include <qdict.h> |
32 | #include <stdio.h> | 32 | #include <stdio.h> |
33 | #include <stdlib.h> | 33 | #include <stdlib.h> |
34 | 34 | ||
35 | static QString fontDir() | 35 | static QString fontDir() |
36 | { | 36 | { |
37 | QString qtdir = getenv("QTDIR"); | 37 | QString qtdir = getenv("QTDIR"); |
38 | if ( qtdir.isEmpty() ) qtdir = "/usr/local/qt-embedded"; | 38 | if ( qtdir.isEmpty() ) qtdir = "/usr/local/qt-embedded"; |
39 | return qtdir+"/lib/fonts/"; | 39 | return qtdir+"/lib/fonts/"; |
40 | } | 40 | } |
41 | 41 | ||
42 | #ifdef QT_NO_FONTDATABASE | 42 | #ifdef QT_NO_FONTDATABASE |
43 | static QString fontFamily( const QString& key ) | 43 | static QString fontFamily( const QString& key ) |
44 | { | 44 | { |
45 | int u0 = key.find('_'); | 45 | int u0 = key.find('_'); |