summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:17:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:17:02 -0600
commit4816c4a735e1704c433dbe42155bf3887180d8ea (patch)
tree868b82f46bee5214e7b8251e79ce56d4c1453c9a /kopete/protocols/jabber
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/jabber')
-rw-r--r--kopete/protocols/jabber/jabberbytestream.cpp4
-rw-r--r--kopete/protocols/jabber/jabberbytestream.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp
index 1021757d..f04518a6 100644
--- a/kopete/protocols/jabber/jabberbytestream.cpp
+++ b/kopete/protocols/jabber/jabberbytestream.cpp
@@ -32,7 +32,7 @@ JabberByteStream::JabberByteStream ( 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 );
@@ -85,7 +85,7 @@ int JabberByteStream::tryWrite ()
}
-KNetwork::KBufferedSocket *JabberByteStream::socket () const
+KNetwork::TDEBufferedSocket *JabberByteStream::socket () const
{
return mSocket;
diff --git a/kopete/protocols/jabber/jabberbytestream.h b/kopete/protocols/jabber/jabberbytestream.h
index d72ce9ab..82f84bac 100644
--- a/kopete/protocols/jabber/jabberbytestream.h
+++ b/kopete/protocols/jabber/jabberbytestream.h
@@ -42,7 +42,7 @@ public:
virtual bool isOpen () const;
virtual void close ();
- KNetwork::KBufferedSocket *socket () const;
+ KNetwork::TDEBufferedSocket *socket () const;
signals:
void connected ();
@@ -58,7 +58,7 @@ private slots:
void slotError ( int );
private:
- KNetwork::KBufferedSocket *mSocket;
+ KNetwork::TDEBufferedSocket *mSocket;
bool mClosing;
};