-rw-r--r-- | noncore/apps/opie-reader/CExpander.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/noncore/apps/opie-reader/CExpander.h b/noncore/apps/opie-reader/CExpander.h index 9fae245..553069c 100644 --- a/noncore/apps/opie-reader/CExpander.h +++ b/noncore/apps/opie-reader/CExpander.h | |||
@@ -1,28 +1,35 @@ | |||
1 | #ifndef __CExpander_h | 1 | #ifndef __CExpander_h |
2 | #define __CExpander_h | 2 | #define __CExpander_h |
3 | 3 | ||
4 | #ifndef _WINDOWS | ||
5 | #include <unistd.h> | ||
6 | #endif | ||
7 | #include <stdio.h> | ||
8 | #include <time.h> | ||
9 | #include <qmessagebox.h> | ||
10 | #include "useqpe.h" | 4 | #include "useqpe.h" |
11 | #include "config.h" | 5 | #include "config.h" |
12 | #include "StyleConsts.h" | 6 | #include "StyleConsts.h" |
13 | #include "Markups.h" | 7 | #include "Markups.h" |
14 | #include "names.h" | 8 | #include "names.h" |
15 | #include "linktype.h" | 9 | #include "linktype.h" |
16 | 10 | ||
11 | /* OPIE */ | ||
12 | #include <opie2/odebug.h> | ||
13 | |||
14 | /* QT */ | ||
15 | #include <qmessagebox.h> | ||
16 | |||
17 | /* STD */ | ||
18 | #ifndef _WINDOWS | ||
19 | #include <unistd.h> | ||
20 | #endif | ||
21 | #include <stdio.h> | ||
22 | #include <time.h> | ||
23 | |||
17 | class QImage; | 24 | class QImage; |
18 | class Bkmk; | 25 | class Bkmk; |
19 | 26 | ||
20 | template<class T> | 27 | template<class T> |
21 | class CList; | 28 | class CList; |
22 | 29 | ||
23 | class CCharacterSource | 30 | class CCharacterSource |
24 | { | 31 | { |
25 | public: | 32 | public: |
26 | virtual void getch(tchar&, CStyle&) = 0; | 33 | virtual void getch(tchar&, CStyle&) = 0; |
27 | virtual linkType hyperlink(unsigned int n, QString&) = 0; | 34 | virtual linkType hyperlink(unsigned int n, QString&) = 0; |
28 | }; | 35 | }; |
@@ -134,18 +141,18 @@ class CExpander | |||
134 | } | 141 | } |
135 | #endif | 142 | #endif |
136 | virtual void setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen) | 143 | virtual void setSaveData(unsigned char*& data, unsigned short& len, unsigned char* src, unsigned short srclen) |
137 | { | 144 | { |
138 | len = srclen; | 145 | len = srclen; |
139 | data = new unsigned char[len]; | 146 | data = new unsigned char[len]; |
140 | memcpy(data, src, len); | 147 | memcpy(data, src, len); |
141 | } | 148 | } |
142 | virtual void putSaveData(unsigned char*& src, unsigned short& srclen) | 149 | virtual void putSaveData(unsigned char*& src, unsigned short& srclen) |
143 | { | 150 | { |
144 | if (srclen != 0) | 151 | if (srclen != 0) |
145 | { | 152 | { |
146 | qDebug("Don't know what to do with non-zero save data"); | 153 | odebug << "Don't know what to do with non-zero save data" << oendl; |
147 | } | 154 | } |
148 | } | 155 | } |
149 | void setwidth(int w) { m_scrWidth = w; } | 156 | void setwidth(int w) { m_scrWidth = w; } |
150 | }; | 157 | }; |
151 | #endif | 158 | #endif |