author | zecke <zecke> | 2002-10-16 01:05:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-16 01:05:42 (UTC) |
commit | 3e973543b77631d053a9616b5540966dbe51ab47 (patch) (side-by-side diff) | |
tree | 8b47c7015ec9706b2dc794ce0cf382d50f47b680 /x11/ipc | |
parent | 65ef0e86a879332cbf8b1575886d3c36c7d2d9bd (diff) | |
download | opie-3e973543b77631d053a9616b5540966dbe51ab47.zip opie-3e973543b77631d053a9616b5540966dbe51ab47.tar.gz opie-3e973543b77631d053a9616b5540966dbe51ab47.tar.bz2 |
Make it link
-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 @@ -20,9 +20,9 @@ OCOPClient::OCOPClient( const QString& path, QObject* obj ) } 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 ) { qWarning("could not socket"); QTimer::singleShot(400, this,SLOT(init() ) ); @@ -61,17 +61,17 @@ void OCOPClient::newData() { case OCOPPacket::UnregisterChannel: case OCOPPacket::Return: case OCOPPacket::Signal: /* is Registered should be handled sync */ - case OCOPPacket::isRegistered: + case OCOPPacket::IsRegistered: break; /* emit the signal */ case OCOPPacket::Call: emit called( pack.channel(), pack.header(), pack.content() ); break; } } -OCOPPacket OCOPClient::packet() { +OCOPPacket OCOPClient::packet() const{ QCString chan; QCString func; QByteArray ar; OCOPHead head; @@ -81,17 +81,17 @@ OCOPPacket OCOPClient::packet() { read(m_socket, chan.data(), head.chlen ); read(m_socket, func.data(), head.funclen ); read(m_socket, ar.data(), head.datalen ); } - OCOPPacket pack(head.type, chan, func, data ); + OCOPPacket pack(head.type, chan, func, ar ); return pack; } /* * we've blocking IO here on these sockets * so we send and go on read * 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 ); OCOPHead head = packe.head(); write(m_socket, &head, sizeof(head) ); @@ -102,26 +102,26 @@ bool OCOPClient::isRegistered( const QCString& chan ) { /* connect here again */ if ( pack.channel() == chan ) { QCString func = pack.header(); if (func[0] == 1 ) - return; + return true; } return false; }; void OCOPClient::send( const QCString& chan, const QCString& fu, const QByteArray& arr ) { OCOPPacket pack(OCOPPacket::Call, chan, fu, arr ); 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) ); write(m_socket, pack.channel().data(), pack.channel().size() ); write(m_socket, pack.header().data(), pack.header().size() ); 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 @@ -46,9 +46,9 @@ signals: private slots: void init(const QCString& pa); void newData(); private: - OCOPPacket packet(); + OCOPPacket packet()const; void call( const OCOPPacket& ); QSocketNotifier* m_notify; int m_socket; |