author | zecke <zecke> | 2004-09-21 18:39:15 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-21 18:39:15 (UTC) |
commit | 95b81f3c2c9ae5f48f9aeca4dafea9400f9bb3f0 (patch) (side-by-side diff) | |
tree | f1f78ce9980f262262aa839ad8b95c1454305e7d | |
parent | 8d63da87b471780142f0d0431bbcb37c1afba646 (diff) | |
download | opie-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
-rw-r--r-- | libopie2/opiecore/device/odevice_beagle.h | 1 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_simpad.cpp | 3 |
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 @@ + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef OPIE_CORE_DEVICE_BEAGLE_H #define OPIE_CORE_DEVICE_BEAGLE_H #include "odevice.h" namespace Opie { namespace Core { namespace Internal { class Beagle : public ODevice { - Q_OBJECT public: Beagle(); ~Beagle(); //@{ void init( const QString& init ); void initButtons(); //@} //@{ bool setDisplayStatus( bool on ); int displayBrightnessResolution()const; bool setDisplayBrightness( int brightness ); //@} }; } } } #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&) } void SIMpad::initButtons() { if ( d->m_buttons ) return; d->m_buttons = new QValueList <ODeviceButton>; for ( uint i = 0; i < ( sizeof( simpad_buttons ) / sizeof( s_button )); i++ ) { s_button *sb = simpad_buttons + i; ODeviceButton b; if (( sb->model & d->m_model ) == d->m_model ) { b. setKeycode ( sb->code ); b. setUserText ( QObject::tr ( "Button", sb->utext )); b. setPixmap ( Resource::loadPixmap ( sb->pix )); b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( sb->fpressedservice ), sb->fpressedaction )); b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( sb->fheldservice ), sb->fheldaction )); d->m_buttons->append ( b ); } } reloadButtonMapping(); - - QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); - connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); } // SIMpad boardcontrol register CS3 #define SIMPAD_BOARDCONTROL "/proc/cs3" #define SIMPAD_VCC_5V_EN 0x0001 // For 5V PCMCIA #define SIMPAD_VCC_3V_EN 0x0002 // FOR 3.3V PCMCIA #define SIMPAD_EN1 0x0004 // This is only for EPROM's #define SIMPAD_EN0 0x0008 // Both should be enable for 3.3V or 5V #define SIMPAD_DISPLAY_ON 0x0010 #define SIMPAD_PCMCIA_BUFF_DIS 0x0020 #define SIMPAD_MQ_RESET 0x0040 #define SIMPAD_PCMCIA_RESET 0x0080 #define SIMPAD_DECT_POWER_ON 0x0100 #define SIMPAD_IRDA_SD 0x0200 // Shutdown for powersave #define SIMPAD_RS232_ON 0x0400 #define SIMPAD_SD_MEDIAQ 0x0800 // Shutdown for powersave #define SIMPAD_LED2_ON 0x1000 #define SIMPAD_IRDA_MODE 0x2000 // Fast/Slow IrDA mode #define SIMPAD_ENABLE_5V 0x4000 // Enable 5V circuit #define SIMPAD_RESET_SIMCARD 0x8000 //SIMpad touchscreen backlight strength control #define SIMPAD_BACKLIGHT_CONTROL "/proc/driver/mq200/backlight" |