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
@@ -1,13 +1,12 @@
 /*
   Derived from makedoc9 by Pat Beirne
 */
 
 #ifndef __Aportis_h
 #define __Aportis_h
-#include "useqpe.h"
 #include "CExpander.h"
 #include "pdb.h"
 
 typedef UInt32 DWORD;
 typedef UInt16 WORD;
 
@@ -57,39 +56,31 @@ inline WORD SwapWord(WORD r)
 
 inline DWORD SwapLong(DWORD r)
 {
         return  ((r>>24) & 0xFF) + (r<<24) + ((r>>8) & 0xFF00) + ((r<<8) & 0xFF0000);
 }
 
-class Aportis : public CExpander, Cpdb {
-    bool peanutfile;
+class Aportis : public Cpdb {
+    bool peanutfile, html;
     void dePeanut(int&);
   DWORD dwLen;
   WORD nRecs2;
   DWORD dwTLen;
   WORD nRecs;
   WORD BlockSize;
   DWORD dwRecLen;
+  WORD mobiimagerec;
   int currentrec, currentpos;
   unsigned int cbptr;
   unsigned int outptr;
   unsigned char circbuf[2048];
   char bCompressed;
 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;
       _text = dwTLen;
     }
   bool hasrandomaccess() { return true; }
   virtual ~Aportis() {}
   Aportis();
@@ -97,14 +88,16 @@ public:
   int getch();
   unsigned int locate();
   void locate(unsigned int n);
   CList<Bkmk>* getbkmklist();
   MarkupType PreferredMarkup()
       {
-          return (peanutfile) ? cPML : cTEXT;
+          return (peanutfile) ? cPML : ((html) ? cHTML : cTEXT);
       }
+  QImage* getPicture(unsigned long);
+  QString about() { return QString("AportisDoc codec (c) Tim Wentford"); }
 private:
   bool refreshbuffer();
   unsigned int GetBS(unsigned int bn);
 };
 
 #endif