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 | |
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/alarmserver.cpp | 4 | ||||
-rw-r--r-- | library/backend/vcc.y | 2 | ||||
-rw-r--r-- | library/backend/vcc_yacc.cpp | 2 | ||||
-rw-r--r-- | library/backend/vobject.cpp | 4 | ||||
-rw-r--r-- | library/datebookmonth.cpp | 2 | ||||
-rw-r--r-- | library/fileselector.cpp | 6 | ||||
-rw-r--r-- | library/fontdatabase.cpp | 2 | ||||
-rw-r--r-- | library/fontdatabase.h | 1 | ||||
-rw-r--r-- | library/mimetype.cpp | 2 | ||||
-rw-r--r-- | library/qpedialog.cpp | 2 | ||||
-rw-r--r-- | library/qpestyle.cpp | 2 | ||||
-rw-r--r-- | library/resource.cpp | 2 | ||||
-rw-r--r-- | library/timestring.cpp | 2 |
13 files changed, 17 insertions, 16 deletions
diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp index 1ee05c6..177a0cb 100644 --- a/library/alarmserver.cpp +++ b/library/alarmserver.cpp | |||
@@ -25,10 +25,10 @@ | |||
25 | 25 | ||
26 | 26 | ||
27 | #include "qpeapplication.h" | 27 | #include <qpe/qpeapplication.h> |
28 | #include "global.h" | 28 | #include "global.h" |
29 | #include "resource.h" | 29 | #include "resource.h" |
30 | 30 | ||
31 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 31 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
32 | #include "qcopenvelope_qws.h" | 32 | #include <qpe/qcopenvelope_qws.h> |
33 | #endif | 33 | #endif |
34 | #include "alarmserver.h" | 34 | #include "alarmserver.h" |
diff --git a/library/backend/vcc.y b/library/backend/vcc.y index 5bcf0cb..6781312 100644 --- a/library/backend/vcc.y +++ b/library/backend/vcc.y | |||
@@ -123,5 +123,5 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. | |||
123 | //#include <qpe/vobject_p.h> | 123 | //#include <qpe/vobject_p.h> |
124 | //#else | 124 | //#else |
125 | #include "vobject_p.h" | 125 | #include <qtopia/private/vobject_p.h> |
126 | //#endif | 126 | //#endif |
127 | 127 | ||
diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp index 19a108f..b2b0c14 100644 --- a/library/backend/vcc_yacc.cpp +++ b/library/backend/vcc_yacc.cpp | |||
@@ -159,5 +159,5 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. | |||
159 | /*#include <qpe/vobject_p.h> */ | 159 | /*#include <qpe/vobject_p.h> */ |
160 | /*#else */ | 160 | /*#else */ |
161 | #include "vobject_p.h" | 161 | #include <qtopia/private/vobject_p.h> |
162 | /*#endif */ | 162 | /*#endif */ |
163 | 163 | ||
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp index e6f6b78..dab128e 100644 --- a/library/backend/vobject.cpp +++ b/library/backend/vobject.cpp | |||
@@ -47,6 +47,6 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. | |||
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #include "vobject_p.h" | 49 | #include <qtopia/private/vobject_p.h> |
50 | #include "qfiledirect_p.h" | 50 | #include <qtopia/private/qfiledirect_p.h> |
51 | #include <string.h> | 51 | #include <string.h> |
52 | #include <stdio.h> | 52 | #include <stdio.h> |
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp index 272c223..4a9dcbd 100644 --- a/library/datebookmonth.cpp +++ b/library/datebookmonth.cpp | |||
@@ -23,5 +23,5 @@ | |||
23 | #include <qtopia/private/event.h> | 23 | #include <qtopia/private/event.h> |
24 | #include "resource.h" | 24 | #include "resource.h" |
25 | #include "qpeapplication.h" | 25 | #include <qpe/qpeapplication.h> |
26 | #include "timestring.h" | 26 | #include "timestring.h" |
27 | 27 | ||
diff --git a/library/fileselector.cpp b/library/fileselector.cpp index 7ff09b4..052a29e 100644 --- a/library/fileselector.cpp +++ b/library/fileselector.cpp | |||
@@ -32,13 +32,13 @@ | |||
32 | #include "qpemenubar.h" | 32 | #include "qpemenubar.h" |
33 | #ifdef QWS | 33 | #ifdef QWS |
34 | #include "qcopchannel_qws.h" | 34 | #include <qcopchannel_qws.h> |
35 | #endif | 35 | #endif |
36 | #include "lnkproperties.h" | 36 | #include "lnkproperties.h" |
37 | #include "applnk.h" | 37 | #include "applnk.h" |
38 | #include "qpeapplication.h" | 38 | #include <qpe/qpeapplication.h> |
39 | #include "categorymenu.h" | 39 | #include "categorymenu.h" |
40 | #include "categoryselect.h" | 40 | #include "categoryselect.h" |
41 | #include "mimetype.h" | 41 | #include "mimetype.h" |
42 | #include "categories.h" | 42 | #include <qpe/categories.h> |
43 | 43 | ||
44 | #include <stdlib.h> | 44 | #include <stdlib.h> |
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index c64e645..2b5e0d2 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp | |||
@@ -19,5 +19,5 @@ | |||
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" |
diff --git a/library/fontdatabase.h b/library/fontdatabase.h index 10aec91..991847b 100644 --- a/library/fontdatabase.h +++ b/library/fontdatabase.h | |||
@@ -37,4 +37,5 @@ struct FontFactory | |||
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 |
diff --git a/library/mimetype.cpp b/library/mimetype.cpp index 92fe5e6..ef5d619 100644 --- a/library/mimetype.cpp +++ b/library/mimetype.cpp | |||
@@ -23,5 +23,5 @@ | |||
23 | #include "applnk.h" | 23 | #include "applnk.h" |
24 | #include "resource.h" | 24 | #include "resource.h" |
25 | #include "qpeapplication.h" | 25 | #include <qpe/qpeapplication.h> |
26 | #include "config.h" | 26 | #include "config.h" |
27 | 27 | ||
diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp index 0db161b..b98e42e 100644 --- a/library/qpedialog.cpp +++ b/library/qpedialog.cpp | |||
@@ -24,5 +24,5 @@ | |||
24 | 24 | ||
25 | #include "qpedialog.h" | 25 | #include "qpedialog.h" |
26 | #include "qpeapplication.h" | 26 | #include <qpe/qpeapplication.h> |
27 | 27 | ||
28 | QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di) | 28 | QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di) |
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp index dfd300f..665910c 100644 --- a/library/qpestyle.cpp +++ b/library/qpestyle.cpp | |||
@@ -20,5 +20,5 @@ | |||
20 | 20 | ||
21 | #include "qpestyle.h" | 21 | #include "qpestyle.h" |
22 | #include "qpeapplication.h" | 22 | #include <qpe/qpeapplication.h> |
23 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | 24 | ||
diff --git a/library/resource.cpp b/library/resource.cpp index bdcd603..0920b67 100644 --- a/library/resource.cpp +++ b/library/resource.cpp | |||
@@ -20,5 +20,5 @@ | |||
20 | 20 | ||
21 | #define QTOPIA_INTERNAL_MIMEEXT | 21 | #define QTOPIA_INTERNAL_MIMEEXT |
22 | #include "qpeapplication.h" | 22 | #include <qpe/qpeapplication.h> |
23 | #include "resource.h" | 23 | #include "resource.h" |
24 | #include "mimetype.h" | 24 | #include "mimetype.h" |
diff --git a/library/timestring.cpp b/library/timestring.cpp index 4c6fa72..6443b6b 100644 --- a/library/timestring.cpp +++ b/library/timestring.cpp | |||
@@ -21,5 +21,5 @@ | |||
21 | #include "timestring.h" | 21 | #include "timestring.h" |
22 | #include <qobject.h> | 22 | #include <qobject.h> |
23 | #include "qpeapplication.h" //for qApp | 23 | #include <qpe/qpeapplication.h> //for qApp |
24 | #include "config.h" | 24 | #include "config.h" |
25 | 25 | ||