-rw-r--r-- | inputmethods/dasher/QtDasherImpl.cc | 2 | ||||
-rw-r--r-- | inputmethods/dasher/QtDasherImpl.h | 1 | ||||
-rw-r--r-- | inputmethods/dvorak/dvorakimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/dvorak/dvorakimpl.h | 1 | ||||
-rw-r--r-- | inputmethods/handwriting/handwritingimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/handwriting/handwritingimpl.h | 1 | ||||
-rw-r--r-- | inputmethods/jumpx/keyboardimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/jumpx/keyboardimpl.h | 1 | ||||
-rw-r--r-- | inputmethods/keyboard/keyboardimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/keyboard/keyboardimpl.h | 1 | ||||
-rw-r--r-- | inputmethods/kjumpx/keyboardimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/kjumpx/keyboardimpl.h | 1 | ||||
-rw-r--r-- | inputmethods/multikey/keyboardimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/multikey/keyboardimpl.h | 1 | ||||
-rw-r--r-- | inputmethods/pickboard/pickboardimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/pickboard/pickboardimpl.h | 1 | ||||
-rw-r--r-- | inputmethods/unikeyboard/unikeyboardimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/unikeyboard/unikeyboardimpl.h | 1 |
18 files changed, 9 insertions, 18 deletions
diff --git a/inputmethods/dasher/QtDasherImpl.cc b/inputmethods/dasher/QtDasherImpl.cc index 9513802..d72f6d9 100644 --- a/inputmethods/dasher/QtDasherImpl.cc +++ b/inputmethods/dasher/QtDasherImpl.cc | |||
@@ -16,17 +16,17 @@ static const char * qtdasher_xpm[]={ | |||
16 | " # # ", | 16 | " # # ", |
17 | " # # # # ", | 17 | " # # # # ", |
18 | " # # # # ", | 18 | " # # # # ", |
19 | " # # # ", | 19 | " # # # ", |
20 | " ########################## "}; | 20 | " ########################## "}; |
21 | 21 | ||
22 | 22 | ||
23 | QtDasherImpl::QtDasherImpl() | 23 | QtDasherImpl::QtDasherImpl() |
24 | : qtdasherwidget(0), icn(0), ref(0), qtdasherinterface(0) | 24 | : qtdasherwidget(0), icn(0), qtdasherinterface(0) |
25 | { | 25 | { |
26 | } | 26 | } |
27 | 27 | ||
28 | QtDasherImpl::~QtDasherImpl() | 28 | QtDasherImpl::~QtDasherImpl() |
29 | { | 29 | { |
30 | delete qtdasherwidget; | 30 | delete qtdasherwidget; |
31 | delete icn; | 31 | delete icn; |
32 | } | 32 | } |
diff --git a/inputmethods/dasher/QtDasherImpl.h b/inputmethods/dasher/QtDasherImpl.h index c143dc3..69e278c 100644 --- a/inputmethods/dasher/QtDasherImpl.h +++ b/inputmethods/dasher/QtDasherImpl.h | |||
@@ -23,16 +23,15 @@ public: | |||
23 | virtual QPixmap *icon(); | 23 | virtual QPixmap *icon(); |
24 | virtual QString name(); | 24 | virtual QString name(); |
25 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 25 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
26 | 26 | ||
27 | private: | 27 | private: |
28 | CDasherInterface *qtdasherinterface; | 28 | CDasherInterface *qtdasherinterface; |
29 | QtDasherPlugin *qtdasherwidget; | 29 | QtDasherPlugin *qtdasherwidget; |
30 | QPixmap *icn; | 30 | QPixmap *icn; |
31 | ulong ref; | ||
32 | }; | 31 | }; |
33 | 32 | ||
34 | #endif | 33 | #endif |
35 | 34 | ||
36 | 35 | ||
37 | 36 | ||
38 | 37 | ||
diff --git a/inputmethods/dvorak/dvorakimpl.cpp b/inputmethods/dvorak/dvorakimpl.cpp index 9e9fed9..1bc2ec8 100644 --- a/inputmethods/dvorak/dvorakimpl.cpp +++ b/inputmethods/dvorak/dvorakimpl.cpp | |||
@@ -63,17 +63,17 @@ static const char * const opti_xpm[] = { | |||
63 | " ......................... ", | 63 | " ......................... ", |
64 | " .+++.+++.+++.+++.+++.+++. ", | 64 | " .+++.+++.+++.+++.+++.+++. ", |
65 | " .+@@.+@@.+@@.+@@.+@@.+@@. ", | 65 | " .+@@.+@@.+@@.+@@.+@@.+@@. ", |
66 | " ......................... "}; | 66 | " ......................... "}; |
67 | 67 | ||
68 | 68 | ||
69 | 69 | ||
70 | KeyboardImpl::KeyboardImpl() | 70 | KeyboardImpl::KeyboardImpl() |
71 | : input(0), icn(0), ref(0) | 71 | : input(0), icn(0) |
72 | { | 72 | { |
73 | } | 73 | } |
74 | 74 | ||
75 | KeyboardImpl::~KeyboardImpl() | 75 | KeyboardImpl::~KeyboardImpl() |
76 | { | 76 | { |
77 | delete input; | 77 | delete input; |
78 | delete icn; | 78 | delete icn; |
79 | } | 79 | } |
diff --git a/inputmethods/dvorak/dvorakimpl.h b/inputmethods/dvorak/dvorakimpl.h index bd9fa88..8cc4e25 100644 --- a/inputmethods/dvorak/dvorakimpl.h +++ b/inputmethods/dvorak/dvorakimpl.h | |||
@@ -47,14 +47,13 @@ public: | |||
47 | virtual void resetState(); | 47 | virtual void resetState(); |
48 | virtual QPixmap *icon(); | 48 | virtual QPixmap *icon(); |
49 | virtual QString name(); | 49 | virtual QString name(); |
50 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 50 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
51 | 51 | ||
52 | private: | 52 | private: |
53 | Dvorak::Keyboard *input; | 53 | Dvorak::Keyboard *input; |
54 | QPixmap *icn; | 54 | QPixmap *icn; |
55 | ulong ref; | ||
56 | }; | 55 | }; |
57 | 56 | ||
58 | } // anonymous namespace | 57 | } // anonymous namespace |
59 | 58 | ||
60 | #endif | 59 | #endif |
diff --git a/inputmethods/handwriting/handwritingimpl.cpp b/inputmethods/handwriting/handwritingimpl.cpp index 22e2058..bbd5b1b 100644 --- a/inputmethods/handwriting/handwritingimpl.cpp +++ b/inputmethods/handwriting/handwritingimpl.cpp | |||
@@ -46,17 +46,17 @@ static const char * pen_xpm[] = { | |||
46 | " . .@%&. ", | 46 | " . .@%&. ", |
47 | " ... ... .. .@%&. ", | 47 | " ... ... .. .@%&. ", |
48 | " . . . . . .*.&. ", | 48 | " . . . . . .*.&. ", |
49 | " . . . . . .**. ", | 49 | " . . . . . .**. ", |
50 | " ... ... .. ... ", | 50 | " ... ... .. ... ", |
51 | " "}; | 51 | " "}; |
52 | 52 | ||
53 | HandwritingImpl::HandwritingImpl() | 53 | HandwritingImpl::HandwritingImpl() |
54 | : input(0), icn(0), ref(0) | 54 | : input(0), icn(0) |
55 | { | 55 | { |
56 | } | 56 | } |
57 | 57 | ||
58 | HandwritingImpl::~HandwritingImpl() | 58 | HandwritingImpl::~HandwritingImpl() |
59 | { | 59 | { |
60 | delete input; | 60 | delete input; |
61 | delete icn; | 61 | delete icn; |
62 | } | 62 | } |
diff --git a/inputmethods/handwriting/handwritingimpl.h b/inputmethods/handwriting/handwritingimpl.h index 1215853..4297c8c 100644 --- a/inputmethods/handwriting/handwritingimpl.h +++ b/inputmethods/handwriting/handwritingimpl.h | |||
@@ -40,12 +40,11 @@ public: | |||
40 | virtual void resetState(); | 40 | virtual void resetState(); |
41 | virtual QPixmap *icon(); | 41 | virtual QPixmap *icon(); |
42 | virtual QString name(); | 42 | virtual QString name(); |
43 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 43 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
44 | 44 | ||
45 | private: | 45 | private: |
46 | QIMPenInput *input; | 46 | QIMPenInput *input; |
47 | QPixmap *icn; | 47 | QPixmap *icn; |
48 | ulong ref; | ||
49 | }; | 48 | }; |
50 | 49 | ||
51 | #endif | 50 | #endif |
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp index e75dd5f..b40046c 100644 --- a/inputmethods/jumpx/keyboardimpl.cpp +++ b/inputmethods/jumpx/keyboardimpl.cpp | |||
@@ -30,17 +30,17 @@ static const char * const icon_xpm[] = { | |||
30 | " ....... ... ... ....... ", | 30 | " ....... ... ... ....... ", |
31 | ". . . . . . . ", | 31 | ". . . . . . . ", |
32 | ". . . . . . . ", | 32 | ". . . . . . . ", |
33 | ". . . . . . . ", | 33 | ". . . . . . . ", |
34 | " ... ... ... ... ... ... "}; | 34 | " ... ... ... ... ... ... "}; |
35 | 35 | ||
36 | 36 | ||
37 | KeyboardImpl::KeyboardImpl() | 37 | KeyboardImpl::KeyboardImpl() |
38 | : input(0), icn(0), ref(0) | 38 | : input(0), icn(0) |
39 | { | 39 | { |
40 | } | 40 | } |
41 | 41 | ||
42 | KeyboardImpl::~KeyboardImpl() | 42 | KeyboardImpl::~KeyboardImpl() |
43 | { | 43 | { |
44 | delete input; | 44 | delete input; |
45 | delete icn; | 45 | delete icn; |
46 | } | 46 | } |
diff --git a/inputmethods/jumpx/keyboardimpl.h b/inputmethods/jumpx/keyboardimpl.h index 087781f..cee4c18 100644 --- a/inputmethods/jumpx/keyboardimpl.h +++ b/inputmethods/jumpx/keyboardimpl.h | |||
@@ -38,14 +38,13 @@ public: | |||
38 | virtual void resetState(); | 38 | virtual void resetState(); |
39 | virtual QPixmap *icon(); | 39 | virtual QPixmap *icon(); |
40 | virtual QString name(); | 40 | virtual QString name(); |
41 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 41 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
42 | 42 | ||
43 | private: | 43 | private: |
44 | JumpX::Keyboard *input; | 44 | JumpX::Keyboard *input; |
45 | QPixmap *icn; | 45 | QPixmap *icn; |
46 | ulong ref; | ||
47 | }; | 46 | }; |
48 | 47 | ||
49 | } // anonymous namespace | 48 | } // anonymous namespace |
50 | 49 | ||
51 | #endif | 50 | #endif |
diff --git a/inputmethods/keyboard/keyboardimpl.cpp b/inputmethods/keyboard/keyboardimpl.cpp index 701d35f..86d0427 100644 --- a/inputmethods/keyboard/keyboardimpl.cpp +++ b/inputmethods/keyboard/keyboardimpl.cpp | |||
@@ -61,17 +61,17 @@ static const char * const ipti_xpm[] = { | |||
61 | " .+++.+++.+++.+++.+++.+++. ", | 61 | " .+++.+++.+++.+++.+++.+++. ", |
62 | " .+@@.+@@.+@@.+@@.+@@.+@@. ", | 62 | " .+@@.+@@.+@@.+@@.+@@.+@@. ", |
63 | " ......................... ", | 63 | " ......................... ", |
64 | " .+++.+++.+++.+++.+++.+++. ", | 64 | " .+++.+++.+++.+++.+++.+++. ", |
65 | " .+@@.+@@.+@@.+@@.+@@.+@@. ", | 65 | " .+@@.+@@.+@@.+@@.+@@.+@@. ", |
66 | " ......................... "}; | 66 | " ......................... "}; |
67 | 67 | ||
68 | KeyboardImpl::KeyboardImpl() | 68 | KeyboardImpl::KeyboardImpl() |
69 | : input(0), icn(0), ref(0) | 69 | : input(0), icn(0) |
70 | { | 70 | { |
71 | } | 71 | } |
72 | 72 | ||
73 | KeyboardImpl::~KeyboardImpl() | 73 | KeyboardImpl::~KeyboardImpl() |
74 | { | 74 | { |
75 | delete input; | 75 | delete input; |
76 | delete icn; | 76 | delete icn; |
77 | } | 77 | } |
diff --git a/inputmethods/keyboard/keyboardimpl.h b/inputmethods/keyboard/keyboardimpl.h index d33a822..644070c 100644 --- a/inputmethods/keyboard/keyboardimpl.h +++ b/inputmethods/keyboard/keyboardimpl.h | |||
@@ -47,14 +47,13 @@ public: | |||
47 | virtual void resetState(); | 47 | virtual void resetState(); |
48 | virtual QPixmap *icon(); | 48 | virtual QPixmap *icon(); |
49 | virtual QString name(); | 49 | virtual QString name(); |
50 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 50 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
51 | 51 | ||
52 | private: | 52 | private: |
53 | KeyboardInput::Keyboard *input; | 53 | KeyboardInput::Keyboard *input; |
54 | QPixmap *icn; | 54 | QPixmap *icn; |
55 | ulong ref; | ||
56 | }; | 55 | }; |
57 | 56 | ||
58 | } // anonymous namespace | 57 | } // anonymous namespace |
59 | 58 | ||
60 | #endif | 59 | #endif |
diff --git a/inputmethods/kjumpx/keyboardimpl.cpp b/inputmethods/kjumpx/keyboardimpl.cpp index 54fe36e..6c4af71 100644 --- a/inputmethods/kjumpx/keyboardimpl.cpp +++ b/inputmethods/kjumpx/keyboardimpl.cpp | |||
@@ -30,17 +30,17 @@ static const char * const icon_xpm[] = { | |||
30 | " ...... .. ...... ", | 30 | " ...... .. ...... ", |
31 | ". . .. . . ", | 31 | ". . .. . . ", |
32 | ". . ....... . . ", | 32 | ". . ....... . . ", |
33 | ". . . . . ", | 33 | ". . . . . ", |
34 | " ... ... ... ... ... ... "}; | 34 | " ... ... ... ... ... ... "}; |
35 | 35 | ||
36 | 36 | ||
37 | KeyboardImpl::KeyboardImpl() | 37 | KeyboardImpl::KeyboardImpl() |
38 | : input(0), icn(0), ref(0) | 38 | : input(0), icn(0) |
39 | { | 39 | { |
40 | } | 40 | } |
41 | 41 | ||
42 | KeyboardImpl::~KeyboardImpl() | 42 | KeyboardImpl::~KeyboardImpl() |
43 | { | 43 | { |
44 | delete input; | 44 | delete input; |
45 | delete icn; | 45 | delete icn; |
46 | } | 46 | } |
diff --git a/inputmethods/kjumpx/keyboardimpl.h b/inputmethods/kjumpx/keyboardimpl.h index 1ff1034..e57121e 100644 --- a/inputmethods/kjumpx/keyboardimpl.h +++ b/inputmethods/kjumpx/keyboardimpl.h | |||
@@ -38,14 +38,13 @@ public: | |||
38 | virtual void resetState(); | 38 | virtual void resetState(); |
39 | virtual QPixmap *icon(); | 39 | virtual QPixmap *icon(); |
40 | virtual QString name(); | 40 | virtual QString name(); |
41 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 41 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
42 | 42 | ||
43 | private: | 43 | private: |
44 | KJumpX::Keyboard *input; | 44 | KJumpX::Keyboard *input; |
45 | QPixmap *icn; | 45 | QPixmap *icn; |
46 | ulong ref; | ||
47 | }; | 46 | }; |
48 | 47 | ||
49 | } // anonymous namespace | 48 | } // anonymous namespace |
50 | 49 | ||
51 | #endif | 50 | #endif |
diff --git a/inputmethods/multikey/keyboardimpl.cpp b/inputmethods/multikey/keyboardimpl.cpp index b7908d9..a1c47ad 100644 --- a/inputmethods/multikey/keyboardimpl.cpp +++ b/inputmethods/multikey/keyboardimpl.cpp | |||
@@ -40,17 +40,17 @@ static const char * const kb_xpm[] = { | |||
40 | " .+@@@@@.+@@.+@@.+@@.+@@@@. ", | 40 | " .+@@@@@.+@@.+@@.+@@.+@@@@. ", |
41 | " .......................... ", | 41 | " .......................... ", |
42 | " .++++.++++++++++++++.++++. ", | 42 | " .++++.++++++++++++++.++++. ", |
43 | " .+@@@.+@@@@@@@@@@@@@.+@@@. ", | 43 | " .+@@@.+@@@@@@@@@@@@@.+@@@. ", |
44 | " .......................... "}; | 44 | " .......................... "}; |
45 | 45 | ||
46 | 46 | ||
47 | KeyboardImpl::KeyboardImpl() | 47 | KeyboardImpl::KeyboardImpl() |
48 | : input(0), icn(0), ref(0) | 48 | : input(0), icn(0) |
49 | { | 49 | { |
50 | } | 50 | } |
51 | 51 | ||
52 | KeyboardImpl::~KeyboardImpl() | 52 | KeyboardImpl::~KeyboardImpl() |
53 | { | 53 | { |
54 | delete input; | 54 | delete input; |
55 | delete icn; | 55 | delete icn; |
56 | } | 56 | } |
diff --git a/inputmethods/multikey/keyboardimpl.h b/inputmethods/multikey/keyboardimpl.h index 76a2955..40fea10 100644 --- a/inputmethods/multikey/keyboardimpl.h +++ b/inputmethods/multikey/keyboardimpl.h | |||
@@ -47,14 +47,13 @@ public: | |||
47 | virtual void resetState(); | 47 | virtual void resetState(); |
48 | virtual QPixmap *icon(); | 48 | virtual QPixmap *icon(); |
49 | virtual QString name(); | 49 | virtual QString name(); |
50 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 50 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
51 | 51 | ||
52 | private: | 52 | private: |
53 | MultiKey::Keyboard *input; | 53 | MultiKey::Keyboard *input; |
54 | QPixmap *icn; | 54 | QPixmap *icn; |
55 | ulong ref; | ||
56 | }; | 55 | }; |
57 | 56 | ||
58 | } // anonymous namespace | 57 | } // anonymous namespace |
59 | 58 | ||
60 | #endif | 59 | #endif |
diff --git a/inputmethods/pickboard/pickboardimpl.cpp b/inputmethods/pickboard/pickboardimpl.cpp index 8f449cd..9a21229 100644 --- a/inputmethods/pickboard/pickboardimpl.cpp +++ b/inputmethods/pickboard/pickboardimpl.cpp | |||
@@ -33,17 +33,17 @@ static const char * pb_xpm[]={ | |||
33 | " # # # # # # # ", | 33 | " # # # # # # # ", |
34 | " ########################## ", | 34 | " ########################## ", |
35 | " # # # # # # ", | 35 | " # # # # # # ", |
36 | " # # # # # # ", | 36 | " # # # # # # ", |
37 | " ########################## "}; | 37 | " ########################## "}; |
38 | 38 | ||
39 | 39 | ||
40 | PickboardImpl::PickboardImpl() | 40 | PickboardImpl::PickboardImpl() |
41 | : pickboard(0), icn(0), ref(0) | 41 | : pickboard(0), icn(0) |
42 | { | 42 | { |
43 | } | 43 | } |
44 | 44 | ||
45 | PickboardImpl::~PickboardImpl() | 45 | PickboardImpl::~PickboardImpl() |
46 | { | 46 | { |
47 | delete pickboard; | 47 | delete pickboard; |
48 | delete icn; | 48 | delete icn; |
49 | } | 49 | } |
diff --git a/inputmethods/pickboard/pickboardimpl.h b/inputmethods/pickboard/pickboardimpl.h index 4f23665..8340d0d 100644 --- a/inputmethods/pickboard/pickboardimpl.h +++ b/inputmethods/pickboard/pickboardimpl.h | |||
@@ -40,12 +40,11 @@ public: | |||
40 | virtual void resetState(); | 40 | virtual void resetState(); |
41 | virtual QPixmap *icon(); | 41 | virtual QPixmap *icon(); |
42 | virtual QString name(); | 42 | virtual QString name(); |
43 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 43 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
44 | 44 | ||
45 | private: | 45 | private: |
46 | Pickboard *pickboard; | 46 | Pickboard *pickboard; |
47 | QPixmap *icn; | 47 | QPixmap *icn; |
48 | ulong ref; | ||
49 | }; | 48 | }; |
50 | 49 | ||
51 | #endif | 50 | #endif |
diff --git a/inputmethods/unikeyboard/unikeyboardimpl.cpp b/inputmethods/unikeyboard/unikeyboardimpl.cpp index e7fc00e..451f340 100644 --- a/inputmethods/unikeyboard/unikeyboardimpl.cpp +++ b/inputmethods/unikeyboard/unikeyboardimpl.cpp | |||
@@ -38,17 +38,17 @@ static const char * uni_xpm[]={ | |||
38 | "...####....####...#######...", | 38 | "...####....####...#######...", |
39 | "...####....####....######...", | 39 | "...####....####....######...", |
40 | "...#####..#####.....#####...", | 40 | "...#####..#####.....#####...", |
41 | "....##########.......####...", | 41 | "....##########.......####...", |
42 | "......######..........###...", | 42 | "......######..........###...", |
43 | "............................"}; | 43 | "............................"}; |
44 | 44 | ||
45 | UniKeyboardImpl::UniKeyboardImpl() | 45 | UniKeyboardImpl::UniKeyboardImpl() |
46 | : input(0), icn(0), ref(0) | 46 | : input(0), icn(0) |
47 | { | 47 | { |
48 | } | 48 | } |
49 | 49 | ||
50 | UniKeyboardImpl::~UniKeyboardImpl() | 50 | UniKeyboardImpl::~UniKeyboardImpl() |
51 | { | 51 | { |
52 | delete input; | 52 | delete input; |
53 | delete icn; | 53 | delete icn; |
54 | } | 54 | } |
diff --git a/inputmethods/unikeyboard/unikeyboardimpl.h b/inputmethods/unikeyboard/unikeyboardimpl.h index 97b1ff6..8c7802f 100644 --- a/inputmethods/unikeyboard/unikeyboardimpl.h +++ b/inputmethods/unikeyboard/unikeyboardimpl.h | |||
@@ -38,12 +38,11 @@ public: | |||
38 | virtual void resetState(); | 38 | virtual void resetState(); |
39 | virtual QPixmap *icon(); | 39 | virtual QPixmap *icon(); |
40 | virtual QString name(); | 40 | virtual QString name(); |
41 | virtual void onKeyPress( QObject *receiver, const char *slot ); | 41 | virtual void onKeyPress( QObject *receiver, const char *slot ); |
42 | 42 | ||
43 | private: | 43 | private: |
44 | UniKeyboard *input; | 44 | UniKeyboard *input; |
45 | QPixmap *icn; | 45 | QPixmap *icn; |
46 | ulong ref; | ||
47 | }; | 46 | }; |
48 | 47 | ||
49 | #endif | 48 | #endif |