1 files changed, 20 insertions, 5 deletions

diff --git a/noncore/apps/opie-reader/BuffDoc.h b/noncore/apps/opie-reader/BuffDoc.h
index 2b4fb57..d6bfd99 100644
--- a/noncore/apps/opie-reader/BuffDoc.h
+++ b/noncore/apps/opie-reader/BuffDoc.h
@@ -44,16 +44,14 @@ class BuffDoc
 	    {
 		exp->putSaveData(src, srclen);
 	    }
 	}
 #ifdef USEQPE
     void suspend() { if (exp != NULL) exp->suspend(); }
-    void unsuspend() { if (exp != NULL) exp->unsuspend(); }
 #else
     void suspend() {}
-    void unsuspend() {}
 #endif
     ~BuffDoc()
 	{
 	    delete filt;
 	    delete exp;
 	}
@@ -92,16 +90,28 @@ class BuffDoc
 	    {
 		filt->getch(ch, sty, pos);
 	    }
 	    else
 		ch = UEOF;
 	}
+    /*
+    void rawgetch(tchar& ch, CStyle& sty, unsigned long& pos)
+	{
+	    if (exp != NULL)
+	    {
+		filt->rawgetch(ch, sty, pos);
+	    }
+	    else
+		ch = UEOF;
+	}
+    */
     void setwidth(int w) { if (exp != NULL) exp->setwidth(w); }
     QImage* getPicture(unsigned long tgt) { return (exp == NULL) ? NULL : exp->getPicture(tgt); }
     unsigned int startSection() { return (exp == NULL) ? 0 : exp->startSection(); }
     unsigned int endSection() { return (exp == NULL) ? 0 : exp->endSection(); }
+    void resetPos();
     unsigned int locate() { return (exp == NULL) ? 0 : laststartline; }
     unsigned int explocate() { return (exp == NULL) ? 0 : exp->locate(); }
     void setContinuous(bool _b) { if (exp != NULL) exp->setContinuous(_b); }
     MarkupType PreferredMarkup() { return (exp == NULL) ? cTEXT : exp->PreferredMarkup(); }
     linkType hyperlink(unsigned int n, unsigned int noff, QString& wrd, QString& nm);
     size_t getHome() { return ((exp != NULL) ? exp->getHome() : 0); }
@@ -126,18 +136,23 @@ class BuffDoc
 	    while ((ch = getch()) != 10 && ch != UEOF) buff[i++] = ch;
 	    buff[i] = '\0';
 	    if (i == 0 && ch == UEOF) i = -1;
 	    laststartline = exp->locate();
 	    return i;
 	}
+    int getsentence(CBuffer& buff);
     void saveposn(const QString& f, size_t posn) { filt->saveposn(f, posn); }
     void writeposn(const QString& f, size_t posn) { filt->writeposn(f, posn); }
     linkType forward(QString& f, size_t& loc) { return filt->forward(f, loc); }
     linkType back(QString& f, size_t& loc) { return filt->back(f, loc); }
-    bool hasnavigation() { return filt->hasnavigation(); }
-    bool getFile(QString href)
+    bool hasnavigation() { return (exp == NULL) ? false : filt->hasnavigation(); }
+    bool getFile(const QString& href, QString& nm)
+      {
+	return (exp == NULL) ? false : exp->getFile(href, nm);
+      }
+    QString getTableAsHtml(unsigned long loc)
       {
-	return (exp == NULL) ? false : exp->getFile(href);
+	return (exp != NULL) ? filt->getTableAsHtml(loc) : QString("");
       }
 };
 
 #endif