Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

1 files changed, 8 insertions, 8 deletions

diff --git a/tdecore/network/tdesocketbuffer_p.h b/tdecore/network/tdesocketbuffer_p.h
index b2c5dc6b2..2f8e4fa75 100644
--- a/tdecore/network/tdesocketbuffer_p.h
+++ b/tdecore/network/tdesocketbuffer_p.h
@@ -28,7 +28,7 @@
 #include <tqmutex.h>
 #include <tqcstring.h>
 #include <tqvaluelist.h>
-#include "kiobuffer.h"
+#include "tdeiobuffer.h"
 
 namespace KNetwork {
 
@@ -38,14 +38,14 @@ class KActiveSocketBase;
 
 /**
  * @internal
- * @class KSocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h
+ * @class TDESocketBuffer tdesocketbuffer_p.h tdesocketbuffer_p.h
  * @brief generic socket buffering code
  *
- * This class implements generic buffering used by @ref KBufferedSocket.
+ * This class implements generic buffering used by @ref TDEBufferedSocket.
  *
  * @author Thiago Macieira <[email protected]>
  */
-class KSocketBuffer: public KIOBufferBase
+class TDESocketBuffer: public TDEIOBufferBase
 {
 public:
   /**
@@ -53,22 +53,22 @@ public:
    *
    * @param size	the maximum size of the buffer
    */
-  KSocketBuffer(TQ_LONG size = -1);
+  TDESocketBuffer(TQ_LONG size = -1);
 
   /**
    * Copy constructor.
    */
-  KSocketBuffer(const KSocketBuffer& other);
+  TDESocketBuffer(const TDESocketBuffer& other);
 
   /**
    * Virtual destructor. Frees the buffer and discards its contents.
    */
-  virtual ~KSocketBuffer();
+  virtual ~TDESocketBuffer();
 
   /**
    * Assignment operator.
    */
-  KSocketBuffer& operator=(const KSocketBuffer& other);
+  TDESocketBuffer& operator=(const TDESocketBuffer& other);
 
   /**
    * Returns true if a line can be read from the buffer.