1 files changed, 8 insertions, 18 deletions

diff --git a/noncore/apps/opie-reader/ztxt.h b/noncore/apps/opie-reader/ztxt.h
index 709a055..f544b01 100644
--- a/noncore/apps/opie-reader/ztxt.h
+++ b/noncore/apps/opie-reader/ztxt.h
@@ -2,12 +2,11 @@
 #define __ztxt_h
 
-#include "useqpe.h"

 #include "CExpander.h"
 #include <zlib.h>
 #include "pdb.h"
-#ifdef _WINDOWS

-#include <winsock.h>

-#endif

-

+#ifdef _WINDOWS
+#include <winsock.h>
+#endif
+
 /*
  * Stuff common to both Weasel Reader and makeztxt
@@ -23,5 +22,5 @@
 /* Padding is no good */
 #if defined(__GNUC__) && defined(__UNIX__)
-#  pragma pack(2)
+//#  pragma pack(2)
 #endif
 
@@ -59,5 +58,5 @@ struct zTXTbkmk
 {
     UInt32 offset;
-    tchar title[MAX_BMRK_LENGTH];
+    unsigned char title[MAX_BMRK_LENGTH];
 };
 
@@ -67,5 +66,5 @@ struct zTXTbkmk
 const UInt32 ZTXT_ID = 0x5458547a;
 
-class ztxt : public CExpander, Cpdb
+class ztxt : public Cpdb
 {
     bool bInit;
@@ -81,14 +80,5 @@ class ztxt : public CExpander, Cpdb
     void home();
 public:
-#ifdef USEQPE

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

-#endif
+    QString about() { return QString("Weasel codec (c) Tim Wentford"); }
     void sizes(unsigned long& _file, unsigned long& _text)
         {