-rw-r--r-- | library/fontdatabase.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index 2b5e0d2..147134c 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp | |||
@@ -11,35 +11,33 @@ | |||
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 <qpe/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 | ||
28 | #include <qfontmanager_qws.h> | 27 | #include <qfontmanager_qws.h> |
29 | #endif | ||
30 | #include <qdir.h> | 28 | #include <qdir.h> |
31 | #include <qdict.h> | 29 | #include <qdict.h> |
32 | #include <stdio.h> | 30 | #include <stdio.h> |
33 | #include <stdlib.h> | 31 | #include <stdlib.h> |
34 | 32 | ||
35 | static QString fontDir() | 33 | static QString fontDir() |
36 | { | 34 | { |
37 | QString qtdir = getenv("QTDIR"); | 35 | QString qtdir = getenv("QTDIR"); |
38 | if ( qtdir.isEmpty() ) qtdir = "/usr/local/qt-embedded"; | 36 | if ( qtdir.isEmpty() ) qtdir = "/usr/local/qt-embedded"; |
39 | return qtdir+"/lib/fonts/"; | 37 | return qtdir+"/lib/fonts/"; |
40 | } | 38 | } |
41 | 39 | ||
42 | #ifdef QT_NO_FONTDATABASE | 40 | #ifdef QT_NO_FONTDATABASE |
43 | static QString fontFamily( const QString& key ) | 41 | static QString fontFamily( const QString& key ) |
44 | { | 42 | { |
45 | int u0 = key.find('_'); | 43 | int u0 = key.find('_'); |