| -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 @@ -19,22 +19,22 @@ **********************************************************************/ #include <qdir.h> #include <qfile.h> #include <qmessagebox.h> #include <qtextstream.h> -#include "qpeapplication.h" +#include <qpe/qpeapplication.h> #include "global.h" #include "resource.h" #if defined(Q_WS_QWS) && !defined(QT_NO_COP) -#include "qcopenvelope_qws.h" +#include <qpe/qcopenvelope_qws.h> #endif #include "alarmserver.h" #include <qpe/timeconversion.h> #include <sys/types.h> #include <sys/stat.h> #include <stdlib.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 @@ -117,17 +117,17 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. #endif
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
//#ifdef PALMTOPCENTER
//#include <qpe/vobject_p.h>
//#else
-#include "vobject_p.h"
+#include <qtopia/private/vobject_p.h> //#endif
/**** Types, Constants ****/
#define YYDEBUG 0 /* 1 to compile in some debugging code */
#define MAXTOKEN 256 /* maximum token (line) length */
#define YYSTACKSIZE 100 // ~unref ?
#define MAXLEVEL 10 /* max # of nested objects parseable */
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 @@ -153,17 +153,17 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. #endif
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
/*#ifdef PALMTOPCENTER
*/ /*#include <qpe/vobject_p.h>
*/ /*#else
*/ -#include "vobject_p.h"
+#include <qtopia/private/vobject_p.h> /*#endif
*/ /**** Types, Constants ****/
#define YYDEBUG 0 /* 1 to compile in some debugging code */
#define MAXTOKEN 256 /* maximum token (line) length */
#define YYSTACKSIZE 100 /* ~unref ?
*/ #define MAXLEVEL 10 /* max # of nested objects parseable */
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 @@ -41,18 +41,18 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. * doc: vobject and APIs to construct vobject, APIs pretty print * vobject, and convert a vobject into its textual representation. */ #ifndef MWERKS #include <malloc.h> #endif -#include "vobject_p.h" -#include "qfiledirect_p.h" +#include <qtopia/private/vobject_p.h> +#include <qtopia/private/qfiledirect_p.h> #include <string.h> #include <stdio.h> #include <fcntl.h> //#include <io.h> #define NAME_OF(o) o->id #define VALUE_TYPE(o) o->valType diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp index 272c223..4a9dcbd 100644 --- a/library/datebookmonth.cpp +++ b/library/datebookmonth.cpp @@ -17,17 +17,17 @@ ** not clear to you. ** **********************************************************************/ #include "config.h" #include "datebookmonth.h" #include "datebookdb.h" #include <qtopia/private/event.h> #include "resource.h" -#include "qpeapplication.h" +#include <qpe/qpeapplication.h> #include "timestring.h" #include <qtoolbutton.h> #include <qspinbox.h> #include <qcombobox.h> #include <qdatetime.h> #include <qpainter.h> #include <qpopupmenu.h> diff --git a/library/fileselector.cpp b/library/fileselector.cpp index 7ff09b4..052a29e 100644 --- a/library/fileselector.cpp +++ b/library/fileselector.cpp @@ -26,25 +26,25 @@ #include "fileselector_p.h" #include "global.h" #include "resource.h" #include "config.h" #include "applnk.h" #include "storage.h" #include "qpemenubar.h" #ifdef QWS -#include "qcopchannel_qws.h" +#include <qcopchannel_qws.h> #endif #include "lnkproperties.h" #include "applnk.h" -#include "qpeapplication.h" +#include <qpe/qpeapplication.h> #include "categorymenu.h" #include "categoryselect.h" #include "mimetype.h" -#include "categories.h" +#include <qpe/categories.h> #include <stdlib.h> #include <qdir.h> #include <qwidget.h> #include <qpopupmenu.h> #include <qtoolbutton.h> #include <qpushbutton.h> diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index c64e645..2b5e0d2 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp @@ -13,17 +13,17 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ -#include "qpeapplication.h" +#include <qpe/qpeapplication.h> #include "fontfactoryinterface.h" #include "fontdatabase.h" #include <qpe/qlibrary.h> #ifdef QWS #include <qfontmanager_qws.h> #endif diff --git a/library/fontdatabase.h b/library/fontdatabase.h index 10aec91..991847b 100644 --- a/library/fontdatabase.h +++ b/library/fontdatabase.h @@ -31,16 +31,17 @@ struct FontFactory { #ifndef QT_NO_COMPONENT QLibrary *library; #endif FontFactoryInterface *interface; QFontFactory *factory; }; +#undef QT_NO_FONTDATABASE class FontDatabase #ifndef QT_NO_FONTDATABASE : public QFontDatabase #endif { public: FontDatabase(); diff --git a/library/mimetype.cpp b/library/mimetype.cpp index 92fe5e6..ef5d619 100644 --- a/library/mimetype.cpp +++ b/library/mimetype.cpp @@ -17,17 +17,17 @@ ** not clear to you. ** **********************************************************************/ #define QTOPIA_INTERNAL_MIMEEXT #include "mimetype.h" #include "applnk.h" #include "resource.h" -#include "qpeapplication.h" +#include <qpe/qpeapplication.h> #include "config.h" #include <qfile.h> #include <qdict.h> #include <qregexp.h> #include <qstringlist.h> #include <qtextstream.h> #include <qmap.h> diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp index 0db161b..b98e42e 100644 --- a/library/qpedialog.cpp +++ b/library/qpedialog.cpp @@ -18,17 +18,17 @@ ** **********************************************************************/ #define protected public #include <qdialog.h> #undef protected #include "qpedialog.h" -#include "qpeapplication.h" +#include <qpe/qpeapplication.h> QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di) { dialog = di; connect(qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), this, SLOT(appMessage(const QCString&, const QByteArray&)) ); } diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp index dfd300f..665910c 100644 --- a/library/qpestyle.cpp +++ b/library/qpestyle.cpp @@ -14,17 +14,17 @@ ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "qpestyle.h" -#include "qpeapplication.h" +#include <qpe/qpeapplication.h> #include <qpushbutton.h> #include <qpainter.h> #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) #if QT_VERSION >= 300 diff --git a/library/resource.cpp b/library/resource.cpp index bdcd603..0920b67 100644 --- a/library/resource.cpp +++ b/library/resource.cpp @@ -14,17 +14,17 @@ ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #define QTOPIA_INTERNAL_MIMEEXT -#include "qpeapplication.h" +#include <qpe/qpeapplication.h> #include "resource.h" #include "mimetype.h" #include <qdir.h> #include <qfile.h> #include <qregexp.h> #include <qpixmapcache.h> #include <qpainter.h> diff --git a/library/timestring.cpp b/library/timestring.cpp index 4c6fa72..6443b6b 100644 --- a/library/timestring.cpp +++ b/library/timestring.cpp @@ -15,17 +15,17 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "timestring.h" #include <qobject.h> -#include "qpeapplication.h" //for qApp +#include <qpe/qpeapplication.h> //for qApp #include "config.h" class TimeStringFormatKeeper : public QObject { Q_OBJECT public: static DateFormat currentFormat() |