1 files changed, 67 insertions, 26 deletions

diff --git a/noncore/apps/opie-reader/CFilter.h b/noncore/apps/opie-reader/CFilter.h
index 2d0c30f..0a03b3e 100644
--- a/noncore/apps/opie-reader/CFilter.h
+++ b/noncore/apps/opie-reader/CFilter.h
@@ -10,4 +10,8 @@ class CFilter : public CCharacterSource
  protected:
     CCharacterSource* parent;
+    linkType hyperlink(unsigned int n, QString& w)
+	{
+	    return parent->hyperlink(n,w);
+	}
  public:
     CFilter() : parent(NULL) {}
@@ -70,6 +74,6 @@ class stripcr : public CFilter
  public:
     stripcr() {}
-    virtual ~stripcr() {}
-    virtual void getch(tchar& ch, CStyle& sty)
+    ~stripcr() {}
+    void getch(tchar& ch, CStyle& sty)
 	{
 	    do
@@ -88,6 +92,6 @@ class dehyphen : public CFilter
  public:
     dehyphen() : m_bCharWaiting(false) {}
-    virtual ~dehyphen() {}
-    virtual void getch(tchar& ch, CStyle& sty)
+    ~dehyphen() {}
+    void getch(tchar& ch, CStyle& sty)
 	{
 	    if (m_bCharWaiting)
@@ -120,6 +124,6 @@ class striphtml : public CFilter
  public:
     striphtml() {}
-    virtual ~striphtml() {}
-    virtual void getch(tchar& ch, CStyle& sty);
+    ~striphtml() {}
+    void getch(tchar& ch, CStyle& sty);
 };
 
@@ -129,6 +133,6 @@ class unindent : public CFilter
  public:
     unindent() : lc(0) {}
-    virtual ~unindent() {}
-    virtual void getch(tchar& ch, CStyle& sty)
+    ~unindent() {}
+    void getch(tchar& ch, CStyle& sty)
 	{
 	    if (lc == 10)
@@ -151,6 +155,6 @@ class repara : public CFilter
  public:
     repara() : tch(0) {}
-    virtual ~repara() {}
-    virtual void getch(tchar& ch, CStyle& sty)
+    ~repara() {}
+    void getch(tchar& ch, CStyle& sty)
 	{
 	    parent->getch(ch, sty);
@@ -180,6 +184,6 @@ class indenter : public CFilter
  public:
     indenter(int _a=5) : amnt(_a), indent(0) {}
-    virtual ~indenter() {}
-    virtual void getch(tchar& ch, CStyle& sty)
+    ~indenter() {}
+    void getch(tchar& ch, CStyle& sty)
 	{
 	    if (indent > 0)
@@ -206,6 +210,6 @@ class dblspce : public CFilter
  public:
     dblspce() : lastlf(false) {}
-    virtual ~dblspce() {}
-    virtual void getch(tchar& ch, CStyle& sty)
+    ~dblspce() {}
+    void getch(tchar& ch, CStyle& sty)
 	{
 	    if (lastlf)
@@ -233,6 +237,6 @@ class textfmt : public CFilter
  public:
     textfmt() : lastchar(0), uselast(false) {}
-    virtual ~textfmt() {}
-    virtual void getch(tchar& ch, CStyle& sty);
+    ~textfmt() {}
+    void getch(tchar& ch, CStyle& sty);
 };
 
@@ -241,6 +245,6 @@ class embolden : public CFilter
  public:
     embolden() {}
-    virtual ~embolden() {}
-    virtual void getch(tchar& ch, CStyle& sty)
+    ~embolden() {}
+    void getch(tchar& ch, CStyle& sty)
 	{
 	    parent->getch(ch, sty);
@@ -256,6 +260,6 @@ class remap : public CFilter
  public:
     remap() : offset(0) { q[0] = 0; }
-    virtual ~remap() {}
-    virtual void getch(tchar& ch, CStyle& sty);
+    ~remap() {}
+    void getch(tchar& ch, CStyle& sty);
 };
 
@@ -264,6 +268,6 @@ class PeanutFormatter : public CFilter
     CStyle currentstyle;
  public:
-    virtual ~PeanutFormatter() {}
-    virtual void getch(tchar& ch, CStyle& sty);
+    ~PeanutFormatter() {}
+    void getch(tchar& ch, CStyle& sty);
 };
 
@@ -273,6 +277,20 @@ class OnePara : public CFilter
  public:
     OnePara() : m_lastchar(0) {}
-    virtual ~OnePara() {}
-    virtual void getch(tchar& ch, CStyle& sty);
+    ~OnePara() {}
+    void getch(tchar& ch, CStyle& sty);
+};
+
+class DePluck : public CFilter
+{
+    tchar* nextpart;
+    tchar m_buffer;
+    int m_buffed;
+    int m_current;
+    bool m_debuff;
+    CStyle m_laststyle;
+ public:
+    DePluck(tchar* t) : nextpart(t), m_buffer(0), m_buffed(0), m_current(0), m_debuff(false) {}
+    ~DePluck() {}
+    void getch(tchar& ch, CStyle& sty);
 };
 
@@ -281,7 +299,30 @@ class repalm : public CFilter
 {
  public:
-    virtual ~repalm() {}
-    virtual void getch(tchar& ch, CStyle& sty);
+    ~repalm() {}
+    void getch(tchar& ch, CStyle& sty);
 };
 #endif
+
+class FullJust : public CFilter
+{
+ public:
+    void getch(tchar& ch, CStyle& sty)
+	{
+	    parent->getch(ch, sty);
+	    if (sty.getJustify() == m_AlignLeft) sty.setFullJustify();
+	}
+};
+/*
+class AddSpace : public CFilter
+{
+    unsigned char m_espc;
+ public:
+    AddSpace(unsigned char s) : m_espc(s) {}
+    void getch(tchar& ch, CStyle& sty)
+	{
+	    parent->getch(ch, sty);
+	    sty.setExtraSpace(m_espc);
+	}
+};
+*/
 #endif