1 files changed, 7 insertions, 14 deletions

diff --git a/noncore/apps/opie-reader/Aportis.h b/noncore/apps/opie-reader/Aportis.h
index 202a36f..5e9d1da 100644
--- a/noncore/apps/opie-reader/Aportis.h
+++ b/noncore/apps/opie-reader/Aportis.h
@@ -6,3 +6,2 @@
 #define __Aportis_h
-#include "useqpe.h"
 #include "CExpander.h"
@@ -62,4 +61,4 @@ inline DWORD SwapLong(DWORD r)
 
-class Aportis : public CExpander, Cpdb {
-    bool peanutfile;
+class Aportis : public Cpdb {
+    bool peanutfile, html;
     void dePeanut(int&);
@@ -71,2 +70,3 @@ class Aportis : public CExpander, Cpdb {
   DWORD dwRecLen;
+  WORD mobiimagerec;
   int currentrec, currentpos;
@@ -77,14 +77,5 @@ class Aportis : public CExpander, Cpdb {
 public:
-#ifdef USEQPE

-        void suspend()
-      {
-          CExpander::suspend(fin);
-      }
-  void unsuspend()
-      {
-          CExpander::unsuspend(fin);
-      }

-#endif
   void sizes(unsigned long& _file, unsigned long& _text)
     {
+      qDebug("Calling aportis sizes:(%u,%u,%u)", dwTLen, nRecs, BlockSize);
       _file = dwLen;
@@ -102,4 +93,6 @@ public:
       {
-          return (peanutfile) ? cPML : cTEXT;
+          return (peanutfile) ? cPML : ((html) ? cHTML : cTEXT);
       }
+  QImage* getPicture(unsigned long);
+  QString about() { return QString("AportisDoc codec (c) Tim Wentford"); }
 private: