1 files changed, 16 insertions, 20 deletions

diff --git a/noncore/apps/opie-reader/plucker_base.h b/noncore/apps/opie-reader/plucker_base.h
index 131b999..8d74cc2 100644
--- a/noncore/apps/opie-reader/plucker_base.h
+++ b/noncore/apps/opie-reader/plucker_base.h
@@ -3,3 +3,2 @@
 
-#include "useqpe.h"
 #include "CExpander.h"
@@ -11,2 +10,3 @@
 #include "Navigation.h"
+#include "hrule.h"
 
@@ -29,6 +29,8 @@ class QWidget;
 #endif
+class QString;
 
-class CPlucker_base : public CExpander, public Cpdb
+class CPlucker_base : public Cpdb
 {
 protected:
+  static const UInt8 continuation_bit;
     virtual void setbuffersize() = 0;
@@ -45,3 +47,3 @@ protected:
 #endif
-    size_t textlength, m_lastBreak;
+    size_t textlength, m_lastBreak, m_offset;
     UInt16 uid;
@@ -61,3 +63,3 @@ protected:
     size_t bufferpos;
-    UInt16 bufferrec;
+    int bufferrec;
     CPlucker_record0 hdr0;
@@ -66,4 +68,7 @@ protected:
     bool expand(int);
-    void UnZip(UInt8*, size_t, UInt8*, size_t);
-    void UnDoc(UInt8*, size_t, UInt8*, size_t);
+    static void UnZip(UInt8*, size_t, UInt8*, size_t);
+    static void UnDoc(UInt8*, size_t, UInt8*, size_t);
+
+    void (*m_decompress)(UInt8*, size_t, UInt8*, size_t);
+    void (*getdecompressor(const QString& _s))(UInt8*, size_t, UInt8*, size_t);
 #ifdef LOCALPICTURES
@@ -77,12 +82,3 @@ protected:
  public:
-#ifdef USEQPE
-         void suspend()
-      {
-          CExpander::suspend(fin);
-      }
-  void unsuspend()
-      {
-          CExpander::unsuspend(fin);
-      }
-#endif
+    QString about();
     QImage* getPicture(unsigned long tgt);
@@ -96,3 +92,3 @@ protected:
     int getch();
-    void getch(tchar&, CStyle&);
+    void getch(tchar&, CStyle&, unsigned long& pos);
     unsigned int locate();
@@ -100,3 +96,3 @@ protected:
     CList<Bkmk>* getbkmklist();
-    linkType hyperlink(unsigned int n, QString&);
+    linkType hyperlink(unsigned int, unsigned int, QString&, QString&);
     MarkupType PreferredMarkup()
@@ -107,4 +103,4 @@ protected:
     void writeposn(size_t posn) { m_nav.writeposn(posn); }
-    bool forward(size_t& loc) { return m_nav.forward(loc); }
-    bool back(size_t& loc) { return m_nav.back(loc); }
+    linkType forward(size_t& loc) { return (m_nav.forward(loc)) ? eLink : eNone; }
+    linkType back(size_t& loc) { return (m_nav.back(loc)) ? eLink : eNone; }
     bool hasnavigation() { return true; }