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
@@ -159,28 +159,32 @@ QPixmap *KeyboardImpl::icon()
 QString KeyboardImpl::name()
 {
     // return qApp->translate( "InputMethods", "Keyboard" );
     return "Keyview";
 }
 
 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 );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
 	*iface = this;
     else if ( uuid == IID_InputMethod )
 	*iface = this;
+    else
+	return QS_FALSE;
 
     if ( *iface )
 	(*iface)->addRef();
     return QS_OK;
 }
 
 Q_EXPORT_INTERFACE()
 {
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
@@ -60,17 +60,22 @@ void Keyview::updateItems(int u, int k, int m, bool p, bool a) {
     isPress->setText("0x" + QString::number(p, 16));
     autoRepeat->setText("0x" + QString::number(a, 16));
 }
 
 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
@@ -18,25 +18,25 @@ private slots:
 
 private:
 
     QLineEdit *unicode;
     QLineEdit *keycode;
     QLineEdit *modifiers;
     QLineEdit *isPress;
     QLineEdit *autoRepeat;
-
 };
 
 class KeyFilter : public QObject, public QWSServer::KeyboardFilter
 {
     Q_OBJECT
 
 public:
     KeyFilter( QObject* parent, const char* name = 0);
+    virtual ~KeyFilter();
     virtual bool filter(int unicode, int keycode, int modifiers, bool isPress,
                 bool autoRepeat);
 
 signals:
     void keyPressed(int, int, int, bool, bool);
 
 };