Replaced OHwInfo with ODevice and ported from custom-*.h #defines to

ODevice methods

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
@@ -31,2 +31,4 @@
 
+#include <opie/odevice.h>
+
 #include <qfile.h>
@@ -36,4 +38,2 @@
 
-#include <opie/ohwinfo.h>
-
 #include <stdlib.h>
@@ -195,3 +195,3 @@ public:
         
-                m_model = OHwInfo::inst ( )-> model ( );
+                m_model = ODevice::inst ( )-> model ( );
                 m_power_timer = 0;
@@ -210,3 +210,3 @@ public:
 
-        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 )
         {
@@ -269,5 +269,4 @@ public:
 private:
-        OHwModel m_model;
-        bool     m_power_press;
-        int      m_power_timer;
+        OModel  m_model;
+        int     m_power_timer;
 };