summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-14 17:15:44 (UTC)
committer zecke <zecke>2004-08-14 17:15:44 (UTC)
commit74363a9e1d5688d65286e7fea156227b68a28002 (patch) (unidiff)
tree3926a1a3bd42bebb2f67b3334735bc3b3931f796
parent7657b6986a600ec1b3626c83e8f19036bf69e493 (diff)
downloadopie-74363a9e1d5688d65286e7fea156227b68a28002.zip
opie-74363a9e1d5688d65286e7fea156227b68a28002.tar.gz
opie-74363a9e1d5688d65286e7fea156227b68a28002.tar.bz2
-Remove the KeyFilter on destruction
Alwin could we either add a 'QObject' as a owner so that we could use QGuardedPtr or look for the deleteEvent ourselves. Or let us create a KeyFilter ourselves that auto registers (maybe) but cleans up itself in any case?
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--development/keyview/keyboardimpl.cpp4
-rw-r--r--development/keyview/keyview.cpp7
-rw-r--r--development/keyview/keyview.h2
3 files changed, 11 insertions, 2 deletions
diff --git a/development/keyview/keyboardimpl.cpp b/development/keyview/keyboardimpl.cpp
index 673eaa5..0216110 100644
--- a/development/keyview/keyboardimpl.cpp
+++ b/development/keyview/keyboardimpl.cpp
@@ -165,4 +165,6 @@ QString KeyboardImpl::name()
165void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 165void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
166{ 166{
167 Q_UNUSED( receiver );
168 Q_CONST_UNUSED( slot );
167 //if ( input ) 169 //if ( input )
168 //QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 170 //QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
@@ -177,4 +179,6 @@ QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **ifa
177 else if ( uuid == IID_InputMethod ) 179 else if ( uuid == IID_InputMethod )
178 *iface = this; 180 *iface = this;
181 else
182 return QS_FALSE;
179 183
180 if ( *iface ) 184 if ( *iface )
diff --git a/development/keyview/keyview.cpp b/development/keyview/keyview.cpp
index 8187744..cf082a8 100644
--- a/development/keyview/keyview.cpp
+++ b/development/keyview/keyview.cpp
@@ -66,9 +66,14 @@ KeyFilter::KeyFilter(QObject * parent, const char *name) : QObject( parent, name
66} 66}
67 67
68KeyFilter::~KeyFilter() {
69 /* we need to remove the KeyFilter */
70 Opie::Core::OKeyFilter::inst()->remHandler( this );
71}
72
68bool KeyFilter::filter(int unicode, int keycode, int modifiers, bool isPress, 73bool KeyFilter::filter(int unicode, int keycode, int modifiers, bool isPress,
69 bool autoRepeat) { 74 bool autoRepeat) {
70 75
71 qDebug( "unicode: %d, keycode: %d, modifiers: %0x, isPress: %d, autoRepeat: %d", 76 qDebug( "unicode: %d, keycode: %d, modifiers: %0x, isPress: %d, autoRepeat: %d",
72 unicode, keycode, modifiers, isPress ); 77 unicode, keycode, modifiers, isPress, autoRepeat );
73 emit keyPressed(unicode, keycode, modifiers, isPress, autoRepeat); 78 emit keyPressed(unicode, keycode, modifiers, isPress, autoRepeat);
74 return 0; // return 1 to stop key emiting 79 return 0; // return 1 to stop key emiting
diff --git a/development/keyview/keyview.h b/development/keyview/keyview.h
index 5f1e943..87c0d15 100644
--- a/development/keyview/keyview.h
+++ b/development/keyview/keyview.h
@@ -24,5 +24,4 @@ private:
24 QLineEdit *isPress; 24 QLineEdit *isPress;
25 QLineEdit *autoRepeat; 25 QLineEdit *autoRepeat;
26
27}; 26};
28 27
@@ -33,4 +32,5 @@ class KeyFilter : public QObject, public QWSServer::KeyboardFilter
33public: 32public:
34 KeyFilter( QObject* parent, const char* name = 0); 33 KeyFilter( QObject* parent, const char* name = 0);
34 virtual ~KeyFilter();
35 virtual bool filter(int unicode, int keycode, int modifiers, bool isPress, 35 virtual bool filter(int unicode, int keycode, int modifiers, bool isPress,
36 bool autoRepeat); 36 bool autoRepeat);