-rw-r--r-- | noncore/apps/opie-reader/ZText.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-reader/plucker.h | 24 | ||||
-rw-r--r-- | noncore/apps/opie-reader/ztxt.h | 32 |
3 files changed, 30 insertions, 30 deletions
diff --git a/noncore/apps/opie-reader/ZText.h b/noncore/apps/opie-reader/ZText.h index 9e72161..debfe8c 100644 --- a/noncore/apps/opie-reader/ZText.h +++ b/noncore/apps/opie-reader/ZText.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __Text_h | 1 | #ifndef __Text_h |
2 | #define __Text_h | 2 | #define __Text_h |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <zlib.h> | 4 | #include "zlib/zlib.h" |
5 | #include <sys/stat.h> | 5 | #include <sys/stat.h> |
6 | 6 | ||
7 | #include "CExpander.h" | 7 | #include "CExpander.h" |
@@ -33,7 +33,7 @@ public: | |||
33 | } | 33 | } |
34 | virtual MarkupType PreferredMarkup() | 34 | virtual MarkupType PreferredMarkup() |
35 | { | 35 | { |
36 | return cTEXT; | 36 | return cTEXT; |
37 | } | 37 | } |
38 | }; | 38 | }; |
39 | #endif | 39 | #endif |
diff --git a/noncore/apps/opie-reader/plucker.h b/noncore/apps/opie-reader/plucker.h index 84e855c..d3ca732 100644 --- a/noncore/apps/opie-reader/plucker.h +++ b/noncore/apps/opie-reader/plucker.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define __plucker_h | 2 | #define __plucker_h |
3 | 3 | ||
4 | #include "CExpander.h" | 4 | #include "CExpander.h" |
5 | #include <zlib.h> | 5 | #include "zlib/zlib.h" |
6 | #include "ztxt.h" | 6 | #include "ztxt.h" |
7 | #include "pdb.h" | 7 | #include "pdb.h" |
8 | #include "CBuffer.h" | 8 | #include "CBuffer.h" |
@@ -58,17 +58,17 @@ class CPlucker : public CExpander, Cpdb | |||
58 | int bgetch(); | 58 | int bgetch(); |
59 | public: | 59 | public: |
60 | virtual void sizes(unsigned long& _file, unsigned long& _text) | 60 | virtual void sizes(unsigned long& _file, unsigned long& _text) |
61 | { | 61 | { |
62 | _file = file_length; | 62 | _file = file_length; |
63 | _text = textlength; | 63 | _text = textlength; |
64 | //ntohl(hdr0.size); | 64 | //ntohl(hdr0.size); |
65 | } | 65 | } |
66 | virtual bool hasrandomaccess() { return true; } | 66 | virtual bool hasrandomaccess() { return true; } |
67 | virtual ~CPlucker() | 67 | virtual ~CPlucker() |
68 | { | 68 | { |
69 | if (expandedtextbuffer != NULL) delete [] expandedtextbuffer; | 69 | if (expandedtextbuffer != NULL) delete [] expandedtextbuffer; |
70 | if (compressedtextbuffer != NULL) delete [] compressedtextbuffer; | 70 | if (compressedtextbuffer != NULL) delete [] compressedtextbuffer; |
71 | } | 71 | } |
72 | CPlucker(); | 72 | CPlucker(); |
73 | virtual int openfile(const char *src); | 73 | virtual int openfile(const char *src); |
74 | virtual int getch(); | 74 | virtual int getch(); |
@@ -78,9 +78,9 @@ class CPlucker : public CExpander, Cpdb | |||
78 | virtual CList<Bkmk>* getbkmklist(); | 78 | virtual CList<Bkmk>* getbkmklist(); |
79 | virtual bool hyperlink(unsigned int n); | 79 | virtual bool hyperlink(unsigned int n); |
80 | virtual MarkupType PreferredMarkup() | 80 | virtual MarkupType PreferredMarkup() |
81 | { | 81 | { |
82 | return cNONE; | 82 | return cNONE; |
83 | } | 83 | } |
84 | }; | 84 | }; |
85 | 85 | ||
86 | #endif | 86 | #endif |
diff --git a/noncore/apps/opie-reader/ztxt.h b/noncore/apps/opie-reader/ztxt.h index 7be45c0..20558a6 100644 --- a/noncore/apps/opie-reader/ztxt.h +++ b/noncore/apps/opie-reader/ztxt.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define __ztxt_h | 2 | #define __ztxt_h |
3 | 3 | ||
4 | #include "CExpander.h" | 4 | #include "CExpander.h" |
5 | #include <zlib.h> | 5 | #include "zlib/zlib.h" |
6 | #include "pdb.h" | 6 | #include "pdb.h" |
7 | /* | 7 | /* |
8 | * Stuff common to both Weasel Reader and makeztxt | 8 | * Stuff common to both Weasel Reader and makeztxt |
@@ -76,20 +76,20 @@ class ztxt : public CExpander, Cpdb | |||
76 | void home(); | 76 | void home(); |
77 | public: | 77 | public: |
78 | virtual void sizes(unsigned long& _file, unsigned long& _text) | 78 | virtual void sizes(unsigned long& _file, unsigned long& _text) |
79 | { | 79 | { |
80 | _file = file_length; | 80 | _file = file_length; |
81 | _text = ntohl(hdr0.size); | 81 | _text = ntohl(hdr0.size); |
82 | } | 82 | } |
83 | virtual bool hasrandomaccess() { return (hdr0.randomAccess != 0); } | 83 | virtual bool hasrandomaccess() { return (hdr0.randomAccess != 0); } |
84 | virtual ~ztxt() | 84 | virtual ~ztxt() |
85 | { | 85 | { |
86 | if (expandedtextbuffer != NULL) delete [] expandedtextbuffer; | 86 | if (expandedtextbuffer != NULL) delete [] expandedtextbuffer; |
87 | if (compressedtextbuffer != NULL) delete [] compressedtextbuffer; | 87 | if (compressedtextbuffer != NULL) delete [] compressedtextbuffer; |
88 | if (bInit) | 88 | if (bInit) |
89 | { | 89 | { |
90 | inflateEnd(&zstream); | 90 | inflateEnd(&zstream); |
91 | } | 91 | } |
92 | } | 92 | } |
93 | ztxt(); | 93 | ztxt(); |
94 | virtual int openfile(const char *src); | 94 | virtual int openfile(const char *src); |
95 | virtual int getch(); | 95 | virtual int getch(); |
@@ -97,9 +97,9 @@ class ztxt : public CExpander, Cpdb | |||
97 | virtual void locate(unsigned int n); | 97 | virtual void locate(unsigned int n); |
98 | virtual CList<Bkmk>* getbkmklist(); | 98 | virtual CList<Bkmk>* getbkmklist(); |
99 | virtual MarkupType PreferredMarkup() | 99 | virtual MarkupType PreferredMarkup() |
100 | { | 100 | { |
101 | return cTEXT; | 101 | return cTEXT; |
102 | } | 102 | } |
103 | }; | 103 | }; |
104 | 104 | ||
105 | #endif | 105 | #endif |