summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-05 17:15:20 (UTC)
committer zecke <zecke>2004-02-05 17:15:20 (UTC)
commitf6487edaaad38c6454fc50697d7884f0bc627489 (patch) (side-by-side diff)
tree26b2ea805710488c84a731fef576467047fb80fd
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 (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dasher/QtDasherImpl.cc2
-rw-r--r--inputmethods/dasher/QtDasherImpl.h1
-rw-r--r--inputmethods/dvorak/dvorakimpl.cpp2
-rw-r--r--inputmethods/dvorak/dvorakimpl.h1
-rw-r--r--inputmethods/handwriting/handwritingimpl.cpp2
-rw-r--r--inputmethods/handwriting/handwritingimpl.h1
-rw-r--r--inputmethods/jumpx/keyboardimpl.cpp2
-rw-r--r--inputmethods/jumpx/keyboardimpl.h1
-rw-r--r--inputmethods/keyboard/keyboardimpl.cpp2
-rw-r--r--inputmethods/keyboard/keyboardimpl.h1
-rw-r--r--inputmethods/kjumpx/keyboardimpl.cpp2
-rw-r--r--inputmethods/kjumpx/keyboardimpl.h1
-rw-r--r--inputmethods/multikey/keyboardimpl.cpp2
-rw-r--r--inputmethods/multikey/keyboardimpl.h1
-rw-r--r--inputmethods/pickboard/pickboardimpl.cpp2
-rw-r--r--inputmethods/pickboard/pickboardimpl.h1
-rw-r--r--inputmethods/unikeyboard/unikeyboardimpl.cpp2
-rw-r--r--inputmethods/unikeyboard/unikeyboardimpl.h1
18 files changed, 9 insertions, 18 deletions
diff --git a/inputmethods/dasher/QtDasherImpl.cc b/inputmethods/dasher/QtDasherImpl.cc
index 9513802..d72f6d9 100644
--- a/inputmethods/dasher/QtDasherImpl.cc
+++ b/inputmethods/dasher/QtDasherImpl.cc
@@ -1,56 +1,56 @@
#include <iostream>
#include <qapplication.h>
#include <qobject.h>
#include <qpixmap.h>
#include "DasherInterface.h"
#include "QtDasherScreen.h"
#include "QtDasherImpl.h"
/* XPM */
static const char * qtdasher_xpm[]={
"28 7 2 1",
"# c #303030",
" c None",
" ########################## ",
" ",
" # # ",
" # # # # ",
" # # # # ",
" # # # ",
" ########################## "};
QtDasherImpl::QtDasherImpl()
- : qtdasherwidget(0), icn(0), ref(0), qtdasherinterface(0)
+ : qtdasherwidget(0), icn(0), qtdasherinterface(0)
{
}
QtDasherImpl::~QtDasherImpl()
{
delete qtdasherwidget;
delete icn;
}
QWidget *QtDasherImpl::inputMethod( QWidget *parent, Qt::WFlags f )
{
if ( !qtdasherwidget ) {
qtdasherwidget = new QtDasherPlugin( parent, "Dasher", f );
}
return qtdasherwidget;
}
void QtDasherImpl::resetState()
{
if ( qtdasherwidget )
qtdasherwidget->resetState();
}
QPixmap *QtDasherImpl::icon()
{
if ( !icn )
icn = new QPixmap( (const char **)qtdasher_xpm );
return icn;
}
QString QtDasherImpl::name()
{
diff --git a/inputmethods/dasher/QtDasherImpl.h b/inputmethods/dasher/QtDasherImpl.h
index c143dc3..69e278c 100644
--- a/inputmethods/dasher/QtDasherImpl.h
+++ b/inputmethods/dasher/QtDasherImpl.h
@@ -1,38 +1,37 @@
#ifndef QTDASHERIMPL_H
#define QTDASHERIMPL_H
#include <qpe/inputmethodinterface.h>
#include "QtDasherPlugin.h"
class QtDasher;
class QPixmap;
class QtDasherImpl : public InputMethodInterface
{
public:
QtDasherImpl();
virtual ~QtDasherImpl();
#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:
CDasherInterface *qtdasherinterface;
QtDasherPlugin *qtdasherwidget;
QPixmap *icn;
- ulong ref;
};
#endif
diff --git a/inputmethods/dvorak/dvorakimpl.cpp b/inputmethods/dvorak/dvorakimpl.cpp
index 9e9fed9..1bc2ec8 100644
--- a/inputmethods/dvorak/dvorakimpl.cpp
+++ b/inputmethods/dvorak/dvorakimpl.cpp
@@ -39,65 +39,65 @@ static const char * const kb_xpm[] = {
" .++++++.+++.+++.+++.+++++. ",
" .+@@@@@.+@@.+@@.+@@.+@@@@. ",
" .......................... ",
" .++++.++++++++++++++.++++. ",
" .+@@@.+@@@@@@@@@@@@@.+@@@. ",
" .......................... "};
/* XPM */
static const char * const opti_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 Dvorak::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", "Dvorak" );
diff --git a/inputmethods/dvorak/dvorakimpl.h b/inputmethods/dvorak/dvorakimpl.h
index bd9fa88..8cc4e25 100644
--- a/inputmethods/dvorak/dvorakimpl.h
+++ b/inputmethods/dvorak/dvorakimpl.h
@@ -23,38 +23,37 @@
#include <qpe/inputmethodinterface.h>
namespace Dvorak
{
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:
Dvorak::Keyboard *input;
QPixmap *icn;
- ulong ref;
};
} // anonymous namespace
#endif
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 @@
#include <qwidget.h>
#include <qpixmap.h>
#include "qimpeninput.h"
#include "handwritingimpl.h"
/* XPM */
static const char * pen_xpm[] = {
"28 13 9 1",
" c None",
". c #000000",
"+ c #FFE993",
"@ c #8292FF",
"# c #F7C500",
"$ c #C69F00",
"% c #0022FF",
"& c #000F72",
"* c #A3732C",
" . ",
" .+. ",
" .@#$. ",
" .@%&. ",
" .@%&. ",
" . .@%&. ",
" . .@%&. ",
" . .@%&. ",
" ... ... .. .@%&. ",
" . . . . . .*.&. ",
" . . . . . .**. ",
" ... ... .. ... ",
" "};
HandwritingImpl::HandwritingImpl()
- : input(0), icn(0), ref(0)
+ : input(0), icn(0)
{
}
HandwritingImpl::~HandwritingImpl()
{
delete input;
delete icn;
}
QWidget *HandwritingImpl::inputMethod( QWidget *parent, Qt::WFlags f )
{
if ( !input )
input = new QIMPenInput( parent, "Handwriting", f );
return input;
}
void HandwritingImpl::resetState()
{
if ( input )
input->resetState();
}
QPixmap *HandwritingImpl::icon()
{
if ( !icn )
icn = new QPixmap( (const char **)pen_xpm );
return icn;
}
QString HandwritingImpl::name()
{
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 @@
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef HANDWRITINGIMPL_H
#define HANDWRITINGIMPL_H
#include <qpe/inputmethodinterface.h>
class QIMPenInput;
class QPixmap;
class HandwritingImpl : public InputMethodInterface
{
public:
HandwritingImpl();
virtual ~HandwritingImpl();
#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:
QIMPenInput *input;
QPixmap *icn;
- ulong ref;
};
#endif
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp
index e75dd5f..b40046c 100644
--- a/inputmethods/jumpx/keyboardimpl.cpp
+++ b/inputmethods/jumpx/keyboardimpl.cpp
@@ -6,65 +6,65 @@
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
*********************************************************************************************/
#include <qapplication.h>
#include <qpixmap.h>
#include "keyboard.h"
#include "keyboardimpl.h"
/* XPM */
static const char * const icon_xpm[] = {
"26 13 2 1",
" c None",
". c #000000",
" ... ... ... ... ... ... ",
". . . . . . . ",
". . . . . . . ",
". . . . . . . ",
" ....... ... ... ....... ",
". . . . . ",
". . . . . ",
". . . . . ",
" ....... ... ... ....... ",
". . . . . . . ",
". . . . . . . ",
". . . . . . . ",
" ... ... ... ... ... ... "};
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 JumpX::Keyboard( parent, "Keyboard", f );
return input;
}
void KeyboardImpl::resetState()
{
if ( input )
input->resetState();
}
QPixmap *KeyboardImpl::icon()
{
if ( !icn )
icn = new QPixmap( (const char **)icon_xpm );
return icn;
}
QString KeyboardImpl::name()
{
return qApp->translate( "InputMethods", "JumpX" );
diff --git a/inputmethods/jumpx/keyboardimpl.h b/inputmethods/jumpx/keyboardimpl.h
index 087781f..cee4c18 100644
--- a/inputmethods/jumpx/keyboardimpl.h
+++ b/inputmethods/jumpx/keyboardimpl.h
@@ -14,38 +14,37 @@
#include <qpe/inputmethodinterface.h>
namespace JumpX
{
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:
JumpX::Keyboard *input;
QPixmap *icn;
- ulong ref;
};
} // anonymous namespace
#endif
diff --git a/inputmethods/keyboard/keyboardimpl.cpp b/inputmethods/keyboard/keyboardimpl.cpp
index 701d35f..86d0427 100644
--- a/inputmethods/keyboard/keyboardimpl.cpp
+++ b/inputmethods/keyboard/keyboardimpl.cpp
@@ -37,65 +37,65 @@ static const char * const kb_xpm[] = {
" .+@@@@.+@@.+@@.+@@.+@@@@@. ",
" .......................... ",
" .++++++.+++.+++.+++.+++++. ",
" .+@@@@@.+@@.+@@.+@@.+@@@@. ",
" .......................... ",
" .++++.++++++++++++++.++++. ",
" .+@@@.+@@@@@@@@@@@@@.+@@@. ",
" .......................... "};
/* XPM */
static const char * const ipti_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 KeyboardInput::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", "Keyboard" );
diff --git a/inputmethods/keyboard/keyboardimpl.h b/inputmethods/keyboard/keyboardimpl.h
index d33a822..644070c 100644
--- a/inputmethods/keyboard/keyboardimpl.h
+++ b/inputmethods/keyboard/keyboardimpl.h
@@ -23,38 +23,37 @@
#include <qpe/inputmethodinterface.h>
namespace KeyboardInput
{
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:
KeyboardInput::Keyboard *input;
QPixmap *icn;
- ulong ref;
};
} // anonymous namespace
#endif
diff --git a/inputmethods/kjumpx/keyboardimpl.cpp b/inputmethods/kjumpx/keyboardimpl.cpp
index 54fe36e..6c4af71 100644
--- a/inputmethods/kjumpx/keyboardimpl.cpp
+++ b/inputmethods/kjumpx/keyboardimpl.cpp
@@ -6,65 +6,65 @@
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
*********************************************************************************************/
#include <qapplication.h>
#include <qpixmap.h>
#include "keyboard.h"
#include "keyboardimpl.h"
/* XPM */
static const char * const icon_xpm[] = {
"26 13 2 1",
" c None",
". c #000000",
" ... ... ... ... ... ... ",
". . . . . ",
". . ... .. . . ",
". . .. . . ",
" ...... ...... ... .... ",
". .. .. .. . ",
". .. .. .. . ",
". ... .. . ",
" ...... .. ...... ",
". . .. . . ",
". . ....... . . ",
". . . . . ",
" ... ... ... ... ... ... "};
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 KJumpX::Keyboard( parent, "Keyboard", f );
return input;
}
void KeyboardImpl::resetState()
{
if ( input )
input->resetState();
}
QPixmap *KeyboardImpl::icon()
{
if ( !icn )
icn = new QPixmap( (const char **)icon_xpm );
return icn;
}
QString KeyboardImpl::name()
{
return qApp->translate( "InputMethods", "KJumpX" );
diff --git a/inputmethods/kjumpx/keyboardimpl.h b/inputmethods/kjumpx/keyboardimpl.h
index 1ff1034..e57121e 100644
--- a/inputmethods/kjumpx/keyboardimpl.h
+++ b/inputmethods/kjumpx/keyboardimpl.h
@@ -14,38 +14,37 @@
#include <qpe/inputmethodinterface.h>
namespace KJumpX
{
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:
KJumpX::Keyboard *input;
QPixmap *icn;
- ulong ref;
};
} // anonymous namespace
#endif
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
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
@@ -9,65 +9,65 @@
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include <qapplication.h>
#include <qobject.h>
#include <qpixmap.h>
#include "pickboard.h"
#include "pickboardimpl.h"
/* XPM */
static const char * pb_xpm[]={
"28 7 2 1",
"# c #303030",
" c None",
" ########################## ",
" # # # # # # # ",
" # # # # # # # ",
" ########################## ",
" # # # # # # ",
" # # # # # # ",
" ########################## "};
PickboardImpl::PickboardImpl()
- : pickboard(0), icn(0), ref(0)
+ : pickboard(0), icn(0)
{
}
PickboardImpl::~PickboardImpl()
{
delete pickboard;
delete icn;
}
QWidget *PickboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
{
if ( !pickboard )
pickboard = new Pickboard( parent, "pickboard", f );
return pickboard;
}
void PickboardImpl::resetState()
{
if ( pickboard )
pickboard->resetState();
}
QPixmap *PickboardImpl::icon()
{
if ( !icn )
icn = new QPixmap( (const char **)pb_xpm );
return icn;
}
QString PickboardImpl::name()
{
return qApp->translate( "InputMethods", "Pickboard" );
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
@@ -16,36 +16,35 @@
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef PICKBOARDIMPL_H
#define PICKBOARDIMPL_H
#include <qpe/inputmethodinterface.h>
class Pickboard;
class QPixmap;
class PickboardImpl : public InputMethodInterface
{
public:
PickboardImpl();
virtual ~PickboardImpl();
#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:
Pickboard *pickboard;
QPixmap *icn;
- ulong ref;
};
#endif
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
@@ -14,65 +14,65 @@
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include <qapplication.h>
#include <qobject.h>
#include <qpixmap.h>
#include "unikeyboard.h"
#include "unikeyboardimpl.h"
/* XPM */
static const char * uni_xpm[]={
"28 13 2 1",
"# c #000000",
". c None",
"............................",
"...####....#####.....####...",
"...####....######....####...",
"...####....#######..........",
"...####....########..####...",
"...####....####.####.####...",
"...####....####..########...",
"...####....####...#######...",
"...####....####....######...",
"...#####..#####.....#####...",
"....##########.......####...",
"......######..........###...",
"............................"};
UniKeyboardImpl::UniKeyboardImpl()
- : input(0), icn(0), ref(0)
+ : input(0), icn(0)
{
}
UniKeyboardImpl::~UniKeyboardImpl()
{
delete input;
delete icn;
}
QWidget *UniKeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
{
if ( !input )
input = new UniKeyboard( parent, "UniKeyboard", f );
return input;
}
void UniKeyboardImpl::resetState()
{
if ( input )
input->resetState();
}
QPixmap *UniKeyboardImpl::icon()
{
if ( !icn )
icn = new QPixmap( (const char **)uni_xpm );
return icn;
}
QString UniKeyboardImpl::name()
{
return qApp->translate( "InputMethods", "Unicode" );
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
@@ -14,36 +14,35 @@
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef UNIKEYBOARDIMPL_H
#define UNIKEYBOARDIMPL_H
#include <qpe/inputmethodinterface.h>
class UniKeyboard;
class QPixmap;
class UniKeyboardImpl : public InputMethodInterface
{
public:
UniKeyboardImpl();
virtual ~UniKeyboardImpl();
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
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:
UniKeyboard *input;
QPixmap *icn;
- ulong ref;
};
#endif