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/pickboard | |
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/pickboard/pickboardimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/pickboard/pickboardimpl.h | 1 |
2 files changed, 1 insertions, 2 deletions
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 | |||
@@ -17,49 +17,49 @@ | |||
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 | { |
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 | |||
@@ -24,28 +24,27 @@ | |||
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 |