author | alwin <alwin> | 2004-08-01 16:20:38 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-08-01 16:20:38 (UTC) |
commit | e9f9eb19567a2afa354c36490ee8f4b191cf9395 (patch) (side-by-side diff) | |
tree | 264557433a4acf15e9bde6ab800d4a8df362d70e | |
parent | 67e2e98457418bc491efd2d4567f851e77a0441a (diff) | |
download | opie-e9f9eb19567a2afa354c36490ee8f4b191cf9395.zip opie-e9f9eb19567a2afa354c36490ee8f4b191cf9395.tar.gz opie-e9f9eb19567a2afa354c36490ee8f4b191cf9395.tar.bz2 |
made interface binary clean eg. inst() returns a hidden class
documentation
-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 @@ -32,19 +32,30 @@ _;:, .> :=|. This program is free software; you can 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 ); - } } OKeyFilter::~OKeyFilter() { @@ -53,14 +64,14 @@ OKeyFilter::~OKeyFilter() 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; for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) { if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) { @@ -74,18 +85,18 @@ bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress, } return false; } -void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF) { if (filterList.find(aF)!=filterList.end()) { return; } odebug << "adding a keyboard filter handler"<<oendl; filterList.append(aF); } -void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF) { QValueList<QWSServer::KeyboardFilter*>::Iterator iter; if ( (iter=filterList.find(aF))==filterList.end() ) { return; @@ -93,18 +104,18 @@ void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF) odebug << "removing a keyboard filter handler"<<oendl; filterList.remove(iter); } -void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF) { if (preFilterList.find(aF)!=preFilterList.end()) { return; } odebug << "adding a preferred keyboard filter handler"<<oendl; preFilterList.append(aF); } -void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF) { QValueList<QWSServer::KeyboardFilter*>::Iterator iter; if ( (iter=preFilterList.find(aF))==preFilterList.end() ) { return; @@ -112,8 +123,22 @@ void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF) odebug << "removing a preferred keyboard filter handler"<<oendl; preFilterList.remove(iter); } +OKeyFilterPrivate::OKeyFilterPrivate() + :OKeyFilter(),QWSServer::KeyboardFilter() +{ + filterList.clear(); + preFilterList.clear(); + if ( isQWS( ) ) { + QWSServer::setKeyboardFilter ( this ); + } +} + +OKeyFilterPrivate::~OKeyFilterPrivate() +{ +} + /* namespace Core */ } /* namespace Opie */ } 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 @@ -46,31 +46,59 @@ namespace Internal { * @see QWSServer::KeyboardFilter * @author Rajko Albrecht * @version 1.0 */ -class OKeyFilter:public QWSServer::KeyboardFilter +class OKeyFilter { friend class Opie::Core::ODevice; friend class Opie::Core::Internal::iPAQ; 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(); }; } |