44 files changed, 20 insertions, 60 deletions
diff --git a/noncore/apps/opie-reader/Aportis.cpp b/noncore/apps/opie-reader/Aportis.cpp index 7528e78..353996c 100644 --- a/noncore/apps/opie-reader/Aportis.cpp +++ b/noncore/apps/opie-reader/Aportis.cpp | |||
@@ -4,5 +4,4 @@ | |||
4 | #include "my_list.h" | 4 | #include "my_list.h" |
5 | #include "Bkmks.h" | 5 | #include "Bkmks.h" |
6 | #include "static.h" | ||
7 | 6 | ||
8 | Aportis::Aportis() : peanutfile(false) { /*printf("constructing:%x\n",fin);*/ } | 7 | Aportis::Aportis() : peanutfile(false) { /*printf("constructing:%x\n",fin);*/ } |
diff --git a/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro b/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro index 4b61a7a..fcab192 100644 --- a/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro +++ b/noncore/apps/opie-reader/AportisCodec/AportisCodec.pro | |||
@@ -5,5 +5,4 @@ CONFIG = qt warn_on release dll | |||
5 | HEADERS = Aportis.h \ | 5 | HEADERS = Aportis.h \ |
6 | CExpander.h \ | 6 | CExpander.h \ |
7 | ../OREADERINC/useqpe.h \ | ||
8 | config.h \ | 7 | config.h \ |
9 | ustring.h \ | 8 | ustring.h \ |
@@ -25,6 +24,6 @@ TARGET = Aportis | |||
25 | LIBS += -lreader_pdb -lreader_codec | 24 | LIBS += -lreader_pdb -lreader_codec |
26 | 25 | ||
27 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 26 | INCLUDEPATH+= $(OPIEDIR)/include |
28 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 27 | DEPENDPATH+= $(OPIEDIR)/include |
29 | 28 | ||
30 | include ( $(OPIEDIR)/include.pro ) \ No newline at end of file | 29 | include ( $(OPIEDIR)/include.pro ) \ No newline at end of file |
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp index 22934f9..1f0a524 100644 --- a/noncore/apps/opie-reader/BuffDoc.cpp +++ b/noncore/apps/opie-reader/BuffDoc.cpp | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "static.h" | ||
2 | #include "names.h" | 1 | #include "names.h" |
3 | 2 | ||
@@ -5,5 +4,4 @@ | |||
5 | #define INCREMENTALWIDTH | 4 | #define INCREMENTALWIDTH |
6 | 5 | ||
7 | #include "useqpe.h" | ||
8 | #include "usenef.h" | 6 | #include "usenef.h" |
9 | #include "BuffDoc.h" | 7 | #include "BuffDoc.h" |
diff --git a/noncore/apps/opie-reader/BuffDoc.h b/noncore/apps/opie-reader/BuffDoc.h index a7dd7bf..2b4fb57 100644 --- a/noncore/apps/opie-reader/BuffDoc.h +++ b/noncore/apps/opie-reader/BuffDoc.h | |||
@@ -2,5 +2,4 @@ | |||
2 | #define __BuffDoc_h | 2 | #define __BuffDoc_h |
3 | 3 | ||
4 | #include "useqpe.h" | ||
5 | #include "CDrawBuffer.h" | 4 | #include "CDrawBuffer.h" |
6 | #include "CFilter.h" | 5 | #include "CFilter.h" |
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp index caccf1b..bfb3027 100644 --- a/noncore/apps/opie-reader/CDrawBuffer.cpp +++ b/noncore/apps/opie-reader/CDrawBuffer.cpp | |||
@@ -5,5 +5,4 @@ | |||
5 | #include <qpixmap.h> | 5 | #include <qpixmap.h> |
6 | #include <qimage.h> | 6 | #include <qimage.h> |
7 | #include "useqpe.h" | ||
8 | 7 | ||
9 | CDrawBuffer::~CDrawBuffer() | 8 | CDrawBuffer::~CDrawBuffer() |
diff --git a/noncore/apps/opie-reader/CExpander.h b/noncore/apps/opie-reader/CExpander.h index e9aaf79..7fa84f9 100644 --- a/noncore/apps/opie-reader/CExpander.h +++ b/noncore/apps/opie-reader/CExpander.h | |||
@@ -9,5 +9,4 @@ | |||
9 | #include <sys/stat.h> | 9 | #include <sys/stat.h> |
10 | #include <qmessagebox.h> | 10 | #include <qmessagebox.h> |
11 | #include "useqpe.h" | ||
12 | #include "config.h" | 11 | #include "config.h" |
13 | #include "StyleConsts.h" | 12 | #include "StyleConsts.h" |
diff --git a/noncore/apps/opie-reader/CFilter.cpp b/noncore/apps/opie-reader/CFilter.cpp index 6f76e9a..6d94d70 100644 --- a/noncore/apps/opie-reader/CFilter.cpp +++ b/noncore/apps/opie-reader/CFilter.cpp | |||
@@ -3,5 +3,4 @@ | |||
3 | #include <qtextstream.h> | 3 | #include <qtextstream.h> |
4 | #include <qdir.h> | 4 | #include <qdir.h> |
5 | #include "useqpe.h" | ||
6 | #ifdef USEQPE | 5 | #ifdef USEQPE |
7 | #include <qpe/global.h> | 6 | #include <qpe/global.h> |
diff --git a/noncore/apps/opie-reader/CFilter.h b/noncore/apps/opie-reader/CFilter.h index cec9618..174e6b4 100644 --- a/noncore/apps/opie-reader/CFilter.h +++ b/noncore/apps/opie-reader/CFilter.h | |||
@@ -392,5 +392,4 @@ class HighlightFilter : public CFilter | |||
392 | }; | 392 | }; |
393 | 393 | ||
394 | #include "static.h" | ||
395 | #ifndef __STATIC | 394 | #ifndef __STATIC |
396 | #include <dlfcn.h> | 395 | #include <dlfcn.h> |
diff --git a/noncore/apps/opie-reader/CHM.cpp b/noncore/apps/opie-reader/CHM.cpp index 9d1eb87..88d53bf 100644 --- a/noncore/apps/opie-reader/CHM.cpp +++ b/noncore/apps/opie-reader/CHM.cpp | |||
@@ -1,5 +1,4 @@ | |||
1 | #include "CHM.h" | 1 | #include "CHM.h" |
2 | #include "chm_lib.h" | 2 | #include "chm_lib.h" |
3 | #include "static.h" | ||
4 | #include <qstring.h> | 3 | #include <qstring.h> |
5 | #include <qstringlist.h> | 4 | #include <qstringlist.h> |
diff --git a/noncore/apps/opie-reader/CHM.h b/noncore/apps/opie-reader/CHM.h index 7dac46f..001f7fc 100644 --- a/noncore/apps/opie-reader/CHM.h +++ b/noncore/apps/opie-reader/CHM.h | |||
@@ -3,5 +3,4 @@ | |||
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <sys/stat.h> | 4 | #include <sys/stat.h> |
5 | #include "useqpe.h" | ||
6 | #include "CExpander.h" | 5 | #include "CExpander.h" |
7 | #include "chm_lib.h" | 6 | #include "chm_lib.h" |
diff --git a/noncore/apps/opie-reader/CHM/CHM.pro b/noncore/apps/opie-reader/CHM/CHM.pro index 6ed86f6..d3a2a28 100644 --- a/noncore/apps/opie-reader/CHM/CHM.pro +++ b/noncore/apps/opie-reader/CHM/CHM.pro | |||
@@ -13,6 +13,6 @@ TARGET = CHM | |||
13 | LIBS += -lreader_codec | 13 | LIBS += -lreader_codec |
14 | 14 | ||
15 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 15 | INCLUDEPATH+= $(OPIEDIR)/include |
16 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 16 | DEPENDPATH+= $(OPIEDIR)/include |
17 | 17 | ||
18 | include ( $(OPIEDIR)/include.pro ) \ No newline at end of file | 18 | include ( $(OPIEDIR)/include.pro ) \ No newline at end of file |
diff --git a/noncore/apps/opie-reader/CloseDialog.h b/noncore/apps/opie-reader/CloseDialog.h index 62e6423..54aaf1c 100644 --- a/noncore/apps/opie-reader/CloseDialog.h +++ b/noncore/apps/opie-reader/CloseDialog.h | |||
@@ -10,5 +10,4 @@ | |||
10 | #define __CLOSEDIALOG_H | 10 | #define __CLOSEDIALOG_H |
11 | 11 | ||
12 | #include "useqpe.h" | ||
13 | #include <qvariant.h> | 12 | #include <qvariant.h> |
14 | #include <qwidget.h> | 13 | #include <qwidget.h> |
diff --git a/noncore/apps/opie-reader/FontControl.cpp b/noncore/apps/opie-reader/FontControl.cpp index bbd9fe0..9bb3bc0 100644 --- a/noncore/apps/opie-reader/FontControl.cpp +++ b/noncore/apps/opie-reader/FontControl.cpp | |||
@@ -1,4 +1,3 @@ | |||
1 | #include <qfontdatabase.h> | 1 | #include <qfontdatabase.h> |
2 | #include "useqpe.h" | ||
3 | #include "FontControl.h" | 2 | #include "FontControl.h" |
4 | 3 | ||
diff --git a/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro b/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro index cc049a9..8eb6f17 100644 --- a/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro +++ b/noncore/apps/opie-reader/HTMLFilter/HTMLFilter.pro | |||
@@ -15,6 +15,6 @@ DESTDIR = $(OPIEDIR)/plugins/reader/filters | |||
15 | TARGET = HTMLfilter | 15 | TARGET = HTMLfilter |
16 | 16 | ||
17 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 17 | INCLUDEPATH+= $(OPIEDIR)/include |
18 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 18 | DEPENDPATH+= $(OPIEDIR)/include |
19 | 19 | ||
20 | include ( $(OPIEDIR)/include.pro ) | 20 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-reader/Palm2QImage.cpp b/noncore/apps/opie-reader/Palm2QImage.cpp index c1b7b7a..c6907eb 100644 --- a/noncore/apps/opie-reader/Palm2QImage.cpp +++ b/noncore/apps/opie-reader/Palm2QImage.cpp | |||
@@ -1,4 +1,3 @@ | |||
1 | /* -*- mode: c; indent-tabs-mode: nil; -*- */ | 1 | /* -*- mode: c; indent-tabs-mode: nil; -*- */ |
2 | #include "useqpe.h" | ||
3 | #include <stdio.h> | 2 | #include <stdio.h> |
4 | #include <stdlib.h> | 3 | #include <stdlib.h> |
diff --git a/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro b/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro index 6ed4032..7042542 100644 --- a/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro +++ b/noncore/apps/opie-reader/PluckerCodec/PluckerCodec.pro | |||
@@ -13,6 +13,6 @@ TARGET = Plucker | |||
13 | LIBS += -lreader_pdb -lreader_pluckerbase -lreader_codec | 13 | LIBS += -lreader_pdb -lreader_pluckerbase -lreader_codec |
14 | 14 | ||
15 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 15 | INCLUDEPATH+= $(OPIEDIR)/include |
16 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 16 | DEPENDPATH+= $(OPIEDIR)/include |
17 | 17 | ||
18 | include ( $(OPIEDIR)/include.pro ) | 18 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp index dfdba28..33884a0 100644 --- a/noncore/apps/opie-reader/QTReader.cpp +++ b/noncore/apps/opie-reader/QTReader.cpp | |||
@@ -11,5 +11,4 @@ | |||
11 | const int _SBARHEIGHT = 3; | 11 | const int _SBARHEIGHT = 3; |
12 | 12 | ||
13 | #include "useqpe.h" | ||
14 | #include <qpainter.h> | 13 | #include <qpainter.h> |
15 | //#include <qdirectpainter_qws.h> | 14 | //#include <qdirectpainter_qws.h> |
diff --git a/noncore/apps/opie-reader/QTReader.h b/noncore/apps/opie-reader/QTReader.h index 7b0ebc8..3bcdde4 100644 --- a/noncore/apps/opie-reader/QTReader.h +++ b/noncore/apps/opie-reader/QTReader.h | |||
@@ -3,5 +3,4 @@ | |||
3 | 3 | ||
4 | //#define _SCROLLPIPE | 4 | //#define _SCROLLPIPE |
5 | #include "static.h" | ||
6 | #include <qwidget.h> | 5 | #include <qwidget.h> |
7 | //#include <qpainter.h> | 6 | //#include <qpainter.h> |
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index ec7a29c..876b65a 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp | |||
@@ -18,5 +18,4 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "useqpe.h" | ||
21 | #include <qregexp.h> | 20 | #include <qregexp.h> |
22 | #include <qclipboard.h> | 21 | #include <qclipboard.h> |
@@ -84,5 +83,4 @@ using namespace Opie::Ui; | |||
84 | #include "CDrawBuffer.h" | 83 | #include "CDrawBuffer.h" |
85 | #include "Filedata.h" | 84 | #include "Filedata.h" |
86 | #include "useqpe.h" | ||
87 | #include "names.h" | 85 | #include "names.h" |
88 | #include "CEncoding_tables.h" | 86 | #include "CEncoding_tables.h" |
diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h index 5ecc42d..ad47fc9 100644 --- a/noncore/apps/opie-reader/QTReaderApp.h +++ b/noncore/apps/opie-reader/QTReaderApp.h | |||
@@ -27,5 +27,4 @@ | |||
27 | #define MAX_ACTIONS 5 | 27 | #define MAX_ACTIONS 5 |
28 | 28 | ||
29 | #include "useqpe.h" | ||
30 | #include <sys/timeb.h> | 29 | #include <sys/timeb.h> |
31 | #include <qmainwindow.h> | 30 | #include <qmainwindow.h> |
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.cpp b/noncore/apps/opie-reader/ToolbarPrefs.cpp index 5cf220a..56c4e9b 100644 --- a/noncore/apps/opie-reader/ToolbarPrefs.cpp +++ b/noncore/apps/opie-reader/ToolbarPrefs.cpp | |||
@@ -7,5 +7,4 @@ | |||
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #include "useqpe.h" | ||
10 | #include "ToolbarPrefs.h" | 9 | #include "ToolbarPrefs.h" |
11 | 10 | ||
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.h b/noncore/apps/opie-reader/ToolbarPrefs.h index a2686e5..0bdae6b 100644 --- a/noncore/apps/opie-reader/ToolbarPrefs.h +++ b/noncore/apps/opie-reader/ToolbarPrefs.h | |||
@@ -9,5 +9,4 @@ | |||
9 | #ifndef CTOOLBARPREFS_H | 9 | #ifndef CTOOLBARPREFS_H |
10 | #define CTOOLBARPREFS_H | 10 | #define CTOOLBARPREFS_H |
11 | #include "useqpe.h" | ||
12 | #include <qvariant.h> | 11 | #include <qvariant.h> |
13 | #include <qwidget.h> | 12 | #include <qwidget.h> |
@@ -24,5 +23,4 @@ | |||
24 | #include "preferences.h" | 23 | #include "preferences.h" |
25 | #endif | 24 | #endif |
26 | //#include "opie.h" | ||
27 | //#ifdef OPIE | 25 | //#ifdef OPIE |
28 | #define USECOMBO | 26 | #define USECOMBO |
diff --git a/noncore/apps/opie-reader/URLDialog.h b/noncore/apps/opie-reader/URLDialog.h index 1bcc4bd..792d13a 100644 --- a/noncore/apps/opie-reader/URLDialog.h +++ b/noncore/apps/opie-reader/URLDialog.h | |||
@@ -10,5 +10,4 @@ | |||
10 | #define __URLDIALOG_H | 10 | #define __URLDIALOG_H |
11 | 11 | ||
12 | #include "useqpe.h" | ||
13 | #include <qvariant.h> | 12 | #include <qvariant.h> |
14 | #include <qwidget.h> | 13 | #include <qwidget.h> |
diff --git a/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro b/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro index 61e7dc9..f20bdc6 100644 --- a/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro +++ b/noncore/apps/opie-reader/WeaselCodec/WeaselCodec.pro | |||
@@ -12,6 +12,6 @@ TARGET = Weasel | |||
12 | LIBS += -lreader_pdb -lreader_codec | 12 | LIBS += -lreader_pdb -lreader_codec |
13 | 13 | ||
14 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 14 | INCLUDEPATH+= $(OPIEDIR)/include |
15 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 15 | DEPENDPATH+= $(OPIEDIR)/include |
16 | 16 | ||
17 | include ( $(OPIEDIR)/include.pro ) | 17 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-reader/ZText.h b/noncore/apps/opie-reader/ZText.h index 06e3bf8..199c7da 100644 --- a/noncore/apps/opie-reader/ZText.h +++ b/noncore/apps/opie-reader/ZText.h | |||
@@ -4,5 +4,4 @@ | |||
4 | #include <zlib.h> | 4 | #include <zlib.h> |
5 | #include <sys/stat.h> | 5 | #include <sys/stat.h> |
6 | #include "useqpe.h" | ||
7 | #include "CExpander.h" | 6 | #include "CExpander.h" |
8 | 7 | ||
diff --git a/noncore/apps/opie-reader/codeclib/codeclib.pro b/noncore/apps/opie-reader/codeclib/codeclib.pro index 6adcda8..c24767b 100644 --- a/noncore/apps/opie-reader/codeclib/codeclib.pro +++ b/noncore/apps/opie-reader/codeclib/codeclib.pro | |||
@@ -12,6 +12,6 @@ DESTDIR = $(OPIEDIR)/lib | |||
12 | TARGET = reader_codec | 12 | TARGET = reader_codec |
13 | 13 | ||
14 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 14 | INCLUDEPATH+= $(OPIEDIR)/include |
15 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 15 | DEPENDPATH+= $(OPIEDIR)/include |
16 | 16 | ||
17 | include ( $(OPIEDIR)/include.pro ) | 17 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-reader/ebookcodec.h b/noncore/apps/opie-reader/ebookcodec.h index b341e55..f6e2daf 100644 --- a/noncore/apps/opie-reader/ebookcodec.h +++ b/noncore/apps/opie-reader/ebookcodec.h | |||
@@ -4,5 +4,4 @@ | |||
4 | #include <qdir.h> | 4 | #include <qdir.h> |
5 | 5 | ||
6 | #include "useqpe.h" | ||
7 | #ifdef USEQPE | 6 | #ifdef USEQPE |
8 | #include <qpe/global.h> | 7 | #include <qpe/global.h> |
@@ -11,5 +10,4 @@ | |||
11 | #include "util.h" | 10 | #include "util.h" |
12 | 11 | ||
13 | #include "static.h" | ||
14 | #ifndef __STATIC | 12 | #ifndef __STATIC |
15 | #include <dlfcn.h> | 13 | #include <dlfcn.h> |
diff --git a/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro b/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro index 78d5a49..5cf075e 100644 --- a/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro +++ b/noncore/apps/opie-reader/iSiloCodec/iSiloCodec.pro | |||
@@ -13,6 +13,6 @@ TARGET = iSilo | |||
13 | LIBS += -lreader_pdb -lreader_codec | 13 | LIBS += -lreader_pdb -lreader_codec |
14 | 14 | ||
15 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 15 | INCLUDEPATH+= $(OPIEDIR)/include |
16 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 16 | DEPENDPATH+= $(OPIEDIR)/include |
17 | 17 | ||
18 | include ( $(OPIEDIR)/include.pro ) | 18 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-reader/main.cpp b/noncore/apps/opie-reader/main.cpp index 3e1f5e7..af276da 100644 --- a/noncore/apps/opie-reader/main.cpp +++ b/noncore/apps/opie-reader/main.cpp | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "useqpe.h" | ||
2 | #ifdef USEQPE | 1 | #ifdef USEQPE |
3 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
diff --git a/noncore/apps/opie-reader/pdb.cpp b/noncore/apps/opie-reader/pdb.cpp index 39551cc..6719af4 100644 --- a/noncore/apps/opie-reader/pdb.cpp +++ b/noncore/apps/opie-reader/pdb.cpp | |||
@@ -4,5 +4,4 @@ | |||
4 | #endif | 4 | #endif |
5 | 5 | ||
6 | #include "useqpe.h" | ||
7 | 6 | ||
8 | #ifdef USEQPE | 7 | #ifdef USEQPE |
diff --git a/noncore/apps/opie-reader/pdb.h b/noncore/apps/opie-reader/pdb.h index 7a6580d..7458919 100644 --- a/noncore/apps/opie-reader/pdb.h +++ b/noncore/apps/opie-reader/pdb.h | |||
@@ -16,5 +16,4 @@ | |||
16 | #endif | 16 | #endif |
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | #include "useqpe.h" | ||
19 | #include "CExpander.h" | 18 | #include "CExpander.h" |
20 | 19 | ||
diff --git a/noncore/apps/opie-reader/pdblib/pdblib.pro b/noncore/apps/opie-reader/pdblib/pdblib.pro index cb861a8..830d988 100644 --- a/noncore/apps/opie-reader/pdblib/pdblib.pro +++ b/noncore/apps/opie-reader/pdblib/pdblib.pro | |||
@@ -11,6 +11,6 @@ DESTDIR = $(OPIEDIR)/lib | |||
11 | TARGET = reader_pdb | 11 | TARGET = reader_pdb |
12 | 12 | ||
13 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 13 | INCLUDEPATH+= $(OPIEDIR)/include |
14 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 14 | DEPENDPATH+= $(OPIEDIR)/include |
15 | 15 | ||
16 | include ( $(OPIEDIR)/include.pro ) | 16 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp index d1ccd6f..4ea807a 100644 --- a/noncore/apps/opie-reader/plucker.cpp +++ b/noncore/apps/opie-reader/plucker.cpp | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "useqpe.h" | ||
2 | #include <stdio.h> | 1 | #include <stdio.h> |
3 | #include <string.h> | 2 | #include <string.h> |
@@ -21,5 +20,4 @@ | |||
21 | #include "Aportis.h" | 20 | #include "Aportis.h" |
22 | #include "Palm2QImage.h" | 21 | #include "Palm2QImage.h" |
23 | #include "static.h" | ||
24 | 22 | ||
25 | 23 | ||
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp index 0b7fae8..d7d538f 100644 --- a/noncore/apps/opie-reader/plucker_base.cpp +++ b/noncore/apps/opie-reader/plucker_base.cpp | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "useqpe.h" | ||
2 | #include "usenef.h" | 1 | #include "usenef.h" |
3 | #include <stdio.h> | 2 | #include <stdio.h> |
@@ -22,5 +21,4 @@ | |||
22 | #include <qimage.h> | 21 | #include <qimage.h> |
23 | 22 | ||
24 | #include "static.h" | ||
25 | #include "plucker_base.h" | 23 | #include "plucker_base.h" |
26 | #include "Aportis.h" | 24 | #include "Aportis.h" |
@@ -1360,5 +1358,4 @@ tchar CPlucker_base::getch_base(bool fast) | |||
1360 | } | 1358 | } |
1361 | 1359 | ||
1362 | #include "static.h" | ||
1363 | #if defined(__STATIC) && defined(USENEF) | 1360 | #if defined(__STATIC) && defined(USENEF) |
1364 | #include "Model.h" | 1361 | #include "Model.h" |
diff --git a/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro b/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro index bee1a2d..7c2f31e 100644 --- a/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro +++ b/noncore/apps/opie-reader/pluckerbaselib/pluckerbaselib.pro | |||
@@ -13,6 +13,6 @@ TARGET = reader_pluckerbase | |||
13 | LIBS += -ldl | 13 | LIBS += -ldl |
14 | 14 | ||
15 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 15 | INCLUDEPATH+= $(OPIEDIR)/include |
16 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 16 | DEPENDPATH+= $(OPIEDIR)/include |
17 | 17 | ||
18 | include ( $(OPIEDIR)/include.pro ) | 18 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-reader/ppm_expander.cpp b/noncore/apps/opie-reader/ppm_expander.cpp index ea5b955..2a4318b 100644 --- a/noncore/apps/opie-reader/ppm_expander.cpp +++ b/noncore/apps/opie-reader/ppm_expander.cpp | |||
@@ -9,5 +9,4 @@ | |||
9 | #include <string.h> | 9 | #include <string.h> |
10 | #include <time.h> | 10 | #include <time.h> |
11 | #include "static.h" | ||
12 | 11 | ||
13 | /*************************************************************************** | 12 | /*************************************************************************** |
diff --git a/noncore/apps/opie-reader/ppm_expander.h b/noncore/apps/opie-reader/ppm_expander.h index a1a3b60..ccc89c2 100644 --- a/noncore/apps/opie-reader/ppm_expander.h +++ b/noncore/apps/opie-reader/ppm_expander.h | |||
@@ -2,5 +2,4 @@ | |||
2 | #define __ppm_expander_h | 2 | #define __ppm_expander_h |
3 | 3 | ||
4 | #include "useqpe.h" | ||
5 | #include "CExpander.h" | 4 | #include "CExpander.h" |
6 | #include <sys/stat.h> | 5 | #include <sys/stat.h> |
diff --git a/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro b/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro index 8699d3b..d6ec97b 100644 --- a/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro +++ b/noncore/apps/opie-reader/ppmsCodec/ppmsCodec.pro | |||
@@ -14,6 +14,6 @@ TARGET = ppms | |||
14 | LIBS += -lreader_codec | 14 | LIBS += -lreader_codec |
15 | 15 | ||
16 | INCLUDEPATH+= ../OREADERINC $(OPIEDIR)/include | 16 | INCLUDEPATH+= $(OPIEDIR)/include |
17 | DEPENDPATH+= ../OREADERINC $(OPIEDIR)/include | 17 | DEPENDPATH+= $(OPIEDIR)/include |
18 | 18 | ||
19 | include ( $(OPIEDIR)/include.pro ) | 19 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/opie-reader/preferences.cpp b/noncore/apps/opie-reader/preferences.cpp index b9397cf..0f59a22 100755 --- a/noncore/apps/opie-reader/preferences.cpp +++ b/noncore/apps/opie-reader/preferences.cpp | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "useqpe.h" | ||
2 | #ifndef USEQPE | 1 | #ifndef USEQPE |
3 | 2 | ||
diff --git a/noncore/apps/opie-reader/preferences.h b/noncore/apps/opie-reader/preferences.h index 69d1774..aeb2a84 100644 --- a/noncore/apps/opie-reader/preferences.h +++ b/noncore/apps/opie-reader/preferences.h | |||
@@ -1,3 +1,2 @@ | |||
1 | #include "useqpe.h" | ||
2 | #ifndef USEQPE | 1 | #ifndef USEQPE |
3 | #ifndef __PREFERENCES_H | 2 | #ifndef __PREFERENCES_H |
diff --git a/noncore/apps/opie-reader/static.h b/noncore/apps/opie-reader/static.h deleted file mode 100644 index e69de29..0000000 --- a/noncore/apps/opie-reader/static.h +++ b/dev/null | |||
diff --git a/noncore/apps/opie-reader/striphtml.cpp b/noncore/apps/opie-reader/striphtml.cpp index 9cd6a0d..e86402b 100644 --- a/noncore/apps/opie-reader/striphtml.cpp +++ b/noncore/apps/opie-reader/striphtml.cpp | |||
@@ -3,5 +3,4 @@ | |||
3 | #include <qtextstream.h> | 3 | #include <qtextstream.h> |
4 | #include <qdir.h> | 4 | #include <qdir.h> |
5 | #include "useqpe.h" | ||
6 | #ifdef USEQPE | 5 | #ifdef USEQPE |
7 | #include <qpe/global.h> | 6 | #include <qpe/global.h> |
diff --git a/noncore/apps/opie-reader/useqpe.h b/noncore/apps/opie-reader/useqpe.h deleted file mode 100644 index e69de29..0000000 --- a/noncore/apps/opie-reader/useqpe.h +++ b/dev/null | |||
diff --git a/noncore/apps/opie-reader/ztxt.cpp b/noncore/apps/opie-reader/ztxt.cpp index 79c5fa4..35db05e 100644 --- a/noncore/apps/opie-reader/ztxt.cpp +++ b/noncore/apps/opie-reader/ztxt.cpp | |||
@@ -4,5 +4,4 @@ | |||
4 | #include "my_list.h" | 4 | #include "my_list.h" |
5 | #include "Bkmks.h" | 5 | #include "Bkmks.h" |
6 | #include "static.h" | ||
7 | 6 | ||
8 | ztxt::ztxt() : bInit(false), expandedtextbuffer(NULL), compressedtextbuffer(NULL) { /*printf("constructing:%x\n",fin);*/ } | 7 | ztxt::ztxt() : bInit(false), expandedtextbuffer(NULL), compressedtextbuffer(NULL) { /*printf("constructing:%x\n",fin);*/ } |