author | zecke <zecke> | 2004-02-05 17:15:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-05 17:15:20 (UTC) |
commit | f6487edaaad38c6454fc50697d7884f0bc627489 (patch) (unidiff) | |
tree | 26b2ea805710488c84a731fef576467047fb80fd /inputmethods | |
parent | 416c72588577bca18ba1c9180701143e7e572eed (diff) | |
download | opie-f6487edaaad38c6454fc50697d7884f0bc627489.zip opie-f6487edaaad38c6454fc50697d7884f0bc627489.tar.gz opie-f6487edaaad38c6454fc50697d7884f0bc627489.tar.bz2 |
More janitor....
remove ulong ref because we use Q_REFCOUNT which also takes
care of initializing the refcount to 0
"And if you save yourself
You will make him happy
He'll keep you in a jar
And you'll think you're happy
He'll give you breathing holes"
-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 | |||
@@ -1,87 +1,87 @@ | |||
1 | #include <iostream> | 1 | #include <iostream> |
2 | #include <qapplication.h> | 2 | #include <qapplication.h> |
3 | #include <qobject.h> | 3 | #include <qobject.h> |
4 | #include <qpixmap.h> | 4 | #include <qpixmap.h> |
5 | #include "DasherInterface.h" | 5 | #include "DasherInterface.h" |
6 | #include "QtDasherScreen.h" | 6 | #include "QtDasherScreen.h" |
7 | #include "QtDasherImpl.h" | 7 | #include "QtDasherImpl.h" |
8 | 8 | ||
9 | /* XPM */ | 9 | /* XPM */ |
10 | static const char * qtdasher_xpm[]={ | 10 | static 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 | ||
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 | } |
33 | 33 | ||
34 | QWidget *QtDasherImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 34 | QWidget *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 | } |
41 | 41 | ||
42 | void QtDasherImpl::resetState() | 42 | void QtDasherImpl::resetState() |
43 | { | 43 | { |
44 | if ( qtdasherwidget ) | 44 | if ( qtdasherwidget ) |
45 | qtdasherwidget->resetState(); | 45 | qtdasherwidget->resetState(); |
46 | } | 46 | } |
47 | 47 | ||
48 | QPixmap *QtDasherImpl::icon() | 48 | QPixmap *QtDasherImpl::icon() |
49 | { | 49 | { |
50 | if ( !icn ) | 50 | if ( !icn ) |
51 | icn = new QPixmap( (const char **)qtdasher_xpm ); | 51 | icn = new QPixmap( (const char **)qtdasher_xpm ); |
52 | return icn; | 52 | return icn; |
53 | } | 53 | } |
54 | 54 | ||
55 | QString QtDasherImpl::name() | 55 | QString QtDasherImpl::name() |
56 | { | 56 | { |
57 | return qApp->translate( "InputMethods", "Dasher" ); | 57 | return qApp->translate( "InputMethods", "Dasher" ); |
58 | } | 58 | } |
59 | 59 | ||
60 | void QtDasherImpl::onKeyPress( QObject *receiver, const char *slot ) | 60 | void QtDasherImpl::onKeyPress( QObject *receiver, const char *slot ) |
61 | { | 61 | { |
62 | if ( qtdasherwidget ) | 62 | if ( qtdasherwidget ) |
63 | QObject::connect( qtdasherwidget, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 63 | QObject::connect( qtdasherwidget, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
64 | } | 64 | } |
65 | 65 | ||
66 | #ifndef QT_NO_COMPONENT | 66 | #ifndef QT_NO_COMPONENT |
67 | QRESULT QtDasherImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 67 | QRESULT QtDasherImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
68 | { | 68 | { |
69 | *iface = 0; | 69 | *iface = 0; |
70 | if ( uuid == IID_QUnknown ) | 70 | if ( uuid == IID_QUnknown ) |
71 | *iface = this; | 71 | *iface = this; |
72 | else if ( uuid == IID_InputMethod ) | 72 | else if ( uuid == IID_InputMethod ) |
73 | *iface = this; | 73 | *iface = this; |
74 | else | 74 | else |
75 | return QS_FALSE; | 75 | return QS_FALSE; |
76 | 76 | ||
77 | if ( *iface ) | 77 | if ( *iface ) |
78 | (*iface)->addRef(); | 78 | (*iface)->addRef(); |
79 | return QS_OK; | 79 | return QS_OK; |
80 | } | 80 | } |
81 | 81 | ||
82 | Q_EXPORT_INTERFACE() | 82 | Q_EXPORT_INTERFACE() |
83 | { | 83 | { |
84 | Q_CREATE_INSTANCE( QtDasherImpl ) | 84 | Q_CREATE_INSTANCE( QtDasherImpl ) |
85 | } | 85 | } |
86 | #endif | 86 | #endif |
87 | 87 | ||
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 | |||
@@ -1,38 +1,37 @@ | |||
1 | #ifndef QTDASHERIMPL_H | 1 | #ifndef QTDASHERIMPL_H |
2 | #define QTDASHERIMPL_H | 2 | #define QTDASHERIMPL_H |
3 | 3 | ||
4 | #include <qpe/inputmethodinterface.h> | 4 | #include <qpe/inputmethodinterface.h> |
5 | #include "QtDasherPlugin.h" | 5 | #include "QtDasherPlugin.h" |
6 | 6 | ||
7 | class QtDasher; | 7 | class QtDasher; |
8 | class QPixmap; | 8 | class QPixmap; |
9 | 9 | ||
10 | class QtDasherImpl : public InputMethodInterface | 10 | class QtDasherImpl : public InputMethodInterface |
11 | { | 11 | { |
12 | public: | 12 | public: |
13 | QtDasherImpl(); | 13 | QtDasherImpl(); |
14 | virtual ~QtDasherImpl(); | 14 | virtual ~QtDasherImpl(); |
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 | ||
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 | |||
@@ -7,126 +7,126 @@ | |||
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qapplication.h> | 20 | #include <qapplication.h> |
21 | #include <qpixmap.h> | 21 | #include <qpixmap.h> |
22 | #include "dvorak.h" | 22 | #include "dvorak.h" |
23 | #include "dvorakimpl.h" | 23 | #include "dvorakimpl.h" |
24 | 24 | ||
25 | /* XPM */ | 25 | /* XPM */ |
26 | static const char * const kb_xpm[] = { | 26 | static const char * const kb_xpm[] = { |
27 | "28 13 4 1", | 27 | "28 13 4 1", |
28 | " c None", | 28 | " c None", |
29 | ". c #4C4C4C", | 29 | ". c #4C4C4C", |
30 | "+ c #FFF7DD", | 30 | "+ c #FFF7DD", |
31 | "@ c #D6CFBA", | 31 | "@ c #D6CFBA", |
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 | ||
47 | /* XPM */ | 47 | /* XPM */ |
48 | static const char * const opti_xpm[] = { | 48 | static const char * const opti_xpm[] = { |
49 | "28 13 4 1", | 49 | "28 13 4 1", |
50 | " c None", | 50 | " c None", |
51 | ". c #4C4C4C", | 51 | ". c #4C4C4C", |
52 | "+ c #FFF7DD", | 52 | "+ c #FFF7DD", |
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 | ||
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 | } |
80 | 80 | ||
81 | QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 81 | QWidget *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 | ||
88 | void KeyboardImpl::resetState() | 88 | void KeyboardImpl::resetState() |
89 | { | 89 | { |
90 | if ( input ) | 90 | if ( input ) |
91 | input->resetState(); | 91 | input->resetState(); |
92 | } | 92 | } |
93 | 93 | ||
94 | QPixmap *KeyboardImpl::icon() | 94 | QPixmap *KeyboardImpl::icon() |
95 | { | 95 | { |
96 | if ( !icn ) | 96 | if ( !icn ) |
97 | icn = new QPixmap( (const char **)kb_xpm ); | 97 | icn = new QPixmap( (const char **)kb_xpm ); |
98 | return icn; | 98 | return icn; |
99 | } | 99 | } |
100 | 100 | ||
101 | QString KeyboardImpl::name() | 101 | QString KeyboardImpl::name() |
102 | { | 102 | { |
103 | return qApp->translate( "InputMethods", "Dvorak" ); | 103 | return qApp->translate( "InputMethods", "Dvorak" ); |
104 | } | 104 | } |
105 | 105 | ||
106 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) | 106 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) |
107 | { | 107 | { |
108 | if ( input ) | 108 | if ( input ) |
109 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 109 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
110 | } | 110 | } |
111 | 111 | ||
112 | #ifndef QT_NO_COMPONENT | 112 | #ifndef QT_NO_COMPONENT |
113 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 113 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
114 | { | 114 | { |
115 | *iface = 0; | 115 | *iface = 0; |
116 | if ( uuid == IID_QUnknown ) | 116 | if ( uuid == IID_QUnknown ) |
117 | *iface = this; | 117 | *iface = this; |
118 | else if ( uuid == IID_InputMethod ) | 118 | else if ( uuid == IID_InputMethod ) |
119 | *iface = this; | 119 | *iface = this; |
120 | else | 120 | else |
121 | return QS_FALSE; | 121 | return QS_FALSE; |
122 | 122 | ||
123 | if ( *iface ) | 123 | if ( *iface ) |
124 | (*iface)->addRef(); | 124 | (*iface)->addRef(); |
125 | return QS_OK; | 125 | return QS_OK; |
126 | } | 126 | } |
127 | 127 | ||
128 | Q_EXPORT_INTERFACE() | 128 | Q_EXPORT_INTERFACE() |
129 | { | 129 | { |
130 | Q_CREATE_INSTANCE( KeyboardImpl ) | 130 | Q_CREATE_INSTANCE( KeyboardImpl ) |
131 | } | 131 | } |
132 | #endif | 132 | #endif |
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 | |||
@@ -1,60 +1,59 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef KEYBOARDIMPL_H | 20 | #ifndef KEYBOARDIMPL_H |
21 | #define KEYBOARDIMPL_H | 21 | #define KEYBOARDIMPL_H |
22 | 22 | ||
23 | #include <qpe/inputmethodinterface.h> | 23 | #include <qpe/inputmethodinterface.h> |
24 | 24 | ||
25 | namespace Dvorak | 25 | namespace Dvorak |
26 | { | 26 | { |
27 | class Keyboard; | 27 | class Keyboard; |
28 | } | 28 | } |
29 | 29 | ||
30 | class QPixmap; | 30 | class QPixmap; |
31 | 31 | ||
32 | namespace | 32 | namespace |
33 | { | 33 | { |
34 | 34 | ||
35 | class KeyboardImpl : public InputMethodInterface | 35 | class KeyboardImpl : public InputMethodInterface |
36 | { | 36 | { |
37 | public: | 37 | public: |
38 | KeyboardImpl(); | 38 | KeyboardImpl(); |
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 | ||
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 | |||
@@ -1,115 +1,115 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include <qapplication.h> | 21 | #include <qapplication.h> |
22 | #include <qwidget.h> | 22 | #include <qwidget.h> |
23 | #include <qpixmap.h> | 23 | #include <qpixmap.h> |
24 | #include "qimpeninput.h" | 24 | #include "qimpeninput.h" |
25 | #include "handwritingimpl.h" | 25 | #include "handwritingimpl.h" |
26 | 26 | ||
27 | /* XPM */ | 27 | /* XPM */ |
28 | static const char * pen_xpm[] = { | 28 | static const char * pen_xpm[] = { |
29 | "28 13 9 1", | 29 | "28 13 9 1", |
30 | " c None", | 30 | " c None", |
31 | ". c #000000", | 31 | ". c #000000", |
32 | "+ c #FFE993", | 32 | "+ c #FFE993", |
33 | "@ c #8292FF", | 33 | "@ c #8292FF", |
34 | "# c #F7C500", | 34 | "# c #F7C500", |
35 | "$ c #C69F00", | 35 | "$ c #C69F00", |
36 | "% c #0022FF", | 36 | "% c #0022FF", |
37 | "& c #000F72", | 37 | "& c #000F72", |
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 | ||
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 | } |
63 | 63 | ||
64 | QWidget *HandwritingImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 64 | QWidget *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 | ||
71 | void HandwritingImpl::resetState() | 71 | void HandwritingImpl::resetState() |
72 | { | 72 | { |
73 | if ( input ) | 73 | if ( input ) |
74 | input->resetState(); | 74 | input->resetState(); |
75 | } | 75 | } |
76 | 76 | ||
77 | QPixmap *HandwritingImpl::icon() | 77 | QPixmap *HandwritingImpl::icon() |
78 | { | 78 | { |
79 | if ( !icn ) | 79 | if ( !icn ) |
80 | icn = new QPixmap( (const char **)pen_xpm ); | 80 | icn = new QPixmap( (const char **)pen_xpm ); |
81 | return icn; | 81 | return icn; |
82 | } | 82 | } |
83 | 83 | ||
84 | QString HandwritingImpl::name() | 84 | QString HandwritingImpl::name() |
85 | { | 85 | { |
86 | return qApp->translate( "InputMethods", "Handwriting" ); | 86 | return qApp->translate( "InputMethods", "Handwriting" ); |
87 | } | 87 | } |
88 | 88 | ||
89 | void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot ) | 89 | void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot ) |
90 | { | 90 | { |
91 | if ( input ) | 91 | if ( input ) |
92 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 92 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
93 | } | 93 | } |
94 | 94 | ||
95 | #ifndef QT_NO_COMPONENT | 95 | #ifndef QT_NO_COMPONENT |
96 | QRESULT HandwritingImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 96 | QRESULT HandwritingImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
97 | { | 97 | { |
98 | *iface = 0; | 98 | *iface = 0; |
99 | if ( uuid == IID_QUnknown ) | 99 | if ( uuid == IID_QUnknown ) |
100 | *iface = this; | 100 | *iface = this; |
101 | else if ( uuid == IID_InputMethod ) | 101 | else if ( uuid == IID_InputMethod ) |
102 | *iface = this; | 102 | *iface = this; |
103 | else | 103 | else |
104 | return QS_FALSE; | 104 | return QS_FALSE; |
105 | 105 | ||
106 | if ( *iface ) | 106 | if ( *iface ) |
107 | (*iface)->addRef(); | 107 | (*iface)->addRef(); |
108 | return QS_OK; | 108 | return QS_OK; |
109 | } | 109 | } |
110 | 110 | ||
111 | Q_EXPORT_INTERFACE() | 111 | Q_EXPORT_INTERFACE() |
112 | { | 112 | { |
113 | Q_CREATE_INSTANCE( HandwritingImpl ) | 113 | Q_CREATE_INSTANCE( HandwritingImpl ) |
114 | } | 114 | } |
115 | #endif | 115 | #endif |
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 | |||
@@ -1,51 +1,50 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef HANDWRITINGIMPL_H | 20 | #ifndef HANDWRITINGIMPL_H |
21 | #define HANDWRITINGIMPL_H | 21 | #define HANDWRITINGIMPL_H |
22 | 22 | ||
23 | #include <qpe/inputmethodinterface.h> | 23 | #include <qpe/inputmethodinterface.h> |
24 | 24 | ||
25 | class QIMPenInput; | 25 | class QIMPenInput; |
26 | class QPixmap; | 26 | class QPixmap; |
27 | 27 | ||
28 | class HandwritingImpl : public InputMethodInterface | 28 | class HandwritingImpl : public InputMethodInterface |
29 | { | 29 | { |
30 | public: | 30 | public: |
31 | HandwritingImpl(); | 31 | HandwritingImpl(); |
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 | ||
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 | |||
@@ -1,99 +1,99 @@ | |||
1 | /**************************************************************************************94x78** | 1 | /**************************************************************************************94x78** |
2 | ** | 2 | ** |
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
11 | *********************************************************************************************/ | 11 | *********************************************************************************************/ |
12 | #include <qapplication.h> | 12 | #include <qapplication.h> |
13 | #include <qpixmap.h> | 13 | #include <qpixmap.h> |
14 | #include "keyboard.h" | 14 | #include "keyboard.h" |
15 | #include "keyboardimpl.h" | 15 | #include "keyboardimpl.h" |
16 | 16 | ||
17 | /* XPM */ | 17 | /* XPM */ |
18 | static const char * const icon_xpm[] = { | 18 | static const char * const icon_xpm[] = { |
19 | "26 13 2 1", | 19 | "26 13 2 1", |
20 | " c None", | 20 | " c None", |
21 | ".c #000000", | 21 | ".c #000000", |
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 | ||
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 | } |
47 | 47 | ||
48 | QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 48 | QWidget *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 | ||
55 | void KeyboardImpl::resetState() | 55 | void KeyboardImpl::resetState() |
56 | { | 56 | { |
57 | if ( input ) | 57 | if ( input ) |
58 | input->resetState(); | 58 | input->resetState(); |
59 | } | 59 | } |
60 | 60 | ||
61 | QPixmap *KeyboardImpl::icon() | 61 | QPixmap *KeyboardImpl::icon() |
62 | { | 62 | { |
63 | if ( !icn ) | 63 | if ( !icn ) |
64 | icn = new QPixmap( (const char **)icon_xpm ); | 64 | icn = new QPixmap( (const char **)icon_xpm ); |
65 | return icn; | 65 | return icn; |
66 | } | 66 | } |
67 | 67 | ||
68 | QString KeyboardImpl::name() | 68 | QString KeyboardImpl::name() |
69 | { | 69 | { |
70 | return qApp->translate( "InputMethods", "JumpX" ); | 70 | return qApp->translate( "InputMethods", "JumpX" ); |
71 | } | 71 | } |
72 | 72 | ||
73 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) | 73 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) |
74 | { | 74 | { |
75 | if ( input ) | 75 | if ( input ) |
76 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 76 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
77 | } | 77 | } |
78 | 78 | ||
79 | #ifndef QT_NO_COMPONENT | 79 | #ifndef QT_NO_COMPONENT |
80 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 80 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
81 | { | 81 | { |
82 | *iface = 0; | 82 | *iface = 0; |
83 | if ( uuid == IID_QUnknown ) | 83 | if ( uuid == IID_QUnknown ) |
84 | *iface = this; | 84 | *iface = this; |
85 | else if ( uuid == IID_InputMethod ) | 85 | else if ( uuid == IID_InputMethod ) |
86 | *iface = this; | 86 | *iface = this; |
87 | else | 87 | else |
88 | return QS_FALSE; | 88 | return QS_FALSE; |
89 | 89 | ||
90 | if ( *iface ) | 90 | if ( *iface ) |
91 | (*iface)->addRef(); | 91 | (*iface)->addRef(); |
92 | return QS_OK; | 92 | return QS_OK; |
93 | } | 93 | } |
94 | 94 | ||
95 | Q_EXPORT_INTERFACE() | 95 | Q_EXPORT_INTERFACE() |
96 | { | 96 | { |
97 | Q_CREATE_INSTANCE( KeyboardImpl ) | 97 | Q_CREATE_INSTANCE( KeyboardImpl ) |
98 | } | 98 | } |
99 | #endif | 99 | #endif |
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 | |||
@@ -1,51 +1,50 @@ | |||
1 | /**************************************************************************************94x78** | 1 | /**************************************************************************************94x78** |
2 | ** | 2 | ** |
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
11 | *********************************************************************************************/ | 11 | *********************************************************************************************/ |
12 | #ifndef KEYBOARDIMPL_H | 12 | #ifndef KEYBOARDIMPL_H |
13 | #define KEYBOARDIMPL_H | 13 | #define KEYBOARDIMPL_H |
14 | 14 | ||
15 | #include <qpe/inputmethodinterface.h> | 15 | #include <qpe/inputmethodinterface.h> |
16 | 16 | ||
17 | namespace JumpX | 17 | namespace JumpX |
18 | { | 18 | { |
19 | class Keyboard; | 19 | class Keyboard; |
20 | }; | 20 | }; |
21 | class QPixmap; | 21 | class QPixmap; |
22 | 22 | ||
23 | namespace | 23 | namespace |
24 | { | 24 | { |
25 | 25 | ||
26 | class KeyboardImpl : public InputMethodInterface | 26 | class KeyboardImpl : public InputMethodInterface |
27 | { | 27 | { |
28 | public: | 28 | public: |
29 | KeyboardImpl(); | 29 | KeyboardImpl(); |
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 | ||
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 | |||
@@ -5,126 +5,126 @@ | |||
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qapplication.h> | 20 | #include <qapplication.h> |
21 | #include <qpixmap.h> | 21 | #include <qpixmap.h> |
22 | #include "keyboard.h" | 22 | #include "keyboard.h" |
23 | #include "keyboardimpl.h" | 23 | #include "keyboardimpl.h" |
24 | 24 | ||
25 | /* XPM */ | 25 | /* XPM */ |
26 | static const char * const kb_xpm[] = { | 26 | static const char * const kb_xpm[] = { |
27 | "28 13 4 1", | 27 | "28 13 4 1", |
28 | " c None", | 28 | " c None", |
29 | ". c #4C4C4C", | 29 | ". c #4C4C4C", |
30 | "+ c #FFF7DD", | 30 | "+ c #FFF7DD", |
31 | "@ c #D6CFBA", | 31 | "@ c #D6CFBA", |
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 | ||
47 | /* XPM */ | 47 | /* XPM */ |
48 | static const char * const ipti_xpm[] = { | 48 | static const char * const ipti_xpm[] = { |
49 | "28 13 4 1", | 49 | "28 13 4 1", |
50 | " c None", | 50 | " c None", |
51 | ". c #4C4C4C", | 51 | ". c #4C4C4C", |
52 | "+ c #FFF7DD", | 52 | "+ c #FFF7DD", |
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 | ||
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 | } |
78 | 78 | ||
79 | QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 79 | QWidget *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 | ||
86 | void KeyboardImpl::resetState() | 86 | void KeyboardImpl::resetState() |
87 | { | 87 | { |
88 | if ( input ) | 88 | if ( input ) |
89 | input->resetState(); | 89 | input->resetState(); |
90 | } | 90 | } |
91 | 91 | ||
92 | QPixmap *KeyboardImpl::icon() | 92 | QPixmap *KeyboardImpl::icon() |
93 | { | 93 | { |
94 | if ( !icn ) | 94 | if ( !icn ) |
95 | icn = new QPixmap( (const char **)kb_xpm ); | 95 | icn = new QPixmap( (const char **)kb_xpm ); |
96 | return icn; | 96 | return icn; |
97 | } | 97 | } |
98 | 98 | ||
99 | QString KeyboardImpl::name() | 99 | QString KeyboardImpl::name() |
100 | { | 100 | { |
101 | return qApp->translate( "InputMethods", "Keyboard" ); | 101 | return qApp->translate( "InputMethods", "Keyboard" ); |
102 | } | 102 | } |
103 | 103 | ||
104 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) | 104 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) |
105 | { | 105 | { |
106 | if ( input ) | 106 | if ( input ) |
107 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 107 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
108 | } | 108 | } |
109 | 109 | ||
110 | #ifndef QT_NO_COMPONENT | 110 | #ifndef QT_NO_COMPONENT |
111 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 111 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
112 | { | 112 | { |
113 | *iface = 0; | 113 | *iface = 0; |
114 | if ( uuid == IID_QUnknown ) | 114 | if ( uuid == IID_QUnknown ) |
115 | *iface = this; | 115 | *iface = this; |
116 | else if ( uuid == IID_InputMethod ) | 116 | else if ( uuid == IID_InputMethod ) |
117 | *iface = this; | 117 | *iface = this; |
118 | else | 118 | else |
119 | return QS_FALSE; | 119 | return QS_FALSE; |
120 | 120 | ||
121 | if ( *iface ) | 121 | if ( *iface ) |
122 | (*iface)->addRef(); | 122 | (*iface)->addRef(); |
123 | return QS_OK; | 123 | return QS_OK; |
124 | } | 124 | } |
125 | 125 | ||
126 | Q_EXPORT_INTERFACE() | 126 | Q_EXPORT_INTERFACE() |
127 | { | 127 | { |
128 | Q_CREATE_INSTANCE( KeyboardImpl ) | 128 | Q_CREATE_INSTANCE( KeyboardImpl ) |
129 | } | 129 | } |
130 | #endif | 130 | #endif |
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 | |||
@@ -1,60 +1,59 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef KEYBOARDIMPL_H | 20 | #ifndef KEYBOARDIMPL_H |
21 | #define KEYBOARDIMPL_H | 21 | #define KEYBOARDIMPL_H |
22 | 22 | ||
23 | #include <qpe/inputmethodinterface.h> | 23 | #include <qpe/inputmethodinterface.h> |
24 | 24 | ||
25 | namespace KeyboardInput | 25 | namespace KeyboardInput |
26 | { | 26 | { |
27 | class Keyboard; | 27 | class Keyboard; |
28 | } | 28 | } |
29 | 29 | ||
30 | class QPixmap; | 30 | class QPixmap; |
31 | 31 | ||
32 | namespace | 32 | namespace |
33 | { | 33 | { |
34 | 34 | ||
35 | class KeyboardImpl : public InputMethodInterface | 35 | class KeyboardImpl : public InputMethodInterface |
36 | { | 36 | { |
37 | public: | 37 | public: |
38 | KeyboardImpl(); | 38 | KeyboardImpl(); |
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 | ||
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 | |||
@@ -1,99 +1,99 @@ | |||
1 | /**************************************************************************************94x78** | 1 | /**************************************************************************************94x78** |
2 | ** | 2 | ** |
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
11 | *********************************************************************************************/ | 11 | *********************************************************************************************/ |
12 | #include <qapplication.h> | 12 | #include <qapplication.h> |
13 | #include <qpixmap.h> | 13 | #include <qpixmap.h> |
14 | #include "keyboard.h" | 14 | #include "keyboard.h" |
15 | #include "keyboardimpl.h" | 15 | #include "keyboardimpl.h" |
16 | 16 | ||
17 | /* XPM */ | 17 | /* XPM */ |
18 | static const char * const icon_xpm[] = { | 18 | static const char * const icon_xpm[] = { |
19 | "26 13 2 1", | 19 | "26 13 2 1", |
20 | " c None", | 20 | " c None", |
21 | ".c #000000", | 21 | ".c #000000", |
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 | ||
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 | } |
47 | 47 | ||
48 | QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 48 | QWidget *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 | ||
55 | void KeyboardImpl::resetState() | 55 | void KeyboardImpl::resetState() |
56 | { | 56 | { |
57 | if ( input ) | 57 | if ( input ) |
58 | input->resetState(); | 58 | input->resetState(); |
59 | } | 59 | } |
60 | 60 | ||
61 | QPixmap *KeyboardImpl::icon() | 61 | QPixmap *KeyboardImpl::icon() |
62 | { | 62 | { |
63 | if ( !icn ) | 63 | if ( !icn ) |
64 | icn = new QPixmap( (const char **)icon_xpm ); | 64 | icn = new QPixmap( (const char **)icon_xpm ); |
65 | return icn; | 65 | return icn; |
66 | } | 66 | } |
67 | 67 | ||
68 | QString KeyboardImpl::name() | 68 | QString KeyboardImpl::name() |
69 | { | 69 | { |
70 | return qApp->translate( "InputMethods", "KJumpX" ); | 70 | return qApp->translate( "InputMethods", "KJumpX" ); |
71 | } | 71 | } |
72 | 72 | ||
73 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) | 73 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) |
74 | { | 74 | { |
75 | if ( input ) | 75 | if ( input ) |
76 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 76 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
77 | } | 77 | } |
78 | 78 | ||
79 | #ifndef QT_NO_COMPONENT | 79 | #ifndef QT_NO_COMPONENT |
80 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 80 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
81 | { | 81 | { |
82 | *iface = 0; | 82 | *iface = 0; |
83 | if ( uuid == IID_QUnknown ) | 83 | if ( uuid == IID_QUnknown ) |
84 | *iface = this; | 84 | *iface = this; |
85 | else if ( uuid == IID_InputMethod ) | 85 | else if ( uuid == IID_InputMethod ) |
86 | *iface = this; | 86 | *iface = this; |
87 | else | 87 | else |
88 | return QS_FALSE; | 88 | return QS_FALSE; |
89 | 89 | ||
90 | if ( *iface ) | 90 | if ( *iface ) |
91 | (*iface)->addRef(); | 91 | (*iface)->addRef(); |
92 | return QS_OK; | 92 | return QS_OK; |
93 | } | 93 | } |
94 | 94 | ||
95 | Q_EXPORT_INTERFACE() | 95 | Q_EXPORT_INTERFACE() |
96 | { | 96 | { |
97 | Q_CREATE_INSTANCE( KeyboardImpl ) | 97 | Q_CREATE_INSTANCE( KeyboardImpl ) |
98 | } | 98 | } |
99 | #endif | 99 | #endif |
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 | |||
@@ -1,51 +1,50 @@ | |||
1 | /**************************************************************************************94x78** | 1 | /**************************************************************************************94x78** |
2 | ** | 2 | ** |
3 | ** This file may be distributed and/or modified under the terms of the | 3 | ** This file may be distributed and/or modified under the terms of the |
4 | ** GNU General Public License version 2 as published by the Free Software | 4 | ** GNU General Public License version 2 as published by the Free Software |
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | 5 | ** Foundation and appearing in the file LICENSE.GPL included in the |
6 | ** packaging of this file. | 6 | ** packaging of this file. |
7 | ** | 7 | ** |
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
11 | *********************************************************************************************/ | 11 | *********************************************************************************************/ |
12 | #ifndef KEYBOARDIMPL_H | 12 | #ifndef KEYBOARDIMPL_H |
13 | #define KEYBOARDIMPL_H | 13 | #define KEYBOARDIMPL_H |
14 | 14 | ||
15 | #include <qpe/inputmethodinterface.h> | 15 | #include <qpe/inputmethodinterface.h> |
16 | 16 | ||
17 | namespace KJumpX | 17 | namespace KJumpX |
18 | { | 18 | { |
19 | class Keyboard; | 19 | class Keyboard; |
20 | } | 20 | } |
21 | class QPixmap; | 21 | class QPixmap; |
22 | 22 | ||
23 | namespace | 23 | namespace |
24 | { | 24 | { |
25 | 25 | ||
26 | class KeyboardImpl : public InputMethodInterface | 26 | class KeyboardImpl : public InputMethodInterface |
27 | { | 27 | { |
28 | public: | 28 | public: |
29 | KeyboardImpl(); | 29 | KeyboardImpl(); |
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 | ||
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 | |||
@@ -1,109 +1,109 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qapplication.h> | 20 | #include <qapplication.h> |
21 | #include <qpixmap.h> | 21 | #include <qpixmap.h> |
22 | #include "keyboard.h" | 22 | #include "keyboard.h" |
23 | #include "keyboardimpl.h" | 23 | #include "keyboardimpl.h" |
24 | 24 | ||
25 | /* XPM */ | 25 | /* XPM */ |
26 | static const char * const kb_xpm[] = { | 26 | static const char * const kb_xpm[] = { |
27 | "28 13 4 1", | 27 | "28 13 4 1", |
28 | " c None", | 28 | " c None", |
29 | ". c #4C4C4C", | 29 | ". c #4C4C4C", |
30 | "+ c #FFF7DD", | 30 | "+ c #FFF7DD", |
31 | "@ c #D6CFBA", | 31 | "@ c #D6CFBA", |
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 | ||
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 | } |
57 | 57 | ||
58 | QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 58 | QWidget *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 | ||
65 | void KeyboardImpl::resetState() | 65 | void KeyboardImpl::resetState() |
66 | { | 66 | { |
67 | if ( input ) | 67 | if ( input ) |
68 | input->resetState(); | 68 | input->resetState(); |
69 | } | 69 | } |
70 | 70 | ||
71 | QPixmap *KeyboardImpl::icon() | 71 | QPixmap *KeyboardImpl::icon() |
72 | { | 72 | { |
73 | if ( !icn ) | 73 | if ( !icn ) |
74 | icn = new QPixmap( (const char **)kb_xpm ); | 74 | icn = new QPixmap( (const char **)kb_xpm ); |
75 | return icn; | 75 | return icn; |
76 | } | 76 | } |
77 | 77 | ||
78 | QString KeyboardImpl::name() | 78 | QString KeyboardImpl::name() |
79 | { | 79 | { |
80 | return qApp->translate( "InputMethods", "Multikey" ); | 80 | return qApp->translate( "InputMethods", "Multikey" ); |
81 | } | 81 | } |
82 | 82 | ||
83 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) | 83 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) |
84 | { | 84 | { |
85 | if ( input ) | 85 | if ( input ) |
86 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 86 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
87 | } | 87 | } |
88 | 88 | ||
89 | #ifndef QT_NO_COMPONENT | 89 | #ifndef QT_NO_COMPONENT |
90 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 90 | QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
91 | { | 91 | { |
92 | *iface = 0; | 92 | *iface = 0; |
93 | if ( uuid == IID_QUnknown ) | 93 | if ( uuid == IID_QUnknown ) |
94 | *iface = this; | 94 | *iface = this; |
95 | else if ( uuid == IID_InputMethod ) | 95 | else if ( uuid == IID_InputMethod ) |
96 | *iface = this; | 96 | *iface = this; |
97 | else | 97 | else |
98 | return QS_FALSE; | 98 | return QS_FALSE; |
99 | 99 | ||
100 | if ( *iface ) | 100 | if ( *iface ) |
101 | (*iface)->addRef(); | 101 | (*iface)->addRef(); |
102 | return QS_OK; | 102 | return QS_OK; |
103 | } | 103 | } |
104 | 104 | ||
105 | Q_EXPORT_INTERFACE() | 105 | Q_EXPORT_INTERFACE() |
106 | { | 106 | { |
107 | Q_CREATE_INSTANCE( KeyboardImpl ) | 107 | Q_CREATE_INSTANCE( KeyboardImpl ) |
108 | } | 108 | } |
109 | #endif | 109 | #endif |
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 | |||
@@ -1,60 +1,59 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef KEYBOARDIMPL_H | 20 | #ifndef KEYBOARDIMPL_H |
21 | #define KEYBOARDIMPL_H | 21 | #define KEYBOARDIMPL_H |
22 | 22 | ||
23 | #include <qpe/inputmethodinterface.h> | 23 | #include <qpe/inputmethodinterface.h> |
24 | 24 | ||
25 | namespace MultiKey | 25 | namespace MultiKey |
26 | { | 26 | { |
27 | class Keyboard; | 27 | class Keyboard; |
28 | } | 28 | } |
29 | 29 | ||
30 | class QPixmap; | 30 | class QPixmap; |
31 | 31 | ||
32 | namespace | 32 | namespace |
33 | { | 33 | { |
34 | 34 | ||
35 | class KeyboardImpl : public InputMethodInterface | 35 | class KeyboardImpl : public InputMethodInterface |
36 | { | 36 | { |
37 | public: | 37 | public: |
38 | KeyboardImpl(); | 38 | KeyboardImpl(); |
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 | ||
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 | |||
@@ -1,103 +1,103 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qapplication.h> | 20 | #include <qapplication.h> |
21 | #include <qobject.h> | 21 | #include <qobject.h> |
22 | #include <qpixmap.h> | 22 | #include <qpixmap.h> |
23 | #include "pickboard.h" | 23 | #include "pickboard.h" |
24 | #include "pickboardimpl.h" | 24 | #include "pickboardimpl.h" |
25 | 25 | ||
26 | /* XPM */ | 26 | /* XPM */ |
27 | static const char * pb_xpm[]={ | 27 | static 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 | ||
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 | } |
50 | 50 | ||
51 | QWidget *PickboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 51 | QWidget *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 | ||
58 | void PickboardImpl::resetState() | 58 | void PickboardImpl::resetState() |
59 | { | 59 | { |
60 | if ( pickboard ) | 60 | if ( pickboard ) |
61 | pickboard->resetState(); | 61 | pickboard->resetState(); |
62 | } | 62 | } |
63 | 63 | ||
64 | QPixmap *PickboardImpl::icon() | 64 | QPixmap *PickboardImpl::icon() |
65 | { | 65 | { |
66 | if ( !icn ) | 66 | if ( !icn ) |
67 | icn = new QPixmap( (const char **)pb_xpm ); | 67 | icn = new QPixmap( (const char **)pb_xpm ); |
68 | return icn; | 68 | return icn; |
69 | } | 69 | } |
70 | 70 | ||
71 | QString PickboardImpl::name() | 71 | QString PickboardImpl::name() |
72 | { | 72 | { |
73 | return qApp->translate( "InputMethods", "Pickboard" ); | 73 | return qApp->translate( "InputMethods", "Pickboard" ); |
74 | } | 74 | } |
75 | 75 | ||
76 | void PickboardImpl::onKeyPress( QObject *receiver, const char *slot ) | 76 | void PickboardImpl::onKeyPress( QObject *receiver, const char *slot ) |
77 | { | 77 | { |
78 | if ( pickboard ) | 78 | if ( pickboard ) |
79 | QObject::connect( pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 79 | QObject::connect( pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
80 | } | 80 | } |
81 | 81 | ||
82 | #ifndef QT_NO_COMPONENT | 82 | #ifndef QT_NO_COMPONENT |
83 | QRESULT PickboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 83 | QRESULT PickboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
84 | { | 84 | { |
85 | *iface = 0; | 85 | *iface = 0; |
86 | if ( uuid == IID_QUnknown ) | 86 | if ( uuid == IID_QUnknown ) |
87 | *iface = this; | 87 | *iface = this; |
88 | else if ( uuid == IID_InputMethod ) | 88 | else if ( uuid == IID_InputMethod ) |
89 | *iface = this; | 89 | *iface = this; |
90 | else | 90 | else |
91 | return QS_FALSE; | 91 | return QS_FALSE; |
92 | 92 | ||
93 | if ( *iface ) | 93 | if ( *iface ) |
94 | (*iface)->addRef(); | 94 | (*iface)->addRef(); |
95 | return QS_OK; | 95 | return QS_OK; |
96 | } | 96 | } |
97 | 97 | ||
98 | Q_EXPORT_INTERFACE() | 98 | Q_EXPORT_INTERFACE() |
99 | { | 99 | { |
100 | Q_CREATE_INSTANCE( PickboardImpl ) | 100 | Q_CREATE_INSTANCE( PickboardImpl ) |
101 | } | 101 | } |
102 | #endif | 102 | #endif |
103 | 103 | ||
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 | |||
@@ -1,51 +1,50 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef PICKBOARDIMPL_H | 20 | #ifndef PICKBOARDIMPL_H |
21 | #define PICKBOARDIMPL_H | 21 | #define PICKBOARDIMPL_H |
22 | 22 | ||
23 | #include <qpe/inputmethodinterface.h> | 23 | #include <qpe/inputmethodinterface.h> |
24 | 24 | ||
25 | class Pickboard; | 25 | class Pickboard; |
26 | class QPixmap; | 26 | class QPixmap; |
27 | 27 | ||
28 | class PickboardImpl : public InputMethodInterface | 28 | class PickboardImpl : public InputMethodInterface |
29 | { | 29 | { |
30 | public: | 30 | public: |
31 | PickboardImpl(); | 31 | PickboardImpl(); |
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 | ||
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 | |||
@@ -1,107 +1,107 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qapplication.h> | 20 | #include <qapplication.h> |
21 | #include <qobject.h> | 21 | #include <qobject.h> |
22 | #include <qpixmap.h> | 22 | #include <qpixmap.h> |
23 | #include "unikeyboard.h" | 23 | #include "unikeyboard.h" |
24 | #include "unikeyboardimpl.h" | 24 | #include "unikeyboardimpl.h" |
25 | 25 | ||
26 | /* XPM */ | 26 | /* XPM */ |
27 | static const char * uni_xpm[]={ | 27 | static const char * uni_xpm[]={ |
28 | "28 13 2 1", | 28 | "28 13 2 1", |
29 | "# c #000000", | 29 | "# c #000000", |
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 | ||
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 | } |
55 | 55 | ||
56 | QWidget *UniKeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) | 56 | QWidget *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 | ||
63 | void UniKeyboardImpl::resetState() | 63 | void UniKeyboardImpl::resetState() |
64 | { | 64 | { |
65 | if ( input ) | 65 | if ( input ) |
66 | input->resetState(); | 66 | input->resetState(); |
67 | } | 67 | } |
68 | 68 | ||
69 | QPixmap *UniKeyboardImpl::icon() | 69 | QPixmap *UniKeyboardImpl::icon() |
70 | { | 70 | { |
71 | if ( !icn ) | 71 | if ( !icn ) |
72 | icn = new QPixmap( (const char **)uni_xpm ); | 72 | icn = new QPixmap( (const char **)uni_xpm ); |
73 | return icn; | 73 | return icn; |
74 | } | 74 | } |
75 | 75 | ||
76 | QString UniKeyboardImpl::name() | 76 | QString UniKeyboardImpl::name() |
77 | { | 77 | { |
78 | return qApp->translate( "InputMethods", "Unicode" ); | 78 | return qApp->translate( "InputMethods", "Unicode" ); |
79 | } | 79 | } |
80 | 80 | ||
81 | void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) | 81 | void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) |
82 | { | 82 | { |
83 | if ( input ) | 83 | if ( input ) |
84 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); | 84 | QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); |
85 | } | 85 | } |
86 | 86 | ||
87 | QRESULT UniKeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 87 | QRESULT UniKeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
88 | { | 88 | { |
89 | *iface = 0; | 89 | *iface = 0; |
90 | if ( uuid == IID_QUnknown ) | 90 | if ( uuid == IID_QUnknown ) |
91 | *iface = this; | 91 | *iface = this; |
92 | else if ( uuid == IID_InputMethod ) | 92 | else if ( uuid == IID_InputMethod ) |
93 | *iface = this; | 93 | *iface = this; |
94 | else | 94 | else |
95 | return QS_FALSE; | 95 | return QS_FALSE; |
96 | 96 | ||
97 | if ( *iface ) | 97 | if ( *iface ) |
98 | (*iface)->addRef(); | 98 | (*iface)->addRef(); |
99 | return QS_OK; | 99 | return QS_OK; |
100 | } | 100 | } |
101 | 101 | ||
102 | Q_EXPORT_INTERFACE() | 102 | Q_EXPORT_INTERFACE() |
103 | { | 103 | { |
104 | Q_CREATE_INSTANCE( UniKeyboardImpl ) | 104 | Q_CREATE_INSTANCE( UniKeyboardImpl ) |
105 | } | 105 | } |
106 | 106 | ||
107 | 107 | ||
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 | |||
@@ -1,49 +1,48 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef UNIKEYBOARDIMPL_H | 20 | #ifndef UNIKEYBOARDIMPL_H |
21 | #define UNIKEYBOARDIMPL_H | 21 | #define UNIKEYBOARDIMPL_H |
22 | 22 | ||
23 | #include <qpe/inputmethodinterface.h> | 23 | #include <qpe/inputmethodinterface.h> |
24 | 24 | ||
25 | class UniKeyboard; | 25 | class UniKeyboard; |
26 | class QPixmap; | 26 | class QPixmap; |
27 | 27 | ||
28 | class UniKeyboardImpl : public InputMethodInterface | 28 | class UniKeyboardImpl : public InputMethodInterface |
29 | { | 29 | { |
30 | public: | 30 | public: |
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 | ||
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 |