author | alwin <alwin> | 2004-08-01 10:34:14 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-08-01 10:34:14 (UTC) |
commit | 724f12e7a37e977b70bb0002d14ee36b9358ae99 (patch) (side-by-side diff) | |
tree | 273711aa81ed69aaf24201ed51e98509241e19b5 /development | |
parent | ecd0e7c523c9f190eb2b8765ef2d629aa399d635 (diff) | |
download | opie-724f12e7a37e977b70bb0002d14ee36b9358ae99.zip opie-724f12e7a37e977b70bb0002d14ee36b9358ae99.tar.gz opie-724f12e7a37e977b70bb0002d14ee36b9358ae99.tar.bz2 |
switched to OKeyFilter handler.
-rw-r--r-- | development/keyview/keyview.cpp | 17 | ||||
-rw-r--r-- | development/keyview/keyview.h | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/development/keyview/keyview.cpp b/development/keyview/keyview.cpp index 8e24efc..8187744 100644 --- a/development/keyview/keyview.cpp +++ b/development/keyview/keyview.cpp @@ -3,6 +3,8 @@ //#include <iostream.h> #include <qlineedit.h> #include <qlabel.h> +#include <opie2/okeyfilter.h> +#include <opie2/odebug.h> Keyview::Keyview( QWidget* parent, const char* name, WFlags fl ) : QGrid ( 2, parent, name, fl ) @@ -28,7 +30,7 @@ Keyview::Keyview( QWidget* parent, const char* name, WFlags fl ) l = new QLabel(QString("isPress:"), this); isPress = new QLineEdit(this); isPress->setReadOnly(1); - + l = new QLabel(QString("autoRepeat:"), this); autoRepeat = new QLineEdit(this); autoRepeat->setReadOnly(1); @@ -39,13 +41,16 @@ Keyview::Keyview( QWidget* parent, const char* name, WFlags fl ) KeyFilter *filter = new KeyFilter(this); - QWSServer::setKeyboardFilter(filter); + Opie::Core::OKeyFilter::inst()->addHandler(filter); + odebug << "Creating keyview filter " << oendl; - connect(filter, SIGNAL(keyPressed(int,int,int,bool,bool)), + connect(filter, SIGNAL(keyPressed(int,int,int,bool,bool)), this, SLOT(updateItems(int,int,int,bool,bool))); } -Keyview::~Keyview() { } +Keyview::~Keyview() +{ +} void Keyview::updateItems(int u, int k, int m, bool p, bool a) { @@ -56,8 +61,8 @@ void Keyview::updateItems(int u, int k, int m, bool p, bool a) { autoRepeat->setText("0x" + QString::number(a, 16)); } -KeyFilter::KeyFilter(QObject * parent, const char *name) : QObject( parent, name ) { - +KeyFilter::KeyFilter(QObject * parent, const char *name) : QObject( parent, name ) +{ } bool KeyFilter::filter(int unicode, int keycode, int modifiers, bool isPress, diff --git a/development/keyview/keyview.h b/development/keyview/keyview.h index ab4ae60..5f1e943 100644 --- a/development/keyview/keyview.h +++ b/development/keyview/keyview.h @@ -6,7 +6,7 @@ class Keyview : public QGrid -{ +{ Q_OBJECT public: |