summaryrefslogtreecommitdiff
authoralwin <alwin>2004-08-01 10:34:14 (UTC)
committer alwin <alwin>2004-08-01 10:34:14 (UTC)
commit724f12e7a37e977b70bb0002d14ee36b9358ae99 (patch) (unidiff)
tree273711aa81ed69aaf24201ed51e98509241e19b5
parentecd0e7c523c9f190eb2b8765ef2d629aa399d635 (diff)
downloadopie-724f12e7a37e977b70bb0002d14ee36b9358ae99.zip
opie-724f12e7a37e977b70bb0002d14ee36b9358ae99.tar.gz
opie-724f12e7a37e977b70bb0002d14ee36b9358ae99.tar.bz2
switched to OKeyFilter handler.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--development/keyview/keyview.cpp17
-rw-r--r--development/keyview/keyview.h2
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 @@
3//#include <iostream.h> 3//#include <iostream.h>
4#include <qlineedit.h> 4#include <qlineedit.h>
5#include <qlabel.h> 5#include <qlabel.h>
6#include <opie2/okeyfilter.h>
7#include <opie2/odebug.h>
6 8
7Keyview::Keyview( QWidget* parent, const char* name, WFlags fl ) 9Keyview::Keyview( QWidget* parent, const char* name, WFlags fl )
8 : QGrid ( 2, parent, name, fl ) 10 : QGrid ( 2, parent, name, fl )
@@ -28,7 +30,7 @@ Keyview::Keyview( QWidget* parent, const char* name, WFlags fl )
28 l = new QLabel(QString("isPress:"), this); 30 l = new QLabel(QString("isPress:"), this);
29 isPress = new QLineEdit(this); 31 isPress = new QLineEdit(this);
30 isPress->setReadOnly(1); 32 isPress->setReadOnly(1);
31 33
32 l = new QLabel(QString("autoRepeat:"), this); 34 l = new QLabel(QString("autoRepeat:"), this);
33 autoRepeat = new QLineEdit(this); 35 autoRepeat = new QLineEdit(this);
34 autoRepeat->setReadOnly(1); 36 autoRepeat->setReadOnly(1);
@@ -39,13 +41,16 @@ Keyview::Keyview( QWidget* parent, const char* name, WFlags fl )
39 41
40 42
41 KeyFilter *filter = new KeyFilter(this); 43 KeyFilter *filter = new KeyFilter(this);
42 QWSServer::setKeyboardFilter(filter); 44 Opie::Core::OKeyFilter::inst()->addHandler(filter);
45 odebug << "Creating keyview filter " << oendl;
43 46
44 connect(filter, SIGNAL(keyPressed(int,int,int,bool,bool)), 47 connect(filter, SIGNAL(keyPressed(int,int,int,bool,bool)),
45 this, SLOT(updateItems(int,int,int,bool,bool))); 48 this, SLOT(updateItems(int,int,int,bool,bool)));
46} 49}
47 50
48Keyview::~Keyview() { } 51Keyview::~Keyview()
52{
53}
49 54
50void Keyview::updateItems(int u, int k, int m, bool p, bool a) { 55void Keyview::updateItems(int u, int k, int m, bool p, bool a) {
51 56
@@ -56,8 +61,8 @@ void Keyview::updateItems(int u, int k, int m, bool p, bool a) {
56 autoRepeat->setText("0x" + QString::number(a, 16)); 61 autoRepeat->setText("0x" + QString::number(a, 16));
57} 62}
58 63
59KeyFilter::KeyFilter(QObject * parent, const char *name) : QObject( parent, name ) { 64KeyFilter::KeyFilter(QObject * parent, const char *name) : QObject( parent, name )
60 65{
61} 66}
62 67
63bool KeyFilter::filter(int unicode, int keycode, int modifiers, bool isPress, 68bool 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 @@
6 6
7 7
8class Keyview : public QGrid 8class Keyview : public QGrid
9{ 9{
10 Q_OBJECT 10 Q_OBJECT
11 11
12public: 12public: