author | hash <hash> | 2002-08-15 19:46:43 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-15 19:46:43 (UTC) |
commit | 3e328409c2829dff590d0087518938851aff8bcc (patch) (unidiff) | |
tree | 0a0f9fe70fdd78ffd00702b73782f41ffbc56cd7 | |
parent | d9cc9bedf72e921f8f7d8edeb189db127c5651e3 (diff) | |
download | opie-3e328409c2829dff590d0087518938851aff8bcc.zip opie-3e328409c2829dff590d0087518938851aff8bcc.tar.gz opie-3e328409c2829dff590d0087518938851aff8bcc.tar.bz2 |
think i fixed a memory leak problem... please test it out and see if the size of qpe increases if you load/unload keymaps
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 10 | ||||
-rw-r--r-- | inputmethods/multikey/keyboard.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index b71f929..671868c 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp | |||
@@ -1008,24 +1008,34 @@ void Keys::setKey(const int row, const int qcode, const ushort unicode, | |||
1008 | } | 1008 | } |
1009 | if (!found) { | 1009 | if (!found) { |
1010 | 1010 | ||
1011 | key->pressed = new bool; | 1011 | key->pressed = new bool; |
1012 | *(key->pressed) = 0; | 1012 | *(key->pressed) = 0; |
1013 | } | 1013 | } |
1014 | 1014 | ||
1015 | key->pix = pix; | 1015 | key->pix = pix; |
1016 | 1016 | ||
1017 | 1017 | ||
1018 | keys[row].append(key); | 1018 | keys[row].append(key); |
1019 | } | 1019 | } |
1020 | |||
1021 | // Keys::~Keys {{{2 | ||
1022 | Keys::~Keys() { | ||
1023 | |||
1024 | for (int i = 1; i <= 5; i++) | ||
1025 | for (unsigned int j = 0; j < keys[i].count(); j++) | ||
1026 | delete keys[i].at(j); | ||
1027 | |||
1028 | } | ||
1029 | |||
1020 | // Keys:: other functions {{{2 | 1030 | // Keys:: other functions {{{2 |
1021 | int Keys::width(const int row, const int col) { | 1031 | int Keys::width(const int row, const int col) { |
1022 | 1032 | ||
1023 | return keys[row].at(col)->width; | 1033 | return keys[row].at(col)->width; |
1024 | 1034 | ||
1025 | } | 1035 | } |
1026 | ushort Keys::uni(const int row, const int col) { | 1036 | ushort Keys::uni(const int row, const int col) { |
1027 | 1037 | ||
1028 | return keys[row].at(col)->unicode; | 1038 | return keys[row].at(col)->unicode; |
1029 | 1039 | ||
1030 | } | 1040 | } |
1031 | 1041 | ||
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h index 8ca50ea..400edc0 100644 --- a/inputmethods/multikey/keyboard.h +++ b/inputmethods/multikey/keyboard.h | |||
@@ -46,24 +46,25 @@ public: | |||
46 | : PickboardPicks(parent, name, f) { } | 46 | : PickboardPicks(parent, name, f) { } |
47 | void initialise(); | 47 | void initialise(); |
48 | virtual QSize sizeHint() const; | 48 | virtual QSize sizeHint() const; |
49 | KeyboardConfig *dc; | 49 | KeyboardConfig *dc; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | 52 | ||
53 | class Keys { | 53 | class Keys { |
54 | public: | 54 | public: |
55 | 55 | ||
56 | Keys(); | 56 | Keys(); |
57 | Keys(const char * filename); | 57 | Keys(const char * filename); |
58 | ~Keys(); | ||
58 | ushort uni(const int row, const int col); | 59 | ushort uni(const int row, const int col); |
59 | int qcode(const int row, const int col); | 60 | int qcode(const int row, const int col); |
60 | int width(const int row, const int col); | 61 | int width(const int row, const int col); |
61 | bool pressed(const int row, const int col); | 62 | bool pressed(const int row, const int col); |
62 | bool *pressedPtr(const int row, const int col); | 63 | bool *pressedPtr(const int row, const int col); |
63 | ushort shift(const ushort); | 64 | ushort shift(const ushort); |
64 | QPixmap *pix(const int row, const int col); | 65 | QPixmap *pix(const int row, const int col); |
65 | int numKeys(const int row); | 66 | int numKeys(const int row); |
66 | void setKeysFromFile(const char *filename); | 67 | void setKeysFromFile(const char *filename); |
67 | void setKey(const int row, const int qcode, const ushort unicode, | 68 | void setKey(const int row, const int qcode, const ushort unicode, |
68 | const int width, QPixmap *pix); | 69 | const int width, QPixmap *pix); |
69 | void setPressed(const int row, const int col, const bool pressed); | 70 | void setPressed(const int row, const int col, const bool pressed); |