author | zecke <zecke> | 2004-07-13 13:20:17 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-13 13:20:17 (UTC) |
commit | 4a31bc0d4c9a30583200e866f21340448d41d1c2 (patch) (unidiff) | |
tree | 2123d65d18b6ca57227bdb8b3254e82d9ba31759 | |
parent | 37e0e077b51841971c3d4c25b287f4d39e750e2d (diff) | |
download | opie-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
-rw-r--r-- | libopie2/opiecore/device/odevice_simpad.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_simpad.h | 4 |
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 [] = { | |||
112 | */ | 112 | */ |
113 | }; | 113 | }; |
114 | 114 | ||
115 | void SIMpad::init(const QString&) | 115 | void SIMpad::init(const QString&) |
116 | { | 116 | { |
117 | d->m_vendorstr = "SIEMENS"; | 117 | d->m_vendorstr = "SIEMENS"; |
118 | d->m_vendor = Vendor_SIEMENS; | 118 | d->m_vendor = Vendor_SIEMENS; |
119 | 119 | ||
120 | QFile f ( "/proc/hal/model" ); | ||
121 | 120 | ||
122 | //TODO Implement model checking | 121 | //TODO Implement model checking |
123 | //FIXME For now we assume an SL4 | 122 | //FIXME For now we assume an SL4 |
124 | 123 | ||
125 | d->m_modelstr = "SL4"; | 124 | d->m_modelstr = "SL4"; |
126 | d->m_model = Model_SIMpad_SL4; | 125 | d->m_model = Model_SIMpad_SL4; |
127 | 126 | ||
128 | switch ( d->m_model ) { | 127 | switch ( d->m_model ) { |
@@ -130,17 +129,16 @@ void SIMpad::init(const QString&) | |||
130 | d->m_rotation = Rot0; | 129 | d->m_rotation = Rot0; |
131 | d->m_direction = CCW; | 130 | d->m_direction = CCW; |
132 | d->m_holdtime = 1000; // 1000ms | 131 | d->m_holdtime = 1000; // 1000ms |
133 | 132 | ||
134 | break; | 133 | break; |
135 | } | 134 | } |
136 | 135 | ||
137 | //Distribution detecting code is now in base class | 136 | //Distribution detecting code is now in base class |
138 | |||
139 | m_leds [0] = m_leds [1] = Led_Off; | 137 | m_leds [0] = m_leds [1] = Led_Off; |
140 | 138 | ||
141 | m_power_timer = 0; | 139 | m_power_timer = 0; |
142 | 140 | ||
143 | } | 141 | } |
144 | 142 | ||
145 | void SIMpad::initButtons() | 143 | void SIMpad::initButtons() |
146 | { | 144 | { |
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 @@ | |||
35 | /* QT */ | 35 | /* QT */ |
36 | #include <qwindowsystem_qws.h> | 36 | #include <qwindowsystem_qws.h> |
37 | 37 | ||
38 | namespace Opie { | 38 | namespace Opie { |
39 | namespace Core { | 39 | namespace Core { |
40 | namespace Internal { | 40 | namespace Internal { |
41 | 41 | ||
42 | class SIMpad : public ODevice, public QWSServer::KeyboardFilter | 42 | class SIMpad : public ODevice, public QWSServer::KeyboardFilter |
43 | { | 43 | { |
44 | protected: | 44 | protected: |
45 | virtual void init(const QString&); | 45 | virtual void init(const QString&); |
46 | virtual void initButtons(); | 46 | virtual void initButtons(); |
47 | 47 | ||
48 | public: | 48 | public: |
49 | virtual bool setSoftSuspend( bool soft ); | 49 | virtual bool setSoftSuspend( bool soft ); |
50 | virtual bool suspend(); | 50 | virtual bool suspend(); |
51 | 51 | ||
@@ -61,17 +61,17 @@ class SIMpad : public ODevice, public QWSServer::KeyboardFilter | |||
61 | virtual bool setLedState( OLed led, OLedState st ); | 61 | virtual bool setLedState( OLed led, OLedState st ); |
62 | 62 | ||
63 | protected: | 63 | protected: |
64 | virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ); | 64 | virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ); |
65 | virtual void timerEvent( QTimerEvent *te ); | 65 | virtual void timerEvent( QTimerEvent *te ); |
66 | 66 | ||
67 | int m_power_timer; | 67 | int m_power_timer; |
68 | 68 | ||
69 | OLedState m_leds [1]; | 69 | OLedState m_leds [2]; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | struct s_button { | 72 | struct s_button { |
73 | uint model; | 73 | uint model; |
74 | Qt::Key code; | 74 | Qt::Key code; |
75 | char *utext; | 75 | char *utext; |
76 | char *pix; | 76 | char *pix; |
77 | char *fpressedservice; | 77 | char *fpressedservice; |