summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/liboscar
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 13:17:02 -0600
committerTimothy Pearson <[email protected]>2013-01-25 13:17:02 -0600
commit4816c4a735e1704c433dbe42155bf3887180d8ea (patch)
tree868b82f46bee5214e7b8251e79ce56d4c1453c9a /kopete/protocols/oscar/liboscar
parentf21aaec952493cb5688c73de6e82a569ddbd7fb2 (diff)
downloadtdenetwork-4816c4a735e1704c433dbe42155bf3887180d8ea.tar.gz
tdenetwork-4816c4a735e1704c433dbe42155bf3887180d8ea.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/oscar/liboscar')
-rw-r--r--kopete/protocols/oscar/liboscar/oscarbytestream.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/oscarbytestream.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
index cffb672f..bed0a89e 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp
@@ -32,7 +32,7 @@ KNetworkByteStream::KNetworkByteStream( TQObject *parent, const char */*name*/ )
// reset close tracking flag
mClosing = false;
- mSocket = new KNetwork::KBufferedSocket;
+ mSocket = new KNetwork::TDEBufferedSocket;
// make sure we get a signal whenever there's data to be read
mSocket->enableRead( true );
@@ -79,7 +79,7 @@ int KNetworkByteStream::tryWrite ()
return writeData.size();
}
-KNetwork::KBufferedSocket *KNetworkByteStream::socket() const
+KNetwork::TDEBufferedSocket *KNetworkByteStream::socket() const
{
return mSocket;
}
diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h
index 15346ff0..df4085ab 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.h
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h
@@ -46,7 +46,7 @@ public:
virtual bool isOpen () const;
virtual void close ();
- KNetwork::KBufferedSocket *socket () const;
+ KNetwork::TDEBufferedSocket *socket () const;
signals:
void connected ();
@@ -62,7 +62,7 @@ private slots:
void slotError ( int );
private:
- KNetwork::KBufferedSocket *mSocket;
+ KNetwork::TDEBufferedSocket *mSocket;
bool mClosing;
};