From d318087925a540a204c9d3820d5a09fbda58b8b2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:21:55 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

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

(limited to 'mimelib')

diff --git a/mimelib/doc/protocol.html b/mimelib/doc/protocol.html
index 75830673d..d34854404 100644
--- a/mimelib/doc/protocol.html
+++ b/mimelib/doc/protocol.html
@@ -71,7 +71,7 @@ protected:
         krecv,
         kclose,         // UNIX
         kclosesocket,   // Win32
-        kselect
+        tdeselect
     };
     DwBool      mIsDllOpen;
     DwBool      mIsOpen;
diff --git a/mimelib/mimelib/protocol.h b/mimelib/mimelib/protocol.h
index 768022310..29c6515a5 100644
--- a/mimelib/mimelib/protocol.h
+++ b/mimelib/mimelib/protocol.h
@@ -223,7 +223,7 @@ protected:
         krecv,
         kclose,         // UNIX
         kclosesocket,   // Win32
-        kselect
+        tdeselect
     };
     // Enumerated values that indicate the system call that detected
     // an error
diff --git a/mimelib/protocol.cpp b/mimelib/protocol.cpp
index 695b61380..4ce5ca1b5 100644
--- a/mimelib/protocol.cpp
+++ b/mimelib/protocol.cpp
@@ -321,7 +321,7 @@ int DwProtocolClient::PReceive(char* aBuf, int aBufSize)
 
     if (numFds == -1) {
         int err = errno;
-        HandleError(err, kselect);
+        HandleError(err, tdeselect);
         numReceived = 0;
     }
 
@@ -345,7 +345,7 @@ int DwProtocolClient::PReceive(char* aBuf, int aBufSize)
     else if (numFds == 0) {
         DBG_PROTO_STMT(cout << "Receive timed out" << endl;)
         int err = ETIMEDOUT;
-        HandleError(err, kselect);
+        HandleError(err, tdeselect);
         numReceived = 0;
     }
 
@@ -447,7 +447,7 @@ void DwProtocolClient::HandleError(int aErrorCode, int aSystemCall)
             break;
         }
         break;
-    case kselect:
+    case tdeselect:
         switch (aErrorCode) {
         case ETIMEDOUT:
             mFailureCode = kFailTimedOut;
-- 
cgit v1.2.1