-rw-r--r-- | development/keyview/keyboardimpl.cpp | 4 | ||||
-rw-r--r-- | development/keyview/keyview.cpp | 7 | ||||
-rw-r--r-- | development/keyview/keyview.h | 2 |
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() void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) { + Q_UNUSED( receiver ); + Q_CONST_UNUSED( slot ); //if ( input ) //QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); @@ -177,4 +179,6 @@ QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **ifa else if ( uuid == IID_InputMethod ) *iface = this; + else + return QS_FALSE; 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 } +KeyFilter::~KeyFilter() { + /* we need to remove the KeyFilter */ + Opie::Core::OKeyFilter::inst()->remHandler( this ); +} + bool KeyFilter::filter(int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat) { qDebug( "unicode: %d, keycode: %d, modifiers: %0x, isPress: %d, autoRepeat: %d", - unicode, keycode, modifiers, isPress ); + unicode, keycode, modifiers, isPress, autoRepeat ); emit keyPressed(unicode, keycode, modifiers, isPress, autoRepeat); 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: QLineEdit *isPress; QLineEdit *autoRepeat; - }; @@ -33,4 +32,5 @@ class KeyFilter : public QObject, public QWSServer::KeyboardFilter public: KeyFilter( QObject* parent, const char* name = 0); + virtual ~KeyFilter(); virtual bool filter(int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat); |