summaryrefslogtreecommitdiff
authorzecke <zecke>2004-09-21 18:39:15 (UTC)
committer zecke <zecke>2004-09-21 18:39:15 (UTC)
commit95b81f3c2c9ae5f48f9aeca4dafea9400f9bb3f0 (patch) (unidiff)
treef1f78ce9980f262262aa839ad8b95c1454305e7d
parent8d63da87b471780142f0d0431bbcb37c1afba646 (diff)
downloadopie-95b81f3c2c9ae5f48f9aeca4dafea9400f9bb3f0.zip
opie-95b81f3c2c9ae5f48f9aeca4dafea9400f9bb3f0.tar.gz
opie-95b81f3c2c9ae5f48f9aeca4dafea9400f9bb3f0.tar.bz2
-Remove uneeded QCopChannel from SIMpad ODevice
-connecting to a non existing slot in a class without a Q_OBJECT in the header lead to a crash on ARM -Remove Q_OBJECT from Beagle as we've no slots and signals
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_beagle.h1
-rw-r--r--libopie2/opiecore/device/odevice_simpad.cpp3
2 files changed, 0 insertions, 4 deletions
diff --git a/libopie2/opiecore/device/odevice_beagle.h b/libopie2/opiecore/device/odevice_beagle.h
index 1626330..17b040c 100644
--- a/libopie2/opiecore/device/odevice_beagle.h
+++ b/libopie2/opiecore/device/odevice_beagle.h
@@ -15,48 +15,47 @@
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.=       =       ; Library General Public License for more
20++=   -.     .`     .: details. 20++=   -.     .`     .: details.
21 :     =  ...= . :.=- 21 :     =  ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22 -.   .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23  -_. . .   )=.  = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24    --        :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28*/ 28*/
29 29
30#ifndef OPIE_CORE_DEVICE_BEAGLE_H 30#ifndef OPIE_CORE_DEVICE_BEAGLE_H
31#define OPIE_CORE_DEVICE_BEAGLE_H 31#define OPIE_CORE_DEVICE_BEAGLE_H
32 32
33#include "odevice.h" 33#include "odevice.h"
34 34
35namespace Opie { 35namespace Opie {
36namespace Core { 36namespace Core {
37namespace Internal { 37namespace Internal {
38class Beagle : public ODevice { 38class Beagle : public ODevice {
39 Q_OBJECT
40public: 39public:
41 Beagle(); 40 Beagle();
42 ~Beagle(); 41 ~Beagle();
43 42
44//@{ 43//@{
45 void init( const QString& init ); 44 void init( const QString& init );
46 void initButtons(); 45 void initButtons();
47//@} 46//@}
48 47
49 48
50//@{ 49//@{
51 bool setDisplayStatus( bool on ); 50 bool setDisplayStatus( bool on );
52 int displayBrightnessResolution()const; 51 int displayBrightnessResolution()const;
53 bool setDisplayBrightness( int brightness ); 52 bool setDisplayBrightness( int brightness );
54//@} 53//@}
55 54
56}; 55};
57} 56}
58} 57}
59} 58}
60 59
61 60
62#endif 61#endif
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index 335e0db..4ae3c4f 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -142,51 +142,48 @@ void SIMpad::init(const QString&)
142} 142}
143 143
144void SIMpad::initButtons() 144void SIMpad::initButtons()
145{ 145{
146 if ( d->m_buttons ) 146 if ( d->m_buttons )
147 return; 147 return;
148 148
149 d->m_buttons = new QValueList <ODeviceButton>; 149 d->m_buttons = new QValueList <ODeviceButton>;
150 150
151 for ( uint i = 0; i < ( sizeof( simpad_buttons ) / sizeof( s_button )); i++ ) { 151 for ( uint i = 0; i < ( sizeof( simpad_buttons ) / sizeof( s_button )); i++ ) {
152 s_button *sb = simpad_buttons + i; 152 s_button *sb = simpad_buttons + i;
153 ODeviceButton b; 153 ODeviceButton b;
154 154
155 if (( sb->model & d->m_model ) == d->m_model ) { 155 if (( sb->model & d->m_model ) == d->m_model ) {
156 b. setKeycode ( sb->code ); 156 b. setKeycode ( sb->code );
157 b. setUserText ( QObject::tr ( "Button", sb->utext )); 157 b. setUserText ( QObject::tr ( "Button", sb->utext ));
158 b. setPixmap ( Resource::loadPixmap ( sb->pix )); 158 b. setPixmap ( Resource::loadPixmap ( sb->pix ));
159 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb->fpressedservice ), sb->fpressedaction )); 159 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb->fpressedservice ), sb->fpressedaction ));
160 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb->fheldservice ), sb->fheldaction )); 160 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb->fheldservice ), sb->fheldaction ));
161 161
162 d->m_buttons->append ( b ); 162 d->m_buttons->append ( b );
163 } 163 }
164 } 164 }
165 reloadButtonMapping(); 165 reloadButtonMapping();
166
167 QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
168 connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
169} 166}
170 167
171// SIMpad boardcontrol register CS3 168// SIMpad boardcontrol register CS3
172#define SIMPAD_BOARDCONTROL "/proc/cs3" 169#define SIMPAD_BOARDCONTROL "/proc/cs3"
173#define SIMPAD_VCC_5V_EN 0x0001 // For 5V PCMCIA 170#define SIMPAD_VCC_5V_EN 0x0001 // For 5V PCMCIA
174#define SIMPAD_VCC_3V_EN 0x0002 // FOR 3.3V PCMCIA 171#define SIMPAD_VCC_3V_EN 0x0002 // FOR 3.3V PCMCIA
175#define SIMPAD_EN1 0x0004 // This is only for EPROM's 172#define SIMPAD_EN1 0x0004 // This is only for EPROM's
176#define SIMPAD_EN0 0x0008 // Both should be enable for 3.3V or 5V 173#define SIMPAD_EN0 0x0008 // Both should be enable for 3.3V or 5V
177#define SIMPAD_DISPLAY_ON 0x0010 174#define SIMPAD_DISPLAY_ON 0x0010
178#define SIMPAD_PCMCIA_BUFF_DIS 0x0020 175#define SIMPAD_PCMCIA_BUFF_DIS 0x0020
179#define SIMPAD_MQ_RESET 0x0040 176#define SIMPAD_MQ_RESET 0x0040
180#define SIMPAD_PCMCIA_RESET 0x0080 177#define SIMPAD_PCMCIA_RESET 0x0080
181#define SIMPAD_DECT_POWER_ON 0x0100 178#define SIMPAD_DECT_POWER_ON 0x0100
182#define SIMPAD_IRDA_SD 0x0200 // Shutdown for powersave 179#define SIMPAD_IRDA_SD 0x0200 // Shutdown for powersave
183#define SIMPAD_RS232_ON 0x0400 180#define SIMPAD_RS232_ON 0x0400
184#define SIMPAD_SD_MEDIAQ 0x0800 // Shutdown for powersave 181#define SIMPAD_SD_MEDIAQ 0x0800 // Shutdown for powersave
185#define SIMPAD_LED2_ON 0x1000 182#define SIMPAD_LED2_ON 0x1000
186#define SIMPAD_IRDA_MODE 0x2000 // Fast/Slow IrDA mode 183#define SIMPAD_IRDA_MODE 0x2000 // Fast/Slow IrDA mode
187#define SIMPAD_ENABLE_5V 0x4000 // Enable 5V circuit 184#define SIMPAD_ENABLE_5V 0x4000 // Enable 5V circuit
188#define SIMPAD_RESET_SIMCARD 0x8000 185#define SIMPAD_RESET_SIMCARD 0x8000
189 186
190//SIMpad touchscreen backlight strength control 187//SIMpad touchscreen backlight strength control
191#define SIMPAD_BACKLIGHT_CONTROL "/proc/driver/mq200/backlight" 188#define SIMPAD_BACKLIGHT_CONTROL "/proc/driver/mq200/backlight"
192 189