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/handwriting | |
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/handwriting/handwritingimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/handwriting/handwritingimpl.h | 1 |
2 files changed, 1 insertions, 2 deletions
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 | |||
@@ -22,65 +22,65 @@ | |||
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" ); |
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 | |||
@@ -16,36 +16,35 @@ | |||
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 |