summaryrefslogtreecommitdiff
path: root/inputmethods/multikey
authorzecke <zecke>2004-02-05 17:15:20 (UTC)
committer zecke <zecke>2004-02-05 17:15:20 (UTC)
commitf6487edaaad38c6454fc50697d7884f0bc627489 (patch) (unidiff)
tree26b2ea805710488c84a731fef576467047fb80fd /inputmethods/multikey
parent416c72588577bca18ba1c9180701143e7e572eed (diff)
downloadopie-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"
Diffstat (limited to 'inputmethods/multikey') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/keyboardimpl.cpp2
-rw-r--r--inputmethods/multikey/keyboardimpl.h1
2 files changed, 1 insertions, 2 deletions
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
@@ -16,65 +16,65 @@
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 */
26static const char * const kb_xpm[] = { 26static 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
47KeyboardImpl::KeyboardImpl() 47KeyboardImpl::KeyboardImpl()
48 : input(0), icn(0), ref(0) 48 : input(0), icn(0)
49{ 49{
50} 50}
51 51
52KeyboardImpl::~KeyboardImpl() 52KeyboardImpl::~KeyboardImpl()
53{ 53{
54 delete input; 54 delete input;
55 delete icn; 55 delete icn;
56} 56}
57 57
58QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) 58QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
59{ 59{
60 if ( !input ) 60 if ( !input )
61 input = new MultiKey::Keyboard( parent, "Keyboard", f ); 61 input = new MultiKey::Keyboard( parent, "Keyboard", f );
62 return input; 62 return input;
63} 63}
64 64
65void KeyboardImpl::resetState() 65void KeyboardImpl::resetState()
66{ 66{
67 if ( input ) 67 if ( input )
68 input->resetState(); 68 input->resetState();
69} 69}
70 70
71QPixmap *KeyboardImpl::icon() 71QPixmap *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
78QString KeyboardImpl::name() 78QString KeyboardImpl::name()
79{ 79{
80 return qApp->translate( "InputMethods", "Multikey" ); 80 return qApp->translate( "InputMethods", "Multikey" );
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
@@ -23,38 +23,37 @@
23#include <qpe/inputmethodinterface.h> 23#include <qpe/inputmethodinterface.h>
24 24
25namespace MultiKey 25namespace MultiKey
26{ 26{
27 class Keyboard; 27 class Keyboard;
28} 28}
29 29
30class QPixmap; 30class QPixmap;
31 31
32namespace 32namespace
33{ 33{
34 34
35class KeyboardImpl : public InputMethodInterface 35class KeyboardImpl : public InputMethodInterface
36{ 36{
37public: 37public:
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
52private: 52private:
53 MultiKey::Keyboard *input; 53 MultiKey::Keyboard *input;
54 QPixmap *icn; 54 QPixmap *icn;
55 ulong ref;
56}; 55};
57 56
58} // anonymous namespace 57} // anonymous namespace
59 58
60#endif 59#endif