author | sandman <sandman> | 2002-06-18 12:49:05 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-18 12:49:05 (UTC) |
commit | c739f74f910b24884279d34836c1f78a97a7e7ae (patch) (side-by-side diff) | |
tree | 432c379c30469e2be9117b4895b345e4947e688a /core/launcher/main.cpp | |
parent | 61e2f9e5eb634b17ef480d79bdbcbc3a715990cb (diff) | |
download | opie-c739f74f910b24884279d34836c1f78a97a7e7ae.zip opie-c739f74f910b24884279d34836c1f78a97a7e7ae.tar.gz opie-c739f74f910b24884279d34836c1f78a97a7e7ae.tar.bz2 |
Replaced OHwInfo with ODevice and ported from custom-*.h #defines to
ODevice methods
-rw-r--r-- | core/launcher/main.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 347eee9..b3c331b 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -29,13 +29,13 @@ #include <qpe/custom.h> #endif +#include <opie/odevice.h> + #include <qfile.h> #include <qwindowsystem_qws.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/alarmserver.h> -#include <opie/ohwinfo.h> - #include <stdlib.h> #include <stdio.h> #include <signal.h> @@ -193,7 +193,7 @@ public: { bool doinst = false; - m_model = OHwInfo::inst ( )-> model ( ); + m_model = ODevice::inst ( )-> model ( ); m_power_timer = 0; switch ( m_model ) { @@ -208,7 +208,7 @@ public: QWSServer::setKeyboardFilter ( this ); } - virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ) + virtual bool filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) { bool kill = false; @@ -267,9 +267,8 @@ public: } private: - OHwModel m_model; - bool m_power_press; - int m_power_timer; + OModel m_model; + int m_power_timer; }; |