-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?

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
@@ -135,55 +135,59 @@ KeyboardImpl::~KeyboardImpl()
 }
 
 QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 {
     if ( !input )
 	input = new Keyview( parent, "Keyview", f );
     return input;
 }
 
 void KeyboardImpl::resetState()
 {
     /*
     if ( input )
 	input->resetState();
     */
 }
 
 QPixmap *KeyboardImpl::icon()
 {
     if ( !icn )
 	icn = new QPixmap( (const char **)kb_xpm );
     return icn;
 }
 
 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()
 {
     Q_CREATE_INSTANCE( KeyboardImpl )
 }
 #endif
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
@@ -36,41 +36,46 @@ Keyview::Keyview( QWidget* parent,  const char* name, WFlags fl )
     autoRepeat->setReadOnly(1);
 
     // spacer
     l = new QLabel(QString(""), this);
     l->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 
 
     KeyFilter *filter = new KeyFilter(this);
     Opie::Core::OKeyFilter::inst()->addHandler(filter);
     odebug << "Creating keyview filter " << oendl;
 
     connect(filter, SIGNAL(keyPressed(int,int,int,bool,bool)),
                            this, SLOT(updateItems(int,int,int,bool,bool)));
 }
 
 Keyview::~Keyview()
 {
 }
 
 void Keyview::updateItems(int u, int k, int m, bool p, bool a) {
 
     unicode->setText("0x" + QString::number(u, 16));
     keycode->setText("0x" + QString::number(k, 16));
     modifiers->setText("0x" + QString::number(m, 16));
     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
@@ -1,43 +1,43 @@
 #ifndef KEYVIEW_H
 #define KEYVIEW_H
 #include <qgrid.h>
 #include <qlineedit.h>
 #include <qwindowsystem_qws.h>
 
 
 class Keyview : public QGrid
 {
     Q_OBJECT
 
 public:
     Keyview( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Keyview();
 
 private slots:
     void updateItems(int, int, int, bool, bool);
 
 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);
 
 };
 
 #endif