-rw-r--r-- | x11/ipc/client/ocopclient.cpp | 18 | ||||
-rw-r--r-- | x11/ipc/client/ocopclient.h | 2 |
2 files changed, 10 insertions, 10 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 @@ -22,5 +22,5 @@ OCOPClient::~OCOPClient() { close( m_socket ); } -void OCOPClient::init( const QCString& str ) { +void OCOPClient::init( const QCString& ) { struct sockaddr_un unix_adr; if ( (m_socket = socket(PF_UNIX, SOCK_STREAM, 0) ) < 0 ) { @@ -63,5 +63,5 @@ void OCOPClient::newData() { case OCOPPacket::Signal: /* is Registered should be handled sync */ - case OCOPPacket::isRegistered: + case OCOPPacket::IsRegistered: break; /* emit the signal */ @@ -71,5 +71,5 @@ void OCOPClient::newData() { } } -OCOPPacket OCOPClient::packet() { +OCOPPacket OCOPClient::packet() const{ QCString chan; QCString func; @@ -83,5 +83,5 @@ OCOPPacket OCOPClient::packet() { read(m_socket, ar.data(), head.datalen ); } - OCOPPacket pack(head.type, chan, func, data ); + OCOPPacket pack(head.type, chan, func, ar ); return pack; } @@ -91,5 +91,5 @@ OCOPPacket OCOPClient::packet() { * this will be blocked */ -bool OCOPClient::isRegistered( const QCString& chan ) { +bool OCOPClient::isRegistered( const QCString& chan ) const{ /* should I disconnect the socket notfier? */ OCOPPacket packe(OCOPPacket::IsRegistered, chan ); @@ -104,5 +104,5 @@ bool OCOPClient::isRegistered( const QCString& chan ) { QCString func = pack.header(); if (func[0] == 1 ) - return; + return true; } @@ -113,13 +113,13 @@ void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArra call( pack ); } -void OCOPClient::addChannel(const QCString& channet) { +void OCOPClient::addChannel(const QCString& channel) { OCOPPacket pack(OCOPPacket::RegisterChannel, channel ); call( pack ); } 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(); write(m_socket, &head, sizeof(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 @@ -48,5 +48,5 @@ private slots: void newData(); private: - OCOPPacket packet(); + OCOPPacket packet()const; void call( const OCOPPacket& ); |