summaryrefslogtreecommitdiffstats
path: root/mimelib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
commitd318087925a540a204c9d3820d5a09fbda58b8b2 (patch)
treeb8dde6aa5d6559b81c6667d8364a4364c27bcba4 /mimelib
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'mimelib')
-rw-r--r--mimelib/doc/protocol.html2
-rw-r--r--mimelib/mimelib/protocol.h2
-rw-r--r--mimelib/protocol.cpp6
3 files changed, 5 insertions, 5 deletions
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;