-rw-r--r-- | libopie2/opiecore/okeyfilter.cpp | 53 | ||||
-rw-r--r-- | libopie2/opiecore/okeyfilter.h | 54 |
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 @@ -35,13 +35,24 @@ 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 ); - } } @@ -56,3 +67,3 @@ OKeyFilter* OKeyFilter::inst() if (!ofilter) { - ofilter = new OKeyFilter; + ofilter = new OKeyFilterPrivate; } @@ -61,3 +72,3 @@ OKeyFilter* OKeyFilter::inst() -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 ) { @@ -77,3 +88,3 @@ bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress, -void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF) { @@ -86,3 +97,3 @@ void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF) -void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF) { @@ -96,3 +107,3 @@ void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF) -void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF) { @@ -105,3 +116,3 @@ void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF) -void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF) { @@ -115,2 +126,16 @@ 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 @@ -49,3 +49,3 @@ namespace Internal { */ -class OKeyFilter:public QWSServer::KeyboardFilter +class OKeyFilter { @@ -55,11 +55,27 @@ class OKeyFilter:public QWSServer::KeyboardFilter - 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; @@ -67,7 +83,19 @@ 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(); |