author | alwin <alwin> | 2004-08-01 19:54:12 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-08-01 19:54:12 (UTC) |
commit | 3d67a6ef781f59f9db936442a5b44329a0d5c70b (patch) (side-by-side diff) | |
tree | 904a4a0e0f30fe57cdf94ca86144c4d4a0e330c6 /libopie2 | |
parent | e9f9eb19567a2afa354c36490ee8f4b191cf9395 (diff) | |
download | opie-3d67a6ef781f59f9db936442a5b44329a0d5c70b.zip opie-3d67a6ef781f59f9db936442a5b44329a0d5c70b.tar.gz opie-3d67a6ef781f59f9db936442a5b44329a0d5c70b.tar.bz2 |
0 pointer will not inserted into list
-rw-r--r-- | libopie2/opiecore/okeyfilter.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libopie2/opiecore/okeyfilter.cpp b/libopie2/opiecore/okeyfilter.cpp index b064272..a517333 100644 --- a/libopie2/opiecore/okeyfilter.cpp +++ b/libopie2/opiecore/okeyfilter.cpp @@ -75,60 +75,64 @@ bool OKeyFilterPrivate::filter( int unicode, int keycode, int modifiers, bool is QValueList<QWSServer::KeyboardFilter*>::Iterator iter; for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) { if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) { return true; } } for (iter=filterList.begin();iter!=filterList.end();++iter) { if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) { return true; } } return false; } void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF) { + if (!aF) return; if (filterList.find(aF)!=filterList.end()) { return; } odebug << "adding a keyboard filter handler"<<oendl; filterList.append(aF); } void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF) { + if (!aF) return; QValueList<QWSServer::KeyboardFilter*>::Iterator iter; if ( (iter=filterList.find(aF))==filterList.end() ) { return; } odebug << "removing a keyboard filter handler"<<oendl; filterList.remove(iter); } void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF) { + if (!aF) return; if (preFilterList.find(aF)!=preFilterList.end()) { return; } odebug << "adding a preferred keyboard filter handler"<<oendl; preFilterList.append(aF); } void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF) { + if (!aF) return; QValueList<QWSServer::KeyboardFilter*>::Iterator iter; if ( (iter=preFilterList.find(aF))==preFilterList.end() ) { return; } 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 ); } |