summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-13 13:20:17 (UTC)
committer zecke <zecke>2004-07-13 13:20:17 (UTC)
commit4a31bc0d4c9a30583200e866f21340448d41d1c2 (patch) (side-by-side diff)
tree2123d65d18b6ca57227bdb8b3254e82d9ba31759
parent37e0e077b51841971c3d4c25b287f4d39e750e2d (diff)
downloadopie-4a31bc0d4c9a30583200e866f21340448d41d1c2.zip
opie-4a31bc0d4c9a30583200e866f21340448d41d1c2.tar.gz
opie-4a31bc0d4c9a30583200e866f21340448d41d1c2.tar.bz2
-Small clean up, we do not need to use the file anymore as all
model checking is done in the ODevice base class -m_led[0] = m_led[1] = LedOff which size does m_led need? yeah two
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_simpad.cpp2
-rw-r--r--libopie2/opiecore/device/odevice_simpad.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index 6d4624b..76f03a0 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -112,17 +112,16 @@ struct s_button simpad_buttons [] = {
*/
};
void SIMpad::init(const QString&)
{
d->m_vendorstr = "SIEMENS";
d->m_vendor = Vendor_SIEMENS;
- QFile f ( "/proc/hal/model" );
//TODO Implement model checking
//FIXME For now we assume an SL4
d->m_modelstr = "SL4";
d->m_model = Model_SIMpad_SL4;
switch ( d->m_model ) {
@@ -130,17 +129,16 @@ void SIMpad::init(const QString&)
d->m_rotation = Rot0;
d->m_direction = CCW;
d->m_holdtime = 1000; // 1000ms
break;
}
//Distribution detecting code is now in base class
-
m_leds [0] = m_leds [1] = Led_Off;
m_power_timer = 0;
}
void SIMpad::initButtons()
{
diff --git a/libopie2/opiecore/device/odevice_simpad.h b/libopie2/opiecore/device/odevice_simpad.h
index 0f4e66f..d9ae5a5 100644
--- a/libopie2/opiecore/device/odevice_simpad.h
+++ b/libopie2/opiecore/device/odevice_simpad.h
@@ -35,17 +35,17 @@
/* QT */
#include <qwindowsystem_qws.h>
namespace Opie {
namespace Core {
namespace Internal {
class SIMpad : public ODevice, public QWSServer::KeyboardFilter
-{
+{
protected:
virtual void init(const QString&);
virtual void initButtons();
public:
virtual bool setSoftSuspend( bool soft );
virtual bool suspend();
@@ -61,17 +61,17 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter
virtual bool setLedState( OLed led, OLedState st );
protected:
virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
virtual void timerEvent( QTimerEvent *te );
int m_power_timer;
- OLedState m_leds [1];
+ OLedState m_leds [2];
};
struct s_button {
uint model;
Qt::Key code;
char *utext;
char *pix;
char *fpressedservice;