1 files changed, 14 insertions, 12 deletions

diff --git a/noncore/apps/opie-reader/Aportis.h b/noncore/apps/opie-reader/Aportis.h
index af1fd3b..202a36f 100644
--- a/noncore/apps/opie-reader/Aportis.h
+++ b/noncore/apps/opie-reader/Aportis.h
@@ -1,31 +1,31 @@
 /*
   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;
 
 #define DISP_BITS 11
 #define COUNT_BITS 3
 /*
 // all numbers in these structs are big-endian, MAC format
 struct tDocHeader {
 	char sName[32];
 	DWORD dwUnknown1;
 	DWORD dwTime1;
 	DWORD dwTime2;
 	DWORD dwTime3;
 	DWORD dwLastSync;
 	DWORD ofsSort;
 	DWORD ofsCatagories;
 	DWORD dwCreator;
 	DWORD dwType;
 	DWORD dwUnknown2;
 	DWORD dwUnknown3;
 	WORD  wNumRecs;
@@ -54,55 +54,57 @@ inline WORD SwapWord(WORD r)
 {
 	return (r>>8) + (r<<8);
 }
 
 inline DWORD SwapLong(DWORD r)
 {
 	return  ((r>>24) & 0xFF) + (r<<24) + ((r>>8) & 0xFF00) + ((r<<8) & 0xFF0000);
 }
 
 class Aportis : public CExpander, Cpdb {
     bool peanutfile;
     void dePeanut(int&);
   DWORD dwLen;
   WORD nRecs2;
   DWORD dwTLen;
   WORD nRecs;
   WORD BlockSize;
   DWORD dwRecLen;
   int currentrec, currentpos;
   unsigned int cbptr;
   unsigned int outptr;
   unsigned char circbuf[2048];
   char bCompressed;
 public:
-  virtual void suspend()
+#ifdef USEQPE

+	void suspend()
       {
 	  CExpander::suspend(fin);
       }
-  virtual void unsuspend()
+  void unsuspend()
       {
 	  CExpander::unsuspend(fin);
-      }
-  virtual void sizes(unsigned long& _file, unsigned long& _text)
+      }

+#endif
+  void sizes(unsigned long& _file, unsigned long& _text)
     {
       _file = dwLen;
       _text = dwTLen;
     }
-  virtual bool hasrandomaccess() { return true; }
+  bool hasrandomaccess() { return true; }
   virtual ~Aportis() {}
   Aportis();
-  virtual int OpenFile(const char *src);
-  virtual int getch();
-  virtual unsigned int locate();
-  virtual void locate(unsigned int n);
-  virtual CList<Bkmk>* getbkmklist();
-  virtual MarkupType PreferredMarkup()
+  int OpenFile(const char *src);
+  int getch();
+  unsigned int locate();
+  void locate(unsigned int n);
+  CList<Bkmk>* getbkmklist();
+  MarkupType PreferredMarkup()
       {
 	  return (peanutfile) ? cPML : cTEXT;
       }
 private:
   bool refreshbuffer();
   unsigned int GetBS(unsigned int bn);
 };
 
 #endif