diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 12:52:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 12:52:33 -0600 |
| commit | d8e2dc24f7272fbdb429a048992de867c4e82d72 (patch) | |
| tree | 41b9f037d9eed02c2167d77047ec4ae585446282 | |
| parent | 96e30b1181f5c0679f704b33fd230bb088db2147 (diff) | |
| download | konversation-d8e2dc24.tar.gz konversation-d8e2dc24.zip | |
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
| -rw-r--r-- | konversation/src/server.cpp | 2 | ||||
| -rw-r--r-- | konversation/src/server.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp index 8fcdc53..02e5955 100644 --- a/konversation/src/server.cpp +++ b/konversation/src/server.cpp @@ -390,7 +390,7 @@ void Server::connectToIRCServer() // connect() will do a async lookup too if(!getConnectionSettings().server().SSLEnabled()) { - m_socket = new KNetwork::KBufferedSocket(TQString(), TQString(), 0L, "serverSocket"); + m_socket = new KNetwork::TDEBufferedSocket(TQString(), TQString(), 0L, "serverSocket"); connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry&)), TQT_SLOT (ircServerConnectionSuccess())); } else diff --git a/konversation/src/server.h b/konversation/src/server.h index cefb41d..f2aa143 100644 --- a/konversation/src/server.h +++ b/konversation/src/server.h @@ -481,7 +481,7 @@ void resetNickSelection(); void processIncomingData(); /// Sends the TQString to the socket. No longer has any internal concept of queueing void toServer(TQString&, IRCQueue *); - /// Because KBufferedSocket has no closed(int) signal we use this slot to call broken(0) + /// Because TDEBufferedSocket has no closed(int) signal we use this slot to call broken(0) void closed(); void broken(int state); /** This is connected to the SSLSocket failed. |