Incorporated TimWs current source tree and make it compile

1 files changed, 14 insertions, 11 deletions

diff --git a/noncore/apps/opie-reader/ppm_expander.h b/noncore/apps/opie-reader/ppm_expander.h
index 4278c82..002de86 100644
--- a/noncore/apps/opie-reader/ppm_expander.h
+++ b/noncore/apps/opie-reader/ppm_expander.h
@@ -1,7 +1,8 @@
 #ifndef __ppm_expander_h
 #define __ppm_expander_h
-
+

+#include "useqpe.h"
 #include "CExpander.h"
 #include <sys/stat.h>
 
 
@@ -25,32 +26,34 @@ class ppm_expander : public CExpander {
   FILE* my_file_in;
   PPM_ReadBuf* my_read_buf;
   ppm_worker ppm;
 public:
-  virtual void suspend()
+#ifdef USEQPE

+        void suspend()
       {
           CExpander::suspend(my_file_in);
       }
-  virtual void unsuspend()
+  void unsuspend()
       {
           CExpander::unsuspend(my_file_in);
-      }
+      }

+#endif
   ppm_expander() : needppmend(false), my_file_in(NULL), my_read_buf(NULL)
     {
     bufsize = 1024;
     buf_in = new UCHAR[bufsize];
     buf_out = new UCHAR[bufsize];
     outbytes = 0;
   }
-  virtual int OpenFile(const char* infile);
-  virtual int getch();
+  int OpenFile(const char* infile);
+  int getch();
   int locate(unsigned short block, unsigned int n);
   virtual ~ppm_expander();
-  virtual unsigned int locate() { return outbytes; }
-  virtual void locate(unsigned int n);
-  virtual bool hasrandomaccess() { return (numblocks > 1); }
-  virtual void sizes(unsigned long& file, unsigned long& text);
-  virtual MarkupType PreferredMarkup()
+  unsigned int locate() { return outbytes; }
+  void locate(unsigned int n);
+  bool hasrandomaccess() { return (numblocks > 1); }
+  void sizes(unsigned long& file, unsigned long& text);
+  MarkupType PreferredMarkup()
       {
           return cTEXT;
       }
 };