Revert last commit and create a QCOP Channel for QPE/System in

ODevice again, as OApplication doesn't expose the signal anymore

1 files changed, 3 insertions, 2 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index e57cdef..39b37cd 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -632,36 +632,37 @@ uint ODevice::buttonHoldTime() const
 * @see ODeviceButton
 */
 const ODeviceButton *ODevice::buttonForKeycode ( ushort code )
 {
     initButtons();
 
     for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) {
         if ( (*it). keycode() == code )
             return &(*it);
     }
     return 0;
 }
 
 void ODevice::reloadButtonMapping()
 {
     if(!d->m_buttons)
-        initButtons();
+	initButtons();
     
     if(!d->m_initializedButtonQcop) {
-	connect(qApp,SIGNAL(systemMessageSignal(const QCString&,const QByteArray&)),
+	QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel");
+	connect(chan,SIGNAL(received(const QCString&,const QByteArray&)),
 		this,SLOT(systemMessage(const QCString&,const QByteArray&)));
 	d->m_initializedButtonQcop = true;
     }
 
     Config cfg ( "ButtonSettings" );
 
     for ( uint i = 0; i < d->m_buttons->count(); i++ ) {
         ODeviceButton &b = ( *d->m_buttons ) [i];
         QString group = "Button" + QString::number ( i );
 
         QCString pch, hch;
         QCString pm, hm;
         QByteArray pdata, hdata;
 
         if ( cfg. hasGroup ( group )) {
             cfg. setGroup ( group );