Diffstat (limited to 'libopie2/opiecore/okeyfilter.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
75 | QValueList<QWSServer::KeyboardFilter*>::Iterator iter; | 75 | QValueList<QWSServer::KeyboardFilter*>::Iterator iter; |
76 | for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) { | 76 | for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) { |
77 | if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) { | 77 | if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) { |
78 | return true; | 78 | return true; |
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 | ||
89 | void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF) | 89 | void 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 | ||
98 | void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF) | 99 | void 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 | ||
108 | void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF) | 110 | void 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 | ||
117 | void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF) | 120 | void 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 | ||
127 | OKeyFilterPrivate::OKeyFilterPrivate() | 131 | OKeyFilterPrivate::OKeyFilterPrivate() |
128 | :OKeyFilter(),QWSServer::KeyboardFilter() | 132 | :OKeyFilter(),QWSServer::KeyboardFilter() |
129 | { | 133 | { |
130 | filterList.clear(); | 134 | filterList.clear(); |
131 | preFilterList.clear(); | 135 | preFilterList.clear(); |
132 | if ( isQWS( ) ) { | 136 | if ( isQWS( ) ) { |
133 | QWSServer::setKeyboardFilter ( this ); | 137 | QWSServer::setKeyboardFilter ( this ); |
134 | } | 138 | } |