4 files changed, 35 insertions, 18 deletions

diff --git a/x11/ipc/client/ocopclient.cpp b/x11/ipc/client/ocopclient.cpp
index 1c25271..43e426c 100644
--- a/x11/ipc/client/ocopclient.cpp
+++ b/x11/ipc/client/ocopclient.cpp
@@ -23,3 +23,3 @@ OCOPClient::~OCOPClient() {
 }
-void OCOPClient::init( const QCString& str ) {
+void OCOPClient::init( const QCString&  ) {
     struct sockaddr_un unix_adr;
@@ -64,3 +64,3 @@ void OCOPClient::newData() {
         /* is Registered should be handled sync */
-    case OCOPPacket::isRegistered:
+    case OCOPPacket::IsRegistered:
         break;
@@ -72,3 +72,3 @@ void OCOPClient::newData() {
 }
-OCOPPacket OCOPClient::packet() {
+OCOPPacket OCOPClient::packet() const{
     QCString chan;
@@ -84,3 +84,3 @@ OCOPPacket OCOPClient::packet() {
     }
-    OCOPPacket pack(head.type, chan,  func, data );
+    OCOPPacket pack(head.type, chan,  func, ar );
     return pack;
@@ -92,3 +92,3 @@ OCOPPacket OCOPClient::packet() {
  */
-bool OCOPClient::isRegistered( const QCString& chan ) {
+bool OCOPClient::isRegistered( const QCString& chan ) const{
     /* should I disconnect the socket notfier? */
@@ -105,3 +105,3 @@ bool OCOPClient::isRegistered( const QCString& chan ) {
         if (func[0] == 1 )
-            return;
+            return true;
     }
@@ -114,3 +114,3 @@ void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArra
 }
-void OCOPClient::addChannel(const QCString& channet) {
+void OCOPClient::addChannel(const QCString& channel) {
     OCOPPacket pack(OCOPPacket::RegisterChannel, channel );
@@ -119,6 +119,6 @@ void OCOPClient::addChannel(const QCString& channet) {
 void OCOPClient::delChannel(const QCString& chan ) {
-    OCOPPacket pack(OCOPPacket::UnregisterChannel, channel );
+    OCOPPacket pack(OCOPPacket::UnregisterChannel, chan );
     call( pack );
 }
-void OCOPPacket::call( const OCOPPacket& pack ) {
+void OCOPClient::call( const OCOPPacket& pack ) {
     OCOPHead head = pack.head();
diff --git a/x11/ipc/client/ocopclient.h b/x11/ipc/client/ocopclient.h
index db04d37..e9544b9 100644
--- a/x11/ipc/client/ocopclient.h
+++ b/x11/ipc/client/ocopclient.h
@@ -49,3 +49,3 @@ private slots:
 private:
-    OCOPPacket packet();
+    OCOPPacket packet()const;
     void call( const OCOPPacket& );
diff --git a/x11/libqpe-x11/libqpe-x11.pro b/x11/libqpe-x11/libqpe-x11.pro
index 1d30f90..64c05fa 100644
--- a/x11/libqpe-x11/libqpe-x11.pro
+++ b/x11/libqpe-x11/libqpe-x11.pro
@@ -55,4 +55,8 @@ HEADERS	=   ../../library/calendar.h \
             ../../library/imagecodecinterface.h \
+            qt/qcopchannel_qws.h \
             qpe/qpeapplication.h \
-            qpe/fontmanager.h
+            qpe/fontmanager.h \
+            ../ipc/client/ocopclient.h \
+            ../ipc/common/ocoppacket.h
+
 
@@ -108,9 +112,21 @@ SOURCES	=   ../../library/calendar.cpp \
             ../../library/finddialog.cpp \
-            ../../library/lnkproperties.cpp
+            ../../library/lnkproperties.cpp \
+            qt/qcopchannel_qws.cpp \
+            qpe/qpeapplication.cpp \
+            ../ipc/client/ocopclient.cpp \
+            ../ipc/common/ocoppacket.cpp
 
 # Qt 3 compatibility
-qt2:HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
-qt2:SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
+HEADERS +=  ../../library/quuid.h \
+             ../../library/qcom.h \
+             ../../library/qlibrary.h  \
+              ../../library/qlibrary_p.h
+
+SOURCES +=  ../../library/quuid.cpp \
+            ../../library/qlibrary.cpp \
+            ../../library/qlibrary_unix.cpp
+
 INCLUDEPATH += $(OPIEDIR)/include backend
         LIBS    += -ldl -lcrypt -lm
+
 INTERFACES =  ../../library/passwordbase_p.ui \
@@ -119,2 +135,3 @@ INTERFACES =  ../../library/passwordbase_p.ui \
               ../../library/lnkpropertiesbase_p.ui
+
         TARGET  = qpe-x11
diff --git a/x11/libqpe-x11/qt/qcopchannel_qws.cpp b/x11/libqpe-x11/qt/qcopchannel_qws.cpp
index efbef3f..c315d66 100644
--- a/x11/libqpe-x11/qt/qcopchannel_qws.cpp
+++ b/x11/libqpe-x11/qt/qcopchannel_qws.cpp
@@ -1,3 +1,3 @@
 
-#include "../ipc/client/ocopclient.h"
+#include "../../ipc/client/ocopclient.h"
 
@@ -29,5 +29,5 @@ bool QCopChannel::send( const QCString& chan, const QCString& msg ) {
     QByteArray ar(0);
-    return return sendLocally(chan, msg, ar );
+    return sendLocally(chan, msg, ar );
 }
-bool QCString::send( const QCString& chan, const QCString& msg,
+bool QCopChannel::send( const QCString& chan, const QCString& msg,
                      const QByteArray& ar ) {
@@ -44,3 +44,3 @@ void QCopChannel::rev( const QCString& chan, const QCString& msg, const QByteArr
     if (chan == m_chan )
-        emit received(chan, msg, ar );
+        emit received(msg, ar );
 }