2 files changed, 80 insertions, 27 deletions

diff --git a/libopie2/opiecore/okeyfilter.cpp b/libopie2/opiecore/okeyfilter.cpp
index d806dbd..b064272 100644
--- a/libopie2/opiecore/okeyfilter.cpp
+++ b/libopie2/opiecore/okeyfilter.cpp
@@ -34,15 +34,26 @@ namespace Opie {
 namespace Core {
 
-QValueList<QWSServer::KeyboardFilter*> OKeyFilter::filterList;
-QValueList<QWSServer::KeyboardFilter*> OKeyFilter::preFilterList;
+class OKeyFilterPrivate:public OKeyFilter, QWSServer::KeyboardFilter
+{
+    static QValueList<QWSServer::KeyboardFilter*> filterList;
+    static QValueList<QWSServer::KeyboardFilter*> preFilterList;
+protected:
+    OKeyFilterPrivate(const OKeyFilterPrivate&):OKeyFilter(),QWSServer::KeyboardFilter(){};
+    virtual void addPreHandler(QWSServer::KeyboardFilter*);
+    virtual void remPreHandler(QWSServer::KeyboardFilter*);
+
+public:
+    OKeyFilterPrivate();
+    virtual ~OKeyFilterPrivate();
+    virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
+    virtual void addHandler(QWSServer::KeyboardFilter*);
+    virtual void remHandler(QWSServer::KeyboardFilter*);
+};
+
+QValueList<QWSServer::KeyboardFilter*> OKeyFilterPrivate::filterList;
+QValueList<QWSServer::KeyboardFilter*> OKeyFilterPrivate::preFilterList;
 
 OKeyFilter::OKeyFilter()
-    :QWSServer::KeyboardFilter()
 {
-    filterList.clear();
-    preFilterList.clear();
-    if ( isQWS( ) ) {
-        QWSServer::setKeyboardFilter ( this );
-    }
 }
 
@@ -55,10 +66,10 @@ OKeyFilter* OKeyFilter::inst()
     static OKeyFilter*ofilter = 0;
     if (!ofilter) {
-        ofilter = new OKeyFilter;
+        ofilter = new OKeyFilterPrivate;
     }
     return ofilter;
 }
 
-bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat )
+bool OKeyFilterPrivate::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
     QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
@@ -76,5 +87,5 @@ bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress,
 }
 
-void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF)
+void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF)
 {
     if (filterList.find(aF)!=filterList.end()) {
@@ -85,5 +96,5 @@ void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF)
 }
 
-void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF)
+void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF)
 {
     QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
@@ -95,5 +106,5 @@ void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF)
 }
 
-void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF)
+void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF)
 {
     if (preFilterList.find(aF)!=preFilterList.end()) {
@@ -104,5 +115,5 @@ void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF)
 }
 
-void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF)
+void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF)
 {
     QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
@@ -114,4 +125,18 @@ void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF)
 }
 
+OKeyFilterPrivate::OKeyFilterPrivate()
+    :OKeyFilter(),QWSServer::KeyboardFilter()
+{
+    filterList.clear();
+    preFilterList.clear();
+    if ( isQWS( ) ) {
+        QWSServer::setKeyboardFilter ( this );
+    }
+}
+
+OKeyFilterPrivate::~OKeyFilterPrivate()
+{
+}
+
 /* namespace Core */
 }
diff --git a/libopie2/opiecore/okeyfilter.h b/libopie2/opiecore/okeyfilter.h
index 3f9f744..a65bc48 100644
--- a/libopie2/opiecore/okeyfilter.h
+++ b/libopie2/opiecore/okeyfilter.h
@@ -48,5 +48,5 @@ namespace Internal {
  * @version 1.0
  */
-class OKeyFilter:public QWSServer::KeyboardFilter
+class OKeyFilter
 {
     friend class Opie::Core::ODevice;
@@ -54,21 +54,49 @@ class OKeyFilter:public QWSServer::KeyboardFilter
     friend class Opie::Core::Internal::SIMpad;
 
-    static QValueList<QWSServer::KeyboardFilter*> filterList;
-    static QValueList<QWSServer::KeyboardFilter*> preFilterList;
-
-    OKeyFilter();
-    OKeyFilter(const OKeyFilter&):QWSServer::KeyboardFilter(){};
-
 protected:
-    void addPreHandler(QWSServer::KeyboardFilter*);
-    void remPreHandler(QWSServer::KeyboardFilter*);
+    /**
+     * Protected constructor - generate class via inst()
+     * @see inst()
+     */
+    OKeyFilter();
+    /**
+     * Protected constructor - generate class via inst()
+     * @see inst()
+     */
+    OKeyFilter(const OKeyFilter&){};
+    /**
+     * Append filter to the primary list.
+     * This is only allowed for friend classes from odevice
+     * @param aFilter a filter to append
+     * @see addHandler
+     */
+    virtual void addPreHandler(QWSServer::KeyboardFilter*aFilter)=0;
+    /**
+     * Remove the specified filter from list and give back ownership.
+     * This is only allowed for friend classes from odevice
+     * @param aFilter a filter to remove
+     * @see remHandler
+     */
+    virtual void remPreHandler(QWSServer::KeyboardFilter*aFilter)=0;
 
 public:
     virtual ~OKeyFilter();
-    virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
-
-    void addHandler(QWSServer::KeyboardFilter*);
-    void remHandler(QWSServer::KeyboardFilter*);
+    /**
+     * Append filter to the secondary list.
+     * @param aFilter a filter to append
+     * @see addPreHandler
+     */
+    virtual void addHandler(QWSServer::KeyboardFilter*)=0;
+    /**
+     * Remove the specified filter from list and give back ownership.
+     * @param aFilter a filter to remove
+     * @see remPreHandler
+     */
+    virtual void remHandler(QWSServer::KeyboardFilter*)=0;
 
+    /**
+     * Returns a handler to an instance of OKeyFilter
+     * @return a pointer to a working OKeyFilter
+     */
     static OKeyFilter*inst();
 };