summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-reader
Unidiff
Diffstat (limited to 'noncore/apps/opie-reader') (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/opie-reader/Bkmks.cpp2
-rw-r--r--noncore/apps/opie-reader/BuffDoc.cpp4
-rw-r--r--noncore/apps/opie-reader/CDrawBuffer.cpp4
-rw-r--r--noncore/apps/opie-reader/CEncoding_tables.cpp1
-rw-r--r--noncore/apps/opie-reader/CFilter.cpp1
-rw-r--r--noncore/apps/opie-reader/FontControl.cpp2
-rw-r--r--noncore/apps/opie-reader/Palm2QImage.cpp1
-rw-r--r--noncore/apps/opie-reader/Prefs.cpp9
-rw-r--r--noncore/apps/opie-reader/QTReader.cpp9
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp1
-rw-r--r--noncore/apps/opie-reader/ToolbarPrefs.cpp10
-rw-r--r--noncore/apps/opie-reader/fileBrowser.cpp3
-rw-r--r--noncore/apps/opie-reader/main.cpp2
-rw-r--r--noncore/apps/opie-reader/plucker.cpp5
-rw-r--r--noncore/apps/opie-reader/plucker_base.cpp5
-rw-r--r--noncore/apps/opie-reader/ppm.cpp1
-rw-r--r--noncore/apps/opie-reader/version.cpp2
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
@@ -2,8 +2,6 @@
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"
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,13 +1,9 @@
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"
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,11 +1,7 @@
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
10CDrawBuffer::~CDrawBuffer() 6CDrawBuffer::~CDrawBuffer()
11{ 7{
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,5 +1,4 @@
1#include "CEncoding_tables.h" 1#include "CEncoding_tables.h"
2#include "config.h"
3 2
4static const unicodetable unicodevalues[] = { 3static 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
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,4 +1,3 @@
1#include "CDrawBuffer.h"
2#include "CFilter.h" 1#include "CFilter.h"
3 2
4unsigned short striphtml::skip_ws() 3unsigned short striphtml::skip_ws()
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,5 +1,3 @@
1#include "opie.h"
2#include "useqpe.h"
3#include "FontControl.h" 1#include "FontControl.h"
4 2
5int FontControl::gzoom() 3int FontControl::gzoom()
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,5 +1,4 @@
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>
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
@@ -6,20 +6,11 @@
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>
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
@@ -8,14 +8,8 @@
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
@@ -28,7 +22,6 @@
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
34const char *QTReader::fonts[] = { "unifont", "Courier", "Times", 0 }; 27const char *QTReader::fonts[] = { "unifont", "Courier", "Times", 0 };
@@ -448,8 +441,6 @@ void QTReader::focusOutEvent(QFocusEvent* e)
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
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
@@ -79,7 +79,6 @@
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"
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
@@ -6,20 +6,10 @@
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
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
@@ -12,8 +12,6 @@ Extensive modification by Tim Wentford to allow it to work in rotated mode
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
@@ -24,7 +22,6 @@ Extensive modification by Tim Wentford to allow it to work in rotated mode
24 22
25#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
26 24
27#include "opie.h"
28 25
29fileBrowser::fileBrowser( bool allownew, QWidget* parent, const char* name, bool modal, WFlags fl , const QString filter, const QString iPath ) 26fileBrowser::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,
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
@@ -7,8 +7,6 @@
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
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,8 +1,5 @@
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
@@ -15,10 +12,8 @@
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
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,8 +1,6 @@
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 */
@@ -12,7 +10,6 @@
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 */
@@ -545,7 +542,6 @@ CList<Bkmk>* CPlucker_base::getbkmklist()
545 return NULL; 542 return NULL;
546} 543}
547 544
548#include <qnamespace.h>
549 545
550QImage* CPlucker_base::expandimg(UInt16 tgt, bool border) 546QImage* CPlucker_base::expandimg(UInt16 tgt, bool border)
551{ 547{
@@ -680,7 +676,6 @@ unsigned short CPlucker_base::finduid(unsigned short urlid)
680 return 0; // Not found! 676 return 0; // Not found!
681} 677}
682 678
683#include <qnamespace.h>
684 679
685void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen) 680void CPlucker_base::setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen)
686{ 681{
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,6 +1,5 @@
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/****************************************************************************
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,6 +1,4 @@
1#include "version.h" 1#include "version.h"
2#include "names.h"
3#include <qmessagebox.h>
4 2
5bool CheckVersion(int& major, int& bkmktype, char& minor) 3bool CheckVersion(int& major, int& bkmktype, char& minor)
6{ 4{