diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:12:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:12:44 -0600 |
| commit | d46a1fe34693137bbc38a0a79593af420ea0914b (patch) | |
| tree | 038dbf461083bda9b7a6398908572591a80012d3 /libktorrent/kademlia | |
| parent | 604bf3f969d880708ea9a1affce0b304c29e6ff5 (diff) | |
| download | ktorrent-d46a1fe34693137bbc38a0a79593af420ea0914b.tar.gz ktorrent-d46a1fe34693137bbc38a0a79593af420ea0914b.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libktorrent/kademlia')
| -rw-r--r-- | libktorrent/kademlia/rpcmsg.h | 4 | ||||
| -rw-r--r-- | libktorrent/kademlia/rpcserver.cpp | 4 | ||||
| -rw-r--r-- | libktorrent/kademlia/rpcserver.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libktorrent/kademlia/rpcmsg.h b/libktorrent/kademlia/rpcmsg.h index 68a3367..58f6891 100644 --- a/libktorrent/kademlia/rpcmsg.h +++ b/libktorrent/kademlia/rpcmsg.h @@ -86,13 +86,13 @@ namespace dht virtual void encode(TQByteArray & arr) = 0; /// Set the origin (i.e. where the message came from) - void setOrigin(const KNetwork::KSocketAddress & o) {origin = o;} + void setOrigin(const KNetwork::TDESocketAddress & o) {origin = o;} /// Get the origin const KNetwork::KInetSocketAddress & getOrigin() const {return origin;} /// Set the origin (i.e. where the message came from) - void setDestination(const KNetwork::KSocketAddress & o) {origin = o;} + void setDestination(const KNetwork::TDESocketAddress & o) {origin = o;} /// Get the origin const KNetwork::KInetSocketAddress & getDestination() const {return origin;} diff --git a/libktorrent/kademlia/rpcserver.cpp b/libktorrent/kademlia/rpcserver.cpp index 8839de2..571d4d8 100644 --- a/libktorrent/kademlia/rpcserver.cpp +++ b/libktorrent/kademlia/rpcserver.cpp @@ -157,7 +157,7 @@ namespace dht } - void RPCServer::send(const KNetwork::KSocketAddress & addr,const TQByteArray & msg) + void RPCServer::send(const KNetwork::TDESocketAddress & addr,const TQByteArray & msg) { sock->send(KNetwork::KDatagramPacket(msg,addr)); } @@ -230,7 +230,7 @@ namespace dht return calls.find(mtid); } - void RPCServer::ping(const dht::Key & our_id,const KNetwork::KSocketAddress & addr) + void RPCServer::ping(const dht::Key & our_id,const KNetwork::TDESocketAddress & addr) { Out(SYS_DHT|LOG_NOTICE) << "DHT: pinging " << addr.nodeName() << endl; PingReq* pr = new PingReq(our_id); diff --git a/libktorrent/kademlia/rpcserver.h b/libktorrent/kademlia/rpcserver.h index 387daee..b555fb4 100644 --- a/libktorrent/kademlia/rpcserver.h +++ b/libktorrent/kademlia/rpcserver.h @@ -91,7 +91,7 @@ namespace dht * Ping a node, we don't care about the MTID. * @param addr The address */ - void ping(const dht::Key & our_id,const KNetwork::KSocketAddress & addr); + void ping(const dht::Key & our_id,const KNetwork::TDESocketAddress & addr); /** * Find a RPC call, based on the mtid @@ -106,7 +106,7 @@ namespace dht void readPacket(); private: - void send(const KNetwork::KSocketAddress & addr,const TQByteArray & msg); + void send(const KNetwork::TDESocketAddress & addr,const TQByteArray & msg); void doQueuedCalls(); private: |