diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 13:17:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 13:17:02 -0600 |
| commit | 4816c4a735e1704c433dbe42155bf3887180d8ea (patch) | |
| tree | 868b82f46bee5214e7b8251e79ce56d4c1453c9a /kopete/protocols/oscar/liboscar/oscarbytestream.h | |
| parent | f21aaec952493cb5688c73de6e82a569ddbd7fb2 (diff) | |
| download | tdenetwork-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/oscarbytestream.h')
| -rw-r--r-- | kopete/protocols/oscar/liboscar/oscarbytestream.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; }; |