-Create the QPE/System channel in ODevice to listen for button remapping

-Remove various connect and QCopChannel creation from actual device implementations


Let us see if that breaks anything, I hope SIMpad still will do fine. We might need to
guard if a qApp exists?

1 files changed, 10 insertions, 3 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 8b64c41..67cae1c 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -179,2 +179,5 @@ ODevice::ODevice()
     d->m_sound = d->m_vol   = d->m_mixer = -1;
+    
+    /* System QCopChannel created */
+    d->m_initializedButtonQcop = false;
 
@@ -235,5 +238,2 @@ void ODevice::initButtons()
     reloadButtonMapping();
-
-    QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
@@ -647,2 +647,9 @@ void ODevice::reloadButtonMapping()
     initButtons();
+    
+    if(!d->m_initializedButtonQcop) {
+        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;
+    }