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

1 files changed, 4 insertions, 0 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
@@ -71,119 +71,123 @@ static const char * kb_xpm[] = {
 "e	c #1B2514",
 "f	c #112106",
 "g	c #416160",
 "h	c #538484",
 "i	c #2B2B2B",
 "j	c #0F0F0F",
 "k	c #14190F",
 "l	c #192312",
 "m	c #0F1F06",
 "n	c #40605F",
 "o	c #518483",
 "p	c #9D9D9D",
 "q	c #747474",
 "r	c #2B2C2B",
 "s	c #060704",
 "t	c #0B0E09",
 "u	c #12180D",
 "v	c #17210F",
 "w	c #0E1E04",
 "x	c #3D5E5D",
 "y	c #508382",
 "z	c #898989",
 "A	c #9C9C9C",
 "B	c #050704",
 "C	c #0A0D08",
 "D	c #10170B",
 "E	c #141E0C",
 "F	c #0C1B04",
 "G	c #395C5A",
 "H	c #4F8181",
 "I	c #242424",
 "J	c #050604",
 "K	c #090C06",
 "L	c #0E1509",
 "M	c #121C0A",
 "N	c #0B1A03",
 "O	c #375A58",
 "P	c #4D807F",
 "...........+..@.@@@@@@@#.$%&",
 "..........*=.@.@.@@@@@##.-;>",
 "..............@.@.@@@###.-,'",
 ")!~{{]]]{]]].@.@.@@#.##-.-^'",
 "/(_::<<<:<<<..@.@@#..#--.-^'",
 "[}|12}|12}|12.#.@#.-.---.-3'",
 "4|567|567|567..@@...---.--,'",
 "81690169016901.@#.----.--a;b",
 "82700ccc0cccd.@@......--efgh",
 "i}|1c}|1c}|1j.@#.------klmno",
 "i|56c|56c|56.@#.--pqrstuvwxy",
 "i169c169c16.@#.--zAqrBCDEFGH",
 "82700ccc0cj...--IzAqrJKLMNOP"};
 
 
 
 
 KeyboardImpl::KeyboardImpl()
     : input(0), icn(0), ref(0)
 {
 }
 
 KeyboardImpl::~KeyboardImpl()
 {
     delete input;
     delete icn;
 }
 
 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