changed the keymap selector widget style

1 files changed, 8 insertions, 2 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 2a80f1e..b71f929 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -24,25 +24,24 @@
 #include <qpe/global.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qwindowsystem_qws.h>
 #include <qpainter.h>
 #include <qfontmetrics.h>
 #include <qtimer.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <ctype.h>
 #include <qfile.h>
 #include <qtextstream.h>
-#include <iostream.h>
 
 #include <sys/utsname.h>
 
 
 #define USE_SMALL_BACKSPACE
 
 /* Keyboard::Keyboard {{{1 */
 Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
     QFrame(parent, _name, f),  shift(0), lock(0), ctrl(0),
     alt(0), useLargeKeys(TRUE), usePicks(0), pressedKeyRow(-1), pressedKeyCol(-1),
     unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0),
     configdlg(0)
@@ -68,24 +67,32 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
 
         QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
             this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
 
     } else picks->hide();
 
     keys = new Keys();
 
     repeatTimer = new QTimer( this );
     connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
 
 }
+Keyboard::~Keyboard() {
+
+    if ( configdlg ) { 
+        delete (ConfigDlg *) configdlg; 
+        configdlg = 0;
+    }
+
+}
 
 /* Keyboard::resizeEvent {{{1 */
 void Keyboard::resizeEvent(QResizeEvent*)
 {
     int ph = picks->sizeHint().height();
     picks->setGeometry( 0, 0, width(), ph );
     keyHeight = (height()-(usePicks ? ph : 0))/5;
 
     int nk; // number of keys?
     if ( useLargeKeys ) {
 	nk = 15;
     } else {
@@ -950,25 +957,24 @@ void Keys::setKeysFromFile(const char * filename) {
 
                 QTextStream tmp (buf, IO_ReadOnly);
                 QString name, equals, value;
 
                 tmp >> name >> equals >> value;
 
                 if (name == "lang") {
 
                     lang = value;
 
                 } 
 
-                cout << name << " = " << value << "\n";
                 buf = t.readLine();
             }
             // comments
             else if (buf.contains(QRegExp("^\\s*#"))) {
 
                 buf = t.readLine();
 
             } else { // blank line, or garbage
 
                 buf = t.readLine();
 
             }