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...

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
@@ -26,3 +26,3 @@
 
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 #include "global.h"
@@ -31,3 +31,3 @@
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
-#include "qcopenvelope_qws.h"
+#include <qpe/qcopenvelope_qws.h>
 #endif
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
@@ -124,3 +124,3 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 //#else

-#include "vobject_p.h"

+#include <qtopia/private/vobject_p.h>
 //#endif

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
@@ -160,3 +160,3 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 /*#else
*/
-#include "vobject_p.h"

+#include <qtopia/private/vobject_p.h>
 /*#endif
*/
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
@@ -48,4 +48,4 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 
-#include "vobject_p.h"
-#include "qfiledirect_p.h"
+#include <qtopia/private/vobject_p.h>
+#include <qtopia/private/qfiledirect_p.h>
 #include <string.h>
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 272c223..4a9dcbd 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -24,3 +24,3 @@
 #include "resource.h"
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 #include "timestring.h"
diff --git a/library/fileselector.cpp b/library/fileselector.cpp
index 7ff09b4..052a29e 100644
--- a/library/fileselector.cpp
+++ b/library/fileselector.cpp
@@ -33,3 +33,3 @@
 #ifdef QWS
-#include "qcopchannel_qws.h"
+#include <qcopchannel_qws.h>
 #endif
@@ -37,3 +37,3 @@
 #include "applnk.h"
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 #include "categorymenu.h"
@@ -41,3 +41,3 @@
 #include "mimetype.h"
-#include "categories.h"
+#include <qpe/categories.h>
 
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index c64e645..2b5e0d2 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -20,3 +20,3 @@
 
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 #include "fontfactoryinterface.h"
diff --git a/library/fontdatabase.h b/library/fontdatabase.h
index 10aec91..991847b 100644
--- a/library/fontdatabase.h
+++ b/library/fontdatabase.h
@@ -38,2 +38,3 @@ struct FontFactory
 
+#undef QT_NO_FONTDATABASE
 class FontDatabase
diff --git a/library/mimetype.cpp b/library/mimetype.cpp
index 92fe5e6..ef5d619 100644
--- a/library/mimetype.cpp
+++ b/library/mimetype.cpp
@@ -24,3 +24,3 @@
 #include "resource.h"
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 #include "config.h"
diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp
index 0db161b..b98e42e 100644
--- a/library/qpedialog.cpp
+++ b/library/qpedialog.cpp
@@ -25,3 +25,3 @@
 #include "qpedialog.h"
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp
index dfd300f..665910c 100644
--- a/library/qpestyle.cpp
+++ b/library/qpestyle.cpp
@@ -21,3 +21,3 @@
 #include "qpestyle.h"
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 #include <qpushbutton.h>
diff --git a/library/resource.cpp b/library/resource.cpp
index bdcd603..0920b67 100644
--- a/library/resource.cpp
+++ b/library/resource.cpp
@@ -21,3 +21,3 @@
 #define QTOPIA_INTERNAL_MIMEEXT
-#include "qpeapplication.h"
+#include <qpe/qpeapplication.h>
 #include "resource.h"
diff --git a/library/timestring.cpp b/library/timestring.cpp
index 4c6fa72..6443b6b 100644
--- a/library/timestring.cpp
+++ b/library/timestring.cpp
@@ -22,3 +22,3 @@
 #include <qobject.h>
-#include "qpeapplication.h" //for qApp
+#include <qpe/qpeapplication.h> //for qApp
 #include "config.h"