author | zecke <zecke> | 2004-02-05 17:15:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-05 17:15:20 (UTC) |
commit | f6487edaaad38c6454fc50697d7884f0bc627489 (patch) (side-by-side diff) | |
tree | 26b2ea805710488c84a731fef576467047fb80fd /inputmethods/multikey | |
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/multikey/keyboardimpl.cpp | 2 | ||||
-rw-r--r-- | inputmethods/multikey/keyboardimpl.h | 1 |
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 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include <qapplication.h> #include <qpixmap.h> #include "keyboard.h" #include "keyboardimpl.h" /* XPM */ static const char * const kb_xpm[] = { "28 13 4 1", " c None", ". c #4C4C4C", "+ c #FFF7DD", "@ c #D6CFBA", " .......................... ", " .+++.+++.+++.+++.+++.++++. ", " .+@@.+@@.+@@.+@@.+@@.+@@@. ", " .......................... ", " .+++++.+++.+++.+++.++++++. ", " .+@@@@.+@@.+@@.+@@.+@@@@@. ", " .......................... ", " .++++++.+++.+++.+++.+++++. ", " .+@@@@@.+@@.+@@.+@@.+@@@@. ", " .......................... ", " .++++.++++++++++++++.++++. ", " .+@@@.+@@@@@@@@@@@@@.+@@@. ", " .......................... "}; KeyboardImpl::KeyboardImpl() - : input(0), icn(0), ref(0) + : input(0), icn(0) { } KeyboardImpl::~KeyboardImpl() { delete input; delete icn; } QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f ) { if ( !input ) input = new MultiKey::Keyboard( parent, "Keyboard", f ); return input; } void KeyboardImpl::resetState() { if ( input ) input->resetState(); } QPixmap *KeyboardImpl::icon() { if ( !icn ) icn = new QPixmap( (const char **)kb_xpm ); return icn; } QString KeyboardImpl::name() { 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 @@ #include <qpe/inputmethodinterface.h> namespace MultiKey { class Keyboard; } class QPixmap; namespace { class KeyboardImpl : public InputMethodInterface { public: KeyboardImpl(); virtual ~KeyboardImpl(); #ifndef QT_NO_COMPONENT QRESULT queryInterface( const QUuid&, QUnknownInterface** ); Q_REFCOUNT #endif virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ); virtual void resetState(); virtual QPixmap *icon(); virtual QString name(); virtual void onKeyPress( QObject *receiver, const char *slot ); private: MultiKey::Keyboard *input; QPixmap *icn; - ulong ref; }; } // anonymous namespace #endif |