Diffstat (limited to 'inputmethods/multikey/keyboard.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 10 |
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 | |||
@@ -30,13 +30,12 @@ | |||
30 | #include <qtimer.h> | 30 | #include <qtimer.h> |
31 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
32 | #include <qpe/config.h> | 32 | #include <qpe/config.h> |
33 | #include <ctype.h> | 33 | #include <ctype.h> |
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
36 | #include <iostream.h> | ||
37 | 36 | ||
38 | #include <sys/utsname.h> | 37 | #include <sys/utsname.h> |
39 | 38 | ||
40 | 39 | ||
41 | #define USE_SMALL_BACKSPACE | 40 | #define USE_SMALL_BACKSPACE |
42 | 41 | ||
@@ -74,12 +73,20 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : | |||
74 | keys = new Keys(); | 73 | keys = new Keys(); |
75 | 74 | ||
76 | repeatTimer = new QTimer( this ); | 75 | repeatTimer = new QTimer( this ); |
77 | connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); | 76 | connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); |
78 | 77 | ||
79 | } | 78 | } |
79 | Keyboard::~Keyboard() { | ||
80 | |||
81 | if ( configdlg ) { | ||
82 | delete (ConfigDlg *) configdlg; | ||
83 | configdlg = 0; | ||
84 | } | ||
85 | |||
86 | } | ||
80 | 87 | ||
81 | /* Keyboard::resizeEvent {{{1 */ | 88 | /* Keyboard::resizeEvent {{{1 */ |
82 | void Keyboard::resizeEvent(QResizeEvent*) | 89 | void Keyboard::resizeEvent(QResizeEvent*) |
83 | { | 90 | { |
84 | int ph = picks->sizeHint().height(); | 91 | int ph = picks->sizeHint().height(); |
85 | picks->setGeometry( 0, 0, width(), ph ); | 92 | picks->setGeometry( 0, 0, width(), ph ); |
@@ -956,13 +963,12 @@ void Keys::setKeysFromFile(const char * filename) { | |||
956 | if (name == "lang") { | 963 | if (name == "lang") { |
957 | 964 | ||
958 | lang = value; | 965 | lang = value; |
959 | 966 | ||
960 | } | 967 | } |
961 | 968 | ||
962 | cout << name << " = " << value << "\n"; | ||
963 | buf = t.readLine(); | 969 | buf = t.readLine(); |
964 | } | 970 | } |
965 | // comments | 971 | // comments |
966 | else if (buf.contains(QRegExp("^\\s*#"))) { | 972 | else if (buf.contains(QRegExp("^\\s*#"))) { |
967 | 973 | ||
968 | buf = t.readLine(); | 974 | buf = t.readLine(); |