summaryrefslogtreecommitdiff
path: root/inputmethods
Unidiff
Diffstat (limited to 'inputmethods') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dasher/QtDasherImpl.cc2
-rw-r--r--inputmethods/dasher/QtDasherImpl.h1
-rw-r--r--inputmethods/dvorak/dvorakimpl.cpp2
-rw-r--r--inputmethods/dvorak/dvorakimpl.h1
-rw-r--r--inputmethods/handwriting/handwritingimpl.cpp2
-rw-r--r--inputmethods/handwriting/handwritingimpl.h1
-rw-r--r--inputmethods/jumpx/keyboardimpl.cpp2
-rw-r--r--inputmethods/jumpx/keyboardimpl.h1
-rw-r--r--inputmethods/keyboard/keyboardimpl.cpp2
-rw-r--r--inputmethods/keyboard/keyboardimpl.h1
-rw-r--r--inputmethods/kjumpx/keyboardimpl.cpp2
-rw-r--r--inputmethods/kjumpx/keyboardimpl.h1
-rw-r--r--inputmethods/multikey/keyboardimpl.cpp2
-rw-r--r--inputmethods/multikey/keyboardimpl.h1
-rw-r--r--inputmethods/pickboard/pickboardimpl.cpp2
-rw-r--r--inputmethods/pickboard/pickboardimpl.h1
-rw-r--r--inputmethods/unikeyboard/unikeyboardimpl.cpp2
-rw-r--r--inputmethods/unikeyboard/unikeyboardimpl.h1
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
@@ -8,33 +8,33 @@
8 8
9/* XPM */ 9/* XPM */
10static const char * qtdasher_xpm[]={ 10static const char * qtdasher_xpm[]={
11"28 7 2 1", 11"28 7 2 1",
12"# c #303030", 12"# c #303030",
13" c None", 13" c None",
14" ########################## ", 14" ########################## ",
15" ", 15" ",
16" # # ", 16" # # ",
17" # # # # ", 17" # # # # ",
18" # # # # ", 18" # # # # ",
19" # # # ", 19" # # # ",
20" ########################## "}; 20" ########################## "};
21 21
22 22
23QtDasherImpl::QtDasherImpl() 23QtDasherImpl::QtDasherImpl()
24 : qtdasherwidget(0), icn(0), ref(0), qtdasherinterface(0) 24 : qtdasherwidget(0), icn(0), qtdasherinterface(0)
25{ 25{
26} 26}
27 27
28QtDasherImpl::~QtDasherImpl() 28QtDasherImpl::~QtDasherImpl()
29{ 29{
30 delete qtdasherwidget; 30 delete qtdasherwidget;
31 delete icn; 31 delete icn;
32} 32}
33 33
34QWidget *QtDasherImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 34QWidget *QtDasherImpl::inputMethod( QWidget *parent, Qt::WFlags f )
35{ 35{
36 if ( !qtdasherwidget ) { 36 if ( !qtdasherwidget ) {
37 qtdasherwidget = new QtDasherPlugin( parent, "Dasher", f ); 37 qtdasherwidget = new QtDasherPlugin( parent, "Dasher", f );
38 } 38 }
39 return qtdasherwidget; 39 return qtdasherwidget;
40} 40}
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
@@ -15,24 +15,23 @@ public:
15 15
16#ifndef QT_NO_COMPONENT 16#ifndef QT_NO_COMPONENT
17 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 17 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
18 Q_REFCOUNT 18 Q_REFCOUNT
19#endif 19#endif
20 20
21 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 21 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
22 virtual void resetState(); 22 virtual void resetState();
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
27private: 27private:
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
@@ -55,33 +55,33 @@ static const char * const opti_xpm[] = {
55" .+++.+++.+++.+++.+++.+++. ", 55" .+++.+++.+++.+++.+++.+++. ",
56" .+@@.+@@.+@@.+@@.+@@.+@@. ", 56" .+@@.+@@.+@@.+@@.+@@.+@@. ",
57" ......................... ", 57" ......................... ",
58" .+++.+++.+++.+++.+++.+++. ", 58" .+++.+++.+++.+++.+++.+++. ",
59" .+@@.+@@.+@@.+@@.+@@.+@@. ", 59" .+@@.+@@.+@@.+@@.+@@.+@@. ",
60" ......................... ", 60" ......................... ",
61" .+++.+++.+++.+++.+++.+++. ", 61" .+++.+++.+++.+++.+++.+++. ",
62" .+@@.+@@.+@@.+@@.+@@.+@@. ", 62" .+@@.+@@.+@@.+@@.+@@.+@@. ",
63" ......................... ", 63" ......................... ",
64" .+++.+++.+++.+++.+++.+++. ", 64" .+++.+++.+++.+++.+++.+++. ",
65" .+@@.+@@.+@@.+@@.+@@.+@@. ", 65" .+@@.+@@.+@@.+@@.+@@.+@@. ",
66" ......................... "}; 66" ......................... "};
67 67
68 68
69 69
70KeyboardImpl::KeyboardImpl() 70KeyboardImpl::KeyboardImpl()
71 : input(0), icn(0), ref(0) 71 : input(0), icn(0)
72{ 72{
73} 73}
74 74
75KeyboardImpl::~KeyboardImpl() 75KeyboardImpl::~KeyboardImpl()
76{ 76{
77 delete input; 77 delete input;
78 delete icn; 78 delete icn;
79} 79}
80 80
81QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 81QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
82{ 82{
83 if ( !input ) 83 if ( !input )
84 input = new Dvorak::Keyboard( parent, "Keyboard", f ); 84 input = new Dvorak::Keyboard( parent, "Keyboard", f );
85 return input; 85 return input;
86} 86}
87 87
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
@@ -39,22 +39,21 @@ public:
39 virtual ~KeyboardImpl(); 39 virtual ~KeyboardImpl();
40 40
41#ifndef QT_NO_COMPONENT 41#ifndef QT_NO_COMPONENT
42 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 42 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
43 Q_REFCOUNT 43 Q_REFCOUNT
44#endif 44#endif
45 45
46 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 46 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
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
52private: 52private:
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
@@ -38,33 +38,33 @@ static const char * pen_xpm[] = {
38"* c #A3732C", 38"* c #A3732C",
39" . ", 39" . ",
40" .+. ", 40" .+. ",
41" .@#$. ", 41" .@#$. ",
42" .@%&. ", 42" .@%&. ",
43" .@%&. ", 43" .@%&. ",
44" . .@%&. ", 44" . .@%&. ",
45" . .@%&. ", 45" . .@%&. ",
46" . .@%&. ", 46" . .@%&. ",
47" ... ... .. .@%&. ", 47" ... ... .. .@%&. ",
48" . . . . . .*.&. ", 48" . . . . . .*.&. ",
49" . . . . . .**. ", 49" . . . . . .**. ",
50" ... ... .. ... ", 50" ... ... .. ... ",
51" "}; 51" "};
52 52
53HandwritingImpl::HandwritingImpl() 53HandwritingImpl::HandwritingImpl()
54 : input(0), icn(0), ref(0) 54 : input(0), icn(0)
55{ 55{
56} 56}
57 57
58HandwritingImpl::~HandwritingImpl() 58HandwritingImpl::~HandwritingImpl()
59{ 59{
60 delete input; 60 delete input;
61 delete icn; 61 delete icn;
62} 62}
63 63
64QWidget *HandwritingImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 64QWidget *HandwritingImpl::inputMethod( QWidget *parent, Qt::WFlags f )
65{ 65{
66 if ( !input ) 66 if ( !input )
67 input = new QIMPenInput( parent, "Handwriting", f ); 67 input = new QIMPenInput( parent, "Handwriting", f );
68 return input; 68 return input;
69} 69}
70 70
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
@@ -32,20 +32,19 @@ public:
32 virtual ~HandwritingImpl(); 32 virtual ~HandwritingImpl();
33 33
34#ifndef QT_NO_COMPONENT 34#ifndef QT_NO_COMPONENT
35 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 35 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
36 Q_REFCOUNT 36 Q_REFCOUNT
37#endif 37#endif
38 38
39 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 39 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
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
45private: 45private:
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
@@ -22,33 +22,33 @@ static const char * const icon_xpm[] = {
22" ... ... ... ... ... ... ", 22" ... ... ... ... ... ... ",
23". . . . . . . ", 23". . . . . . . ",
24". . . . . . . ", 24". . . . . . . ",
25". . . . . . . ", 25". . . . . . . ",
26" ....... ... ... ....... ", 26" ....... ... ... ....... ",
27". . . . . ", 27". . . . . ",
28". . . . . ", 28". . . . . ",
29". . . . . ", 29". . . . . ",
30" ....... ... ... ....... ", 30" ....... ... ... ....... ",
31". . . . . . . ", 31". . . . . . . ",
32". . . . . . . ", 32". . . . . . . ",
33". . . . . . . ", 33". . . . . . . ",
34" ... ... ... ... ... ... "}; 34" ... ... ... ... ... ... "};
35 35
36 36
37KeyboardImpl::KeyboardImpl() 37KeyboardImpl::KeyboardImpl()
38 : input(0), icn(0), ref(0) 38 : input(0), icn(0)
39{ 39{
40} 40}
41 41
42KeyboardImpl::~KeyboardImpl() 42KeyboardImpl::~KeyboardImpl()
43{ 43{
44 delete input; 44 delete input;
45 delete icn; 45 delete icn;
46} 46}
47 47
48QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 48QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
49{ 49{
50 if ( !input ) 50 if ( !input )
51 input = new JumpX::Keyboard( parent, "Keyboard", f ); 51 input = new JumpX::Keyboard( parent, "Keyboard", f );
52 return input; 52 return input;
53} 53}
54 54
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
@@ -30,22 +30,21 @@ public:
30 virtual ~KeyboardImpl(); 30 virtual ~KeyboardImpl();
31 31
32#ifndef QT_NO_COMPONENT 32#ifndef QT_NO_COMPONENT
33 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 33 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
34 Q_REFCOUNT 34 Q_REFCOUNT
35#endif 35#endif
36 36
37 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 37 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
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
43private: 43private:
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
@@ -53,33 +53,33 @@ static const char * const ipti_xpm[] = {
53"@ c #D6CFBA", 53"@ c #D6CFBA",
54" ......................... ", 54" ......................... ",
55" .+++.+++.+++.+++.+++.+++. ", 55" .+++.+++.+++.+++.+++.+++. ",
56" .+@@.+@@.+@@.+@@.+@@.+@@. ", 56" .+@@.+@@.+@@.+@@.+@@.+@@. ",
57" ......................... ", 57" ......................... ",
58" .+++.+++.+++.+++.+++.+++. ", 58" .+++.+++.+++.+++.+++.+++. ",
59" .+@@.+@@.+@@.+@@.+@@.+@@. ", 59" .+@@.+@@.+@@.+@@.+@@.+@@. ",
60" ......................... ", 60" ......................... ",
61" .+++.+++.+++.+++.+++.+++. ", 61" .+++.+++.+++.+++.+++.+++. ",
62" .+@@.+@@.+@@.+@@.+@@.+@@. ", 62" .+@@.+@@.+@@.+@@.+@@.+@@. ",
63" ......................... ", 63" ......................... ",
64" .+++.+++.+++.+++.+++.+++. ", 64" .+++.+++.+++.+++.+++.+++. ",
65" .+@@.+@@.+@@.+@@.+@@.+@@. ", 65" .+@@.+@@.+@@.+@@.+@@.+@@. ",
66" ......................... "}; 66" ......................... "};
67 67
68KeyboardImpl::KeyboardImpl() 68KeyboardImpl::KeyboardImpl()
69 : input(0), icn(0), ref(0) 69 : input(0), icn(0)
70{ 70{
71} 71}
72 72
73KeyboardImpl::~KeyboardImpl() 73KeyboardImpl::~KeyboardImpl()
74{ 74{
75 delete input; 75 delete input;
76 delete icn; 76 delete icn;
77} 77}
78 78
79QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 79QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
80{ 80{
81 if ( !input ) 81 if ( !input )
82 input = new KeyboardInput::Keyboard( parent, "Keyboard", f ); 82 input = new KeyboardInput::Keyboard( parent, "Keyboard", f );
83 return input; 83 return input;
84} 84}
85 85
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
@@ -39,22 +39,21 @@ public:
39 virtual ~KeyboardImpl(); 39 virtual ~KeyboardImpl();
40 40
41#ifndef QT_NO_COMPONENT 41#ifndef QT_NO_COMPONENT
42 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 42 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
43 Q_REFCOUNT 43 Q_REFCOUNT
44#endif 44#endif
45 45
46 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 46 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
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
52private: 52private:
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
@@ -22,33 +22,33 @@ static const char * const icon_xpm[] = {
22" ... ... ... ... ... ... ", 22" ... ... ... ... ... ... ",
23". . . . . ", 23". . . . . ",
24". . ... .. . . ", 24". . ... .. . . ",
25". . .. . . ", 25". . .. . . ",
26" ...... ...... ... .... ", 26" ...... ...... ... .... ",
27". .. .. .. . ", 27". .. .. .. . ",
28". .. .. .. . ", 28". .. .. .. . ",
29". ... .. . ", 29". ... .. . ",
30" ...... .. ...... ", 30" ...... .. ...... ",
31". . .. . . ", 31". . .. . . ",
32". . ....... . . ", 32". . ....... . . ",
33". . . . . ", 33". . . . . ",
34" ... ... ... ... ... ... "}; 34" ... ... ... ... ... ... "};
35 35
36 36
37KeyboardImpl::KeyboardImpl() 37KeyboardImpl::KeyboardImpl()
38 : input(0), icn(0), ref(0) 38 : input(0), icn(0)
39{ 39{
40} 40}
41 41
42KeyboardImpl::~KeyboardImpl() 42KeyboardImpl::~KeyboardImpl()
43{ 43{
44 delete input; 44 delete input;
45 delete icn; 45 delete icn;
46} 46}
47 47
48QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 48QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
49{ 49{
50 if ( !input ) 50 if ( !input )
51 input = new KJumpX::Keyboard( parent, "Keyboard", f ); 51 input = new KJumpX::Keyboard( parent, "Keyboard", f );
52 return input; 52 return input;
53} 53}
54 54
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
@@ -30,22 +30,21 @@ public:
30 virtual ~KeyboardImpl(); 30 virtual ~KeyboardImpl();
31 31
32#ifndef QT_NO_COMPONENT 32#ifndef QT_NO_COMPONENT
33 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 33 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
34 Q_REFCOUNT 34 Q_REFCOUNT
35#endif 35#endif
36 36
37 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 37 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
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
43private: 43private:
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
@@ -32,33 +32,33 @@ static const char * const kb_xpm[] = {
32" .......................... ", 32" .......................... ",
33" .+++.+++.+++.+++.+++.++++. ", 33" .+++.+++.+++.+++.+++.++++. ",
34" .+@@.+@@.+@@.+@@.+@@.+@@@. ", 34" .+@@.+@@.+@@.+@@.+@@.+@@@. ",
35" .......................... ", 35" .......................... ",
36" .+++++.+++.+++.+++.++++++. ", 36" .+++++.+++.+++.+++.++++++. ",
37" .+@@@@.+@@.+@@.+@@.+@@@@@. ", 37" .+@@@@.+@@.+@@.+@@.+@@@@@. ",
38" .......................... ", 38" .......................... ",
39" .++++++.+++.+++.+++.+++++. ", 39" .++++++.+++.+++.+++.+++++. ",
40" .+@@@@@.+@@.+@@.+@@.+@@@@. ", 40" .+@@@@@.+@@.+@@.+@@.+@@@@. ",
41" .......................... ", 41" .......................... ",
42" .++++.++++++++++++++.++++. ", 42" .++++.++++++++++++++.++++. ",
43" .+@@@.+@@@@@@@@@@@@@.+@@@. ", 43" .+@@@.+@@@@@@@@@@@@@.+@@@. ",
44" .......................... "}; 44" .......................... "};
45 45
46 46
47KeyboardImpl::KeyboardImpl() 47KeyboardImpl::KeyboardImpl()
48 : input(0), icn(0), ref(0) 48 : input(0), icn(0)
49{ 49{
50} 50}
51 51
52KeyboardImpl::~KeyboardImpl() 52KeyboardImpl::~KeyboardImpl()
53{ 53{
54 delete input; 54 delete input;
55 delete icn; 55 delete icn;
56} 56}
57 57
58QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 58QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
59{ 59{
60 if ( !input ) 60 if ( !input )
61 input = new MultiKey::Keyboard( parent, "Keyboard", f ); 61 input = new MultiKey::Keyboard( parent, "Keyboard", f );
62 return input; 62 return input;
63} 63}
64 64
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
@@ -39,22 +39,21 @@ public:
39 virtual ~KeyboardImpl(); 39 virtual ~KeyboardImpl();
40 40
41#ifndef QT_NO_COMPONENT 41#ifndef QT_NO_COMPONENT
42 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 42 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
43 Q_REFCOUNT 43 Q_REFCOUNT
44#endif 44#endif
45 45
46 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 46 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
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
52private: 52private:
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
@@ -25,33 +25,33 @@
25 25
26/* XPM */ 26/* XPM */
27static const char * pb_xpm[]={ 27static const char * pb_xpm[]={
28"28 7 2 1", 28"28 7 2 1",
29"# c #303030", 29"# c #303030",
30" c None", 30" c None",
31" ########################## ", 31" ########################## ",
32" # # # # # # # ", 32" # # # # # # # ",
33" # # # # # # # ", 33" # # # # # # # ",
34" ########################## ", 34" ########################## ",
35" # # # # # # ", 35" # # # # # # ",
36" # # # # # # ", 36" # # # # # # ",
37" ########################## "}; 37" ########################## "};
38 38
39 39
40PickboardImpl::PickboardImpl() 40PickboardImpl::PickboardImpl()
41 : pickboard(0), icn(0), ref(0) 41 : pickboard(0), icn(0)
42{ 42{
43} 43}
44 44
45PickboardImpl::~PickboardImpl() 45PickboardImpl::~PickboardImpl()
46{ 46{
47 delete pickboard; 47 delete pickboard;
48 delete icn; 48 delete icn;
49} 49}
50 50
51QWidget *PickboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 51QWidget *PickboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
52{ 52{
53 if ( !pickboard ) 53 if ( !pickboard )
54 pickboard = new Pickboard( parent, "pickboard", f ); 54 pickboard = new Pickboard( parent, "pickboard", f );
55 return pickboard; 55 return pickboard;
56} 56}
57 57
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
@@ -32,20 +32,19 @@ public:
32 virtual ~PickboardImpl(); 32 virtual ~PickboardImpl();
33 33
34#ifndef QT_NO_COMPONENT 34#ifndef QT_NO_COMPONENT
35 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 35 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
36 Q_REFCOUNT 36 Q_REFCOUNT
37#endif 37#endif
38 38
39 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 39 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
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
45private: 45private:
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
@@ -30,33 +30,33 @@ static const char * uni_xpm[]={
30". c None", 30". c None",
31"............................", 31"............................",
32"...####....#####.....####...", 32"...####....#####.....####...",
33"...####....######....####...", 33"...####....######....####...",
34"...####....#######..........", 34"...####....#######..........",
35"...####....########..####...", 35"...####....########..####...",
36"...####....####.####.####...", 36"...####....####.####.####...",
37"...####....####..########...", 37"...####....####..########...",
38"...####....####...#######...", 38"...####....####...#######...",
39"...####....####....######...", 39"...####....####....######...",
40"...#####..#####.....#####...", 40"...#####..#####.....#####...",
41"....##########.......####...", 41"....##########.......####...",
42"......######..........###...", 42"......######..........###...",
43"............................"}; 43"............................"};
44 44
45UniKeyboardImpl::UniKeyboardImpl() 45UniKeyboardImpl::UniKeyboardImpl()
46 : input(0), icn(0), ref(0) 46 : input(0), icn(0)
47{ 47{
48} 48}
49 49
50UniKeyboardImpl::~UniKeyboardImpl() 50UniKeyboardImpl::~UniKeyboardImpl()
51{ 51{
52 delete input; 52 delete input;
53 delete icn; 53 delete icn;
54} 54}
55 55
56QWidget *UniKeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 56QWidget *UniKeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
57{ 57{
58 if ( !input ) 58 if ( !input )
59 input = new UniKeyboard( parent, "UniKeyboard", f ); 59 input = new UniKeyboard( parent, "UniKeyboard", f );
60 return input; 60 return input;
61} 61}
62 62
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
@@ -30,20 +30,19 @@ class UniKeyboardImpl : public InputMethodInterface
30public: 30public:
31 UniKeyboardImpl(); 31 UniKeyboardImpl();
32 virtual ~UniKeyboardImpl(); 32 virtual ~UniKeyboardImpl();
33 33
34 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 34 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
35 Q_REFCOUNT 35 Q_REFCOUNT
36 36
37 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); 37 virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f );
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
43private: 43private:
44 UniKeyboard *input; 44 UniKeyboard *input;
45 QPixmap *icn; 45 QPixmap *icn;
46 ulong ref;
47}; 46};
48 47
49#endif 48#endif