-rw-r--r-- | noncore/apps/opie-reader/Bkmks.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/BuffDoc.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-reader/CDrawBuffer.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-reader/CEncoding_tables.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-reader/CFilter.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-reader/FontControl.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/Palm2QImage.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-reader/Prefs.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReader.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-reader/ToolbarPrefs.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/opie-reader/fileBrowser.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-reader/main.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/plucker.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-reader/plucker_base.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-reader/ppm.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-reader/version.cpp | 2 |
17 files changed, 0 insertions, 62 deletions
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp index 889c6d8..16bc1f1 100644 --- a/noncore/apps/opie-reader/Bkmks.cpp +++ b/noncore/apps/opie-reader/Bkmks.cpp | |||
@@ -1,12 +1,10 @@ | |||
1 | #include <qmessagebox.h> | 1 | #include <qmessagebox.h> |
2 | 2 | ||
3 | #include "Bkmks.h" | 3 | #include "Bkmks.h" |
4 | 4 | ||
5 | #include "StyleConsts.h" | ||
6 | #include "Markups.h" | ||
7 | #include "my_list.h" | 5 | #include "my_list.h" |
8 | #include "version.h" | 6 | #include "version.h" |
9 | #include "names.h" | 7 | #include "names.h" |
10 | 8 | ||
11 | const unsigned long BkmkFile::magic = ((unsigned long)'q' << 24) | ((unsigned long)'t' << 16) | ((unsigned long)'r' << 8) | ((unsigned long)BKMKTYPE); | 9 | const unsigned long BkmkFile::magic = ((unsigned long)'q' << 24) | ((unsigned long)'t' << 16) | ((unsigned long)'r' << 8) | ((unsigned long)BKMKTYPE); |
12 | 10 | ||
diff --git a/noncore/apps/opie-reader/BuffDoc.cpp b/noncore/apps/opie-reader/BuffDoc.cpp index 2402904..4fbab93 100644 --- a/noncore/apps/opie-reader/BuffDoc.cpp +++ b/noncore/apps/opie-reader/BuffDoc.cpp | |||
@@ -1,16 +1,12 @@ | |||
1 | #include "names.h" | ||
2 | 1 | ||
3 | #define NEWLINEBREAK | 2 | #define NEWLINEBREAK |
4 | 3 | ||
5 | #include "BuffDoc.h" | 4 | #include "BuffDoc.h" |
6 | //#include <FL/fl_draw.h> | 5 | //#include <FL/fl_draw.h> |
7 | #include "config.h" | ||
8 | #include "CDrawBuffer.h" | ||
9 | #include "plucker.h" | 6 | #include "plucker.h" |
10 | #include "usenef.h" | ||
11 | #ifdef USENEF | 7 | #ifdef USENEF |
12 | #include "nef.h" | 8 | #include "nef.h" |
13 | #include "arrierego.h" | 9 | #include "arrierego.h" |
14 | #endif | 10 | #endif |
15 | 11 | ||
16 | linkType BuffDoc::hyperlink(unsigned int n, QString& wrd) | 12 | linkType BuffDoc::hyperlink(unsigned int n, QString& wrd) |
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp index 77b76fb..ec36fb2 100644 --- a/noncore/apps/opie-reader/CDrawBuffer.cpp +++ b/noncore/apps/opie-reader/CDrawBuffer.cpp | |||
@@ -1,14 +1,10 @@ | |||
1 | #include "CDrawBuffer.h" | 1 | #include "CDrawBuffer.h" |
2 | #include "FontControl.h" | 2 | #include "FontControl.h" |
3 | #include <qfontmetrics.h> | ||
4 | #include <qpainter.h> | 3 | #include <qpainter.h> |
5 | #include <qpixmap.h> | ||
6 | #include <qimage.h> | 4 | #include <qimage.h> |
7 | #include "useqpe.h" | ||
8 | #include "opie.h" | ||
9 | 5 | ||
10 | CDrawBuffer::~CDrawBuffer() | 6 | CDrawBuffer::~CDrawBuffer() |
11 | { | 7 | { |
12 | while (!segs.isEmpty()) segs.erase(0); | 8 | while (!segs.isEmpty()) segs.erase(0); |
13 | } | 9 | } |
14 | 10 | ||
diff --git a/noncore/apps/opie-reader/CEncoding_tables.cpp b/noncore/apps/opie-reader/CEncoding_tables.cpp index 667bda0..e335819 100644 --- a/noncore/apps/opie-reader/CEncoding_tables.cpp +++ b/noncore/apps/opie-reader/CEncoding_tables.cpp | |||
@@ -1,8 +1,7 @@ | |||
1 | #include "CEncoding_tables.h" | 1 | #include "CEncoding_tables.h" |
2 | #include "config.h" | ||
3 | 2 | ||
4 | static const unicodetable unicodevalues[] = { | 3 | static const unicodetable unicodevalues[] = { |
5 | // from RFC 1489, ftp://ftp.isi.edu/in-notes/rfc1489.txt | 4 | // from RFC 1489, ftp://ftp.isi.edu/in-notes/rfc1489.txt |
6 | { "KOI8-R", "KOI8-R", 2084, | 5 | { "KOI8-R", "KOI8-R", 2084, |
7 | { 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, | 6 | { 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, |
8 | 0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, | 7 | 0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, |
diff --git a/noncore/apps/opie-reader/CFilter.cpp b/noncore/apps/opie-reader/CFilter.cpp index 73a0872..0422ba6 100644 --- a/noncore/apps/opie-reader/CFilter.cpp +++ b/noncore/apps/opie-reader/CFilter.cpp | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "CDrawBuffer.h" | ||
2 | #include "CFilter.h" | 1 | #include "CFilter.h" |
3 | 2 | ||
4 | unsigned short striphtml::skip_ws() | 3 | unsigned short striphtml::skip_ws() |
5 | { | 4 | { |
6 | tchar ch; | 5 | tchar ch; |
7 | CStyle sty; | 6 | CStyle sty; |
diff --git a/noncore/apps/opie-reader/FontControl.cpp b/noncore/apps/opie-reader/FontControl.cpp index e03bf64..cfa8534 100644 --- a/noncore/apps/opie-reader/FontControl.cpp +++ b/noncore/apps/opie-reader/FontControl.cpp | |||
@@ -1,8 +1,6 @@ | |||
1 | #include "opie.h" | ||
2 | #include "useqpe.h" | ||
3 | #include "FontControl.h" | 1 | #include "FontControl.h" |
4 | 2 | ||
5 | int FontControl::gzoom() | 3 | int FontControl::gzoom() |
6 | { | 4 | { |
7 | int ret; | 5 | int ret; |
8 | if (m_size == g_size) | 6 | if (m_size == g_size) |
diff --git a/noncore/apps/opie-reader/Palm2QImage.cpp b/noncore/apps/opie-reader/Palm2QImage.cpp index bf5ece3..9339595 100644 --- a/noncore/apps/opie-reader/Palm2QImage.cpp +++ b/noncore/apps/opie-reader/Palm2QImage.cpp | |||
@@ -1,8 +1,7 @@ | |||
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> |
5 | #include <string.h> | 4 | #include <string.h> |
6 | #ifndef _WINDOWS | 5 | #ifndef _WINDOWS |
7 | #include <unistd.h> /* for link */ | 6 | #include <unistd.h> /* for link */ |
8 | #endif | 7 | #endif |
diff --git a/noncore/apps/opie-reader/Prefs.cpp b/noncore/apps/opie-reader/Prefs.cpp index 5150ca5..72eefba 100644 --- a/noncore/apps/opie-reader/Prefs.cpp +++ b/noncore/apps/opie-reader/Prefs.cpp | |||
@@ -3,26 +3,17 @@ | |||
3 | ** | 3 | ** |
4 | ** Created: Tue Feb 11 23:53:35 2003 | 4 | ** Created: Tue Feb 11 23:53:35 2003 |
5 | ** by: The User Interface Compiler (uic) | 5 | ** by: The User Interface Compiler (uic) |
6 | ** | 6 | ** |
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 "Prefs.h" | 9 | #include "Prefs.h" |
11 | 10 | ||
12 | #include <qcheckbox.h> | ||
13 | #include <qlabel.h> | 11 | #include <qlabel.h> |
14 | #include <qpushbutton.h> | ||
15 | #include <qspinbox.h> | ||
16 | #include <qlayout.h> | 12 | #include <qlayout.h> |
17 | #include <qvariant.h> | ||
18 | #include <qtooltip.h> | ||
19 | #include <qwhatsthis.h> | ||
20 | #include <qcombobox.h> | ||
21 | #include <qbuttongroup.h> | 13 | #include <qbuttongroup.h> |
22 | #include <qlineedit.h> | ||
23 | #ifdef USEQPE | 14 | #ifdef USEQPE |
24 | #include <qpe/menubutton.h> | 15 | #include <qpe/menubutton.h> |
25 | #include <qpe/fontdatabase.h> | 16 | #include <qpe/fontdatabase.h> |
26 | #else | 17 | #else |
27 | #include <qfontdatabase.h> | 18 | #include <qfontdatabase.h> |
28 | #endif | 19 | #endif |
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp index 03c8fbe..d64abb4 100644 --- a/noncore/apps/opie-reader/QTReader.cpp +++ b/noncore/apps/opie-reader/QTReader.cpp | |||
@@ -5,33 +5,26 @@ | |||
5 | ** | 5 | ** |
6 | ** This file is part of an example program for Qt. This example | 6 | ** This file is part of an example program for Qt. This example |
7 | ** program may be used, distributed and modified without limitation. | 7 | ** program may be used, distributed and modified without limitation. |
8 | ** | 8 | ** |
9 | *****************************************************************************/ | 9 | *****************************************************************************/ |
10 | 10 | ||
11 | #include "useqpe.h" | ||
12 | #include <qpainter.h> | ||
13 | #include <qimage.h> | ||
14 | #include <qtimer.h> | ||
15 | #include "config.h" | ||
16 | #include "QTReader.h" | 11 | #include "QTReader.h" |
17 | #include "QTReaderApp.h" | 12 | #include "QTReaderApp.h" |
18 | #include "CDrawBuffer.h" | ||
19 | #ifdef USEQPE | 13 | #ifdef USEQPE |
20 | #include <qpe/qpeapplication.h> | 14 | #include <qpe/qpeapplication.h> |
21 | #endif | 15 | #endif |
22 | #include <math.h> | 16 | #include <math.h> |
23 | #include <ctype.h> | 17 | #include <ctype.h> |
24 | #include <stdio.h> //for sprintf | 18 | #include <stdio.h> //for sprintf |
25 | #ifdef USEQPE | 19 | #ifdef USEQPE |
26 | #include <qpe/config.h> | 20 | #include <qpe/config.h> |
27 | #include <qpe/applnk.h> | 21 | #include <qpe/applnk.h> |
28 | #include <qpe/global.h> | 22 | #include <qpe/global.h> |
29 | #include <qpe/qcopenvelope_qws.h> | 23 | #include <qpe/qcopenvelope_qws.h> |
30 | #endif | 24 | #endif |
31 | #include <qfontdatabase.h> | ||
32 | 25 | ||
33 | #ifdef _UNICODE | 26 | #ifdef _UNICODE |
34 | const char *QTReader::fonts[] = { "unifont", "Courier", "Times", 0 }; | 27 | const char *QTReader::fonts[] = { "unifont", "Courier", "Times", 0 }; |
35 | #else | 28 | #else |
36 | const char *QTReader::fonts[] = { "Helvetica", "Courier", "Times", 0 }; | 29 | const char *QTReader::fonts[] = { "Helvetica", "Courier", "Times", 0 }; |
37 | #endif | 30 | #endif |
@@ -445,14 +438,12 @@ void QTReader::focusOutEvent(QFocusEvent* e) | |||
445 | { | 438 | { |
446 | timer->stop(); | 439 | timer->stop(); |
447 | //m_scrolldy1 = m_scrolldy2 = 0; | 440 | //m_scrolldy1 = m_scrolldy2 = 0; |
448 | } | 441 | } |
449 | } | 442 | } |
450 | 443 | ||
451 | #include <qapplication.h> | ||
452 | #include <qdrawutil.h> | ||
453 | #ifndef _WINDOWS | 444 | #ifndef _WINDOWS |
454 | #include <unistd.h> | 445 | #include <unistd.h> |
455 | #endif | 446 | #endif |
456 | 447 | ||
457 | void QTReader::goDown() | 448 | void QTReader::goDown() |
458 | { | 449 | { |
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index 07af597..e759249 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp | |||
@@ -76,13 +76,12 @@ | |||
76 | #endif | 76 | #endif |
77 | 77 | ||
78 | #include "QTReaderApp.h" | 78 | #include "QTReaderApp.h" |
79 | #include "CDrawBuffer.h" | 79 | #include "CDrawBuffer.h" |
80 | #include "Filedata.h" | 80 | #include "Filedata.h" |
81 | #include "opie.h" | 81 | #include "opie.h" |
82 | #include "useqpe.h" | ||
83 | #include "names.h" | 82 | #include "names.h" |
84 | #include "CEncoding_tables.h" | 83 | #include "CEncoding_tables.h" |
85 | #include "CloseDialog.h" | 84 | #include "CloseDialog.h" |
86 | 85 | ||
87 | bool CheckVersion(int&, int&, char&); | 86 | bool CheckVersion(int&, int&, char&); |
88 | 87 | ||
diff --git a/noncore/apps/opie-reader/ToolbarPrefs.cpp b/noncore/apps/opie-reader/ToolbarPrefs.cpp index d878829..0347736 100644 --- a/noncore/apps/opie-reader/ToolbarPrefs.cpp +++ b/noncore/apps/opie-reader/ToolbarPrefs.cpp | |||
@@ -3,26 +3,16 @@ | |||
3 | ** | 3 | ** |
4 | ** Created: Tue Feb 11 23:53:35 2003 | 4 | ** Created: Tue Feb 11 23:53:35 2003 |
5 | ** by: The User Interface Compiler (uic) | 5 | ** by: The User Interface Compiler (uic) |
6 | ** | 6 | ** |
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 | ||
12 | #include <qcheckbox.h> | ||
13 | #include <qlabel.h> | ||
14 | #include <qpushbutton.h> | ||
15 | #include <qspinbox.h> | ||
16 | #include <qlayout.h> | 11 | #include <qlayout.h> |
17 | #include <qvariant.h> | ||
18 | #include <qtooltip.h> | ||
19 | #include <qwhatsthis.h> | ||
20 | #include <qcombobox.h> | ||
21 | #include <qbuttongroup.h> | 12 | #include <qbuttongroup.h> |
22 | #include <qlineedit.h> | ||
23 | #ifdef USEQPE | 13 | #ifdef USEQPE |
24 | #include <qpe/menubutton.h> | 14 | #include <qpe/menubutton.h> |
25 | #endif | 15 | #endif |
26 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
27 | 17 | ||
28 | CBarPrefs::CBarPrefs(const QString& appdir, bool fs, QWidget* parent, const char* name) : QDialog(parent, name, true), config( appdir ) | 18 | CBarPrefs::CBarPrefs(const QString& appdir, bool fs, QWidget* parent, const char* name) : QDialog(parent, name, true), config( appdir ) |
diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp index 05f2c31..ebd14f3 100644 --- a/noncore/apps/opie-reader/fileBrowser.cpp +++ b/noncore/apps/opie-reader/fileBrowser.cpp | |||
@@ -9,25 +9,22 @@ Extensive modification by Tim Wentford to allow it to work in rotated mode | |||
9 | ****************************************************************************/ | 9 | ****************************************************************************/ |
10 | #include "fileBrowser.h" | 10 | #include "fileBrowser.h" |
11 | 11 | ||
12 | #include "QtrListView.h" | 12 | #include "QtrListView.h" |
13 | #include <qlineedit.h> | 13 | #include <qlineedit.h> |
14 | #include <qpushbutton.h> | 14 | #include <qpushbutton.h> |
15 | #include <qfile.h> | ||
16 | #include <qmessagebox.h> | ||
17 | #ifndef _WINDOWS | 15 | #ifndef _WINDOWS |
18 | #include <unistd.h> | 16 | #include <unistd.h> |
19 | #endif | 17 | #endif |
20 | #include <qlayout.h> | 18 | #include <qlayout.h> |
21 | #ifdef _WINDOWS | 19 | #ifdef _WINDOWS |
22 | #include <direct.h> | 20 | #include <direct.h> |
23 | #endif | 21 | #endif |
24 | 22 | ||
25 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
26 | 24 | ||
27 | #include "opie.h" | ||
28 | 25 | ||
29 | fileBrowser::fileBrowser( bool allownew, QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter, const QString iPath ) | 26 | fileBrowser::fileBrowser( bool allownew, QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter, const QString iPath ) |
30 | : QDialog( parent, name, true, | 27 | : QDialog( parent, name, true, |
31 | fl/* | WStyle_Customize | WStyle_Tool*/), | 28 | fl/* | WStyle_Customize | WStyle_Tool*/), |
32 | filterspec(QDir::All) | 29 | filterspec(QDir::All) |
33 | { | 30 | { |
diff --git a/noncore/apps/opie-reader/main.cpp b/noncore/apps/opie-reader/main.cpp index 3e1f5e7..6d706c4 100644 --- a/noncore/apps/opie-reader/main.cpp +++ b/noncore/apps/opie-reader/main.cpp | |||
@@ -4,14 +4,12 @@ | |||
4 | #else | 4 | #else |
5 | #include <qapplication.h> | 5 | #include <qapplication.h> |
6 | #endif | 6 | #endif |
7 | #include "QTReaderApp.h" | 7 | #include "QTReaderApp.h" |
8 | 8 | ||
9 | #include "signal.h" | 9 | #include "signal.h" |
10 | #include "stdio.h" | ||
11 | #include "time.h" | ||
12 | 10 | ||
13 | 11 | ||
14 | #ifdef USEQPE | 12 | #ifdef USEQPE |
15 | QTReaderApp* app = NULL; | 13 | QTReaderApp* app = NULL; |
16 | 14 | ||
17 | void handler(int signum) | 15 | void handler(int signum) |
diff --git a/noncore/apps/opie-reader/plucker.cpp b/noncore/apps/opie-reader/plucker.cpp index e49e35f..e52fd6a 100644 --- a/noncore/apps/opie-reader/plucker.cpp +++ b/noncore/apps/opie-reader/plucker.cpp | |||
@@ -1,27 +1,22 @@ | |||
1 | #include "useqpe.h" | ||
2 | #include <stdio.h> | 1 | #include <stdio.h> |
3 | #include <string.h> | 2 | #include <string.h> |
4 | #include <qmessagebox.h> | ||
5 | #include <qpixmap.h> | ||
6 | #ifdef USEQPE | 3 | #ifdef USEQPE |
7 | #include <qpe/qcopenvelope_qws.h> | 4 | #include <qpe/qcopenvelope_qws.h> |
8 | #endif | 5 | #endif |
9 | #ifdef LOCALPICTURES | 6 | #ifdef LOCALPICTURES |
10 | #include <qscrollview.h> | 7 | #include <qscrollview.h> |
11 | #endif | 8 | #endif |
12 | #ifdef USEQPE | 9 | #ifdef USEQPE |
13 | #include <qpe/global.h> | 10 | #include <qpe/global.h> |
14 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
15 | #else | 12 | #else |
16 | #include <qapplication.h> | 13 | #include <qapplication.h> |
17 | #endif | 14 | #endif |
18 | #include <qclipboard.h> | ||
19 | 15 | ||
20 | #include "plucker.h" | 16 | #include "plucker.h" |
21 | #include "Aportis.h" | ||
22 | #include "Palm2QImage.h" | 17 | #include "Palm2QImage.h" |
23 | 18 | ||
24 | 19 | ||
25 | struct CPlucker_dataRecord | 20 | struct CPlucker_dataRecord |
26 | { | 21 | { |
27 | UInt16 uid; | 22 | UInt16 uid; |
diff --git a/noncore/apps/opie-reader/plucker_base.cpp b/noncore/apps/opie-reader/plucker_base.cpp index 9047a45..caa945d 100644 --- a/noncore/apps/opie-reader/plucker_base.cpp +++ b/noncore/apps/opie-reader/plucker_base.cpp | |||
@@ -1,21 +1,18 @@ | |||
1 | #include "useqpe.h" | 1 | #include "useqpe.h" |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <qmessagebox.h> | ||
5 | #include <qpixmap.h> | ||
6 | #ifdef USEQPE | 4 | #ifdef USEQPE |
7 | #include <qpe/qcopenvelope_qws.h> | 5 | #include <qpe/qcopenvelope_qws.h> |
8 | #endif /* USEQPE */ | 6 | #endif /* USEQPE */ |
9 | #ifdef LOCALPICTURES | 7 | #ifdef LOCALPICTURES |
10 | #include <qscrollview.h> | 8 | #include <qscrollview.h> |
11 | #endif | 9 | #endif |
12 | #ifdef USEQPE | 10 | #ifdef USEQPE |
13 | #include <qpe/global.h> | 11 | #include <qpe/global.h> |
14 | #endif /* USEQPE */ | 12 | #endif /* USEQPE */ |
15 | #include <qclipboard.h> | ||
16 | #ifndef USEQPE | 13 | #ifndef USEQPE |
17 | #include <qapplication.h> | 14 | #include <qapplication.h> |
18 | #else /* USEQPE */ | 15 | #else /* USEQPE */ |
19 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
20 | #endif /* USEQPE */ | 17 | #endif /* USEQPE */ |
21 | 18 | ||
@@ -542,13 +539,12 @@ CList<Bkmk>* CPlucker_base::getbkmklist() | |||
542 | //qDebug("Found:%d, %u", i , thishdr_type); | 539 | //qDebug("Found:%d, %u", i , thishdr_type); |
543 | } | 540 | } |
544 | */ | 541 | */ |
545 | return NULL; | 542 | return NULL; |
546 | } | 543 | } |
547 | 544 | ||
548 | #include <qnamespace.h> | ||
549 | 545 | ||
550 | QImage* CPlucker_base::expandimg(UInt16 tgt, bool border) | 546 | QImage* CPlucker_base::expandimg(UInt16 tgt, bool border) |
551 | { | 547 | { |
552 | QImage* qimage = getimg(tgt); | 548 | QImage* qimage = getimg(tgt); |
553 | QImage* ret; | 549 | QImage* ret; |
554 | if (qimage == NULL) return NULL; | 550 | if (qimage == NULL) return NULL; |
@@ -677,13 +673,12 @@ unsigned short CPlucker_base::finduid(unsigned short urlid) | |||
677 | return jmax; | 673 | return jmax; |
678 | } | 674 | } |
679 | //qDebug("Couldn't find %u", urlid); | 675 | //qDebug("Couldn't find %u", urlid); |
680 | return 0; // Not found! | 676 | return 0; // Not found! |
681 | } | 677 | } |
682 | 678 | ||
683 | #include <qnamespace.h> | ||
684 | 679 | ||
685 | void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen) | 680 | void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen) |
686 | { | 681 | { |
687 | unsigned short sz = 0; | 682 | unsigned short sz = 0; |
688 | for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++) | 683 | for (CList<unsigned long>::iterator it = visited.begin(); it != visited.end(); it++) |
689 | { | 684 | { |
diff --git a/noncore/apps/opie-reader/ppm.cpp b/noncore/apps/opie-reader/ppm.cpp index e8bf110..1face46 100644 --- a/noncore/apps/opie-reader/ppm.cpp +++ b/noncore/apps/opie-reader/ppm.cpp | |||
@@ -1,9 +1,8 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | #include "arith.h" | ||
4 | #include "ppm.h" | 3 | #include "ppm.h" |
5 | 4 | ||
6 | /**************************************************************************** | 5 | /**************************************************************************** |
7 | * Gestion des noeuds | 6 | * Gestion des noeuds |
8 | ****************************************************************************/ | 7 | ****************************************************************************/ |
9 | 8 | ||
diff --git a/noncore/apps/opie-reader/version.cpp b/noncore/apps/opie-reader/version.cpp index 3796b67..864e4c1 100644 --- a/noncore/apps/opie-reader/version.cpp +++ b/noncore/apps/opie-reader/version.cpp | |||
@@ -1,9 +1,7 @@ | |||
1 | #include "version.h" | 1 | #include "version.h" |
2 | #include "names.h" | ||
3 | #include <qmessagebox.h> | ||
4 | 2 | ||
5 | bool CheckVersion(int& major, int& bkmktype, char& minor) | 3 | bool CheckVersion(int& major, int& bkmktype, char& minor) |
6 | { | 4 | { |
7 | if ( | 5 | if ( |
8 | (major != MAJOR) | 6 | (major != MAJOR) |
9 | || | 7 | || |