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