From 445f21f4e51534ebd9897190f1cff9f55b22ff9a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 30 Jan 2012 12:22:48 -0600
Subject: Rename ksocket and kcache

---
 knotes/knotesnetrecv.cpp   | 2 +-
 knotes/knotesnetsend.h     | 2 +-
 mimelib/doc/protocol.html  | 2 +-
 mimelib/mimelib/protocol.h | 2 +-
 mimelib/protocol.cpp       | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 9120336a..2c683dd6 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -37,7 +37,7 @@
 
 #include <kdebug.h>
 #include <kbufferedsocket.h>
-#include <ksocketaddress.h>
+#include <tdesocketaddress.h>
 #include <klocale.h>
 #include <kglobal.h>
 
diff --git a/knotes/knotesnetsend.h b/knotes/knotesnetsend.h
index 012b5eb0..128013e7 100644
--- a/knotes/knotesnetsend.h
+++ b/knotes/knotesnetsend.h
@@ -36,7 +36,7 @@
 #include <tqcstring.h>
 
 #include <kbufferedsocket.h>
-#include <ksocketaddress.h>
+#include <tdesocketaddress.h>
 
 using namespace KNetwork;
 
diff --git a/mimelib/doc/protocol.html b/mimelib/doc/protocol.html
index 28bb81db..75830673 100644
--- a/mimelib/doc/protocol.html
+++ b/mimelib/doc/protocol.html
@@ -64,7 +64,7 @@ protected:
     enum {
         kWSAStartup=1,  // Win32
         kgethostbyname,
-        ksocket,
+        tdesocket,
         ksetsockopt,
         kconnect,
         ksend,
diff --git a/mimelib/mimelib/protocol.h b/mimelib/mimelib/protocol.h
index 32186a82..76802231 100644
--- a/mimelib/mimelib/protocol.h
+++ b/mimelib/mimelib/protocol.h
@@ -216,7 +216,7 @@ protected:
     enum {
         kWSAStartup=1,  // Win32
         kgethostbyname,
-        ksocket,
+        tdesocket,
         ksetsockopt,
         kconnect,
         ksend,
diff --git a/mimelib/protocol.cpp b/mimelib/protocol.cpp
index b0685aa7..695b6138 100644
--- a/mimelib/protocol.cpp
+++ b/mimelib/protocol.cpp
@@ -127,7 +127,7 @@ int DwProtocolClient::Open(const char* aServer, DwUint16 aPort)
     if (mSocket == -1) {
         // error!
         int err = errno;
-        HandleError(err, ksocket);
+        HandleError(err, tdesocket);
         return -1;
     }
 
@@ -358,7 +358,7 @@ void DwProtocolClient::HandleError(int aErrorCode, int aSystemCall)
     mErrorCode = aErrorCode;
     mErrorStr = get_error_text(mErrorCode);
     switch (aSystemCall) {
-    case ksocket:
+    case tdesocket:
         switch (mErrorCode) {
         case EMFILE:
         case ENFILE:
-- 
cgit v1.2.3