summaryrefslogtreecommitdiff
path: root/libopie2
authorzecke <zecke>2004-09-21 18:39:15 (UTC)
committer zecke <zecke>2004-09-21 18:39:15 (UTC)
commit95b81f3c2c9ae5f48f9aeca4dafea9400f9bb3f0 (patch) (unidiff)
treef1f78ce9980f262262aa839ad8b95c1454305e7d /libopie2
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 (limited to 'libopie2') (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
@@ -33,13 +33,12 @@
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 );
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
@@ -160,15 +160,12 @@ void SIMpad::initButtons()
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