summaryrefslogtreecommitdiff
authoralwin <alwin>2004-08-01 19:54:12 (UTC)
committer alwin <alwin>2004-08-01 19:54:12 (UTC)
commit3d67a6ef781f59f9db936442a5b44329a0d5c70b (patch) (unidiff)
tree904a4a0e0f30fe57cdf94ca86144c4d4a0e330c6
parente9f9eb19567a2afa354c36490ee8f4b191cf9395 (diff)
downloadopie-3d67a6ef781f59f9db936442a5b44329a0d5c70b.zip
opie-3d67a6ef781f59f9db936442a5b44329a0d5c70b.tar.gz
opie-3d67a6ef781f59f9db936442a5b44329a0d5c70b.tar.bz2
0 pointer will not inserted into list
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/okeyfilter.cpp4
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
@@ -79,52 +79,56 @@ bool OKeyFilterPrivate::filter( int unicode, int keycode, int modifiers, bool is
79 } 79 }
80 } 80 }
81 for (iter=filterList.begin();iter!=filterList.end();++iter) { 81 for (iter=filterList.begin();iter!=filterList.end();++iter) {
82 if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) { 82 if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) {
83 return true; 83 return true;
84 } 84 }
85 } 85 }
86 return false; 86 return false;
87} 87}
88 88
89void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF) 89void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF)
90{ 90{
91 if (!aF) return;
91 if (filterList.find(aF)!=filterList.end()) { 92 if (filterList.find(aF)!=filterList.end()) {
92 return; 93 return;
93 } 94 }
94 odebug << "adding a keyboard filter handler"<<oendl; 95 odebug << "adding a keyboard filter handler"<<oendl;
95 filterList.append(aF); 96 filterList.append(aF);
96} 97}
97 98
98void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF) 99void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF)
99{ 100{
101 if (!aF) return;
100 QValueList<QWSServer::KeyboardFilter*>::Iterator iter; 102 QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
101 if ( (iter=filterList.find(aF))==filterList.end() ) { 103 if ( (iter=filterList.find(aF))==filterList.end() ) {
102 return; 104 return;
103 } 105 }
104 odebug << "removing a keyboard filter handler"<<oendl; 106 odebug << "removing a keyboard filter handler"<<oendl;
105 filterList.remove(iter); 107 filterList.remove(iter);
106} 108}
107 109
108void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF) 110void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF)
109{ 111{
112 if (!aF) return;
110 if (preFilterList.find(aF)!=preFilterList.end()) { 113 if (preFilterList.find(aF)!=preFilterList.end()) {
111 return; 114 return;
112 } 115 }
113 odebug << "adding a preferred keyboard filter handler"<<oendl; 116 odebug << "adding a preferred keyboard filter handler"<<oendl;
114 preFilterList.append(aF); 117 preFilterList.append(aF);
115} 118}
116 119
117void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF) 120void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF)
118{ 121{
122 if (!aF) return;
119 QValueList<QWSServer::KeyboardFilter*>::Iterator iter; 123 QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
120 if ( (iter=preFilterList.find(aF))==preFilterList.end() ) { 124 if ( (iter=preFilterList.find(aF))==preFilterList.end() ) {
121 return; 125 return;
122 } 126 }
123 odebug << "removing a preferred keyboard filter handler"<<oendl; 127 odebug << "removing a preferred keyboard filter handler"<<oendl;
124 preFilterList.remove(iter); 128 preFilterList.remove(iter);
125} 129}
126 130
127OKeyFilterPrivate::OKeyFilterPrivate() 131OKeyFilterPrivate::OKeyFilterPrivate()
128 :OKeyFilter(),QWSServer::KeyboardFilter() 132 :OKeyFilter(),QWSServer::KeyboardFilter()
129{ 133{
130 filterList.clear(); 134 filterList.clear();