4 files changed, 14 insertions, 14 deletions
diff --git a/src/utility/encoder/b64Encoder.cpp b/src/utility/encoder/b64Encoder.cpp
index 58ef3200..85c972f9 100644
--- a/src/utility/encoder/b64Encoder.cpp
+++ b/src/utility/encoder/b64Encoder.cpp
@@ -197,8 +197,8 @@ utility::stream::size_type b64Encoder::decode(utility::inputStream& in,
 
 	// Process the data
 	char buffer[16384];
-	int bufferLength = 0;
-	int bufferPos = 0;
+	utility::stream::size_type bufferLength = 0;
+	utility::stream::size_type bufferPos = 0;
 
 	utility::stream::size_type total = 0;
 	utility::stream::size_type inTotal = 0;
diff --git a/src/utility/encoder/qpEncoder.cpp b/src/utility/encoder/qpEncoder.cpp
index ab8db2e4..9e1c1ccd 100644
--- a/src/utility/encoder/qpEncoder.cpp
+++ b/src/utility/encoder/qpEncoder.cpp
@@ -178,8 +178,8 @@ utility::stream::size_type qpEncoder::encode(utility::inputStream& in,
 
 	// Process the data
 	char buffer[16384];
-	int bufferLength = 0;
-	int bufferPos = 0;
+	utility::stream::size_type bufferLength = 0;
+	utility::stream::size_type bufferPos = 0;
 
 	string::size_type curCol = 0;
 
@@ -380,8 +380,8 @@ utility::stream::size_type qpEncoder::decode(utility::inputStream& in,
 	const bool rfc2047 = getProperties().getProperty <bool>("rfc2047", false);
 
 	char buffer[16384];
-	int bufferLength = 0;
-	int bufferPos = 0;
+	utility::stream::size_type bufferLength = 0;
+	utility::stream::size_type bufferPos = 0;
 
 	unsigned char outBuffer[16384];
 	int outBufferPos = 0;
diff --git a/src/utility/encoder/uuEncoder.cpp b/src/utility/encoder/uuEncoder.cpp
index 0ddfbac6..4b4d83d8 100644
--- a/src/utility/encoder/uuEncoder.cpp
+++ b/src/utility/encoder/uuEncoder.cpp
@@ -52,15 +52,15 @@ const std::vector <string> uuEncoder::getAvailableProperties() const
 
 
 // This is the character encoding function to make a character printable
-static inline unsigned char UUENCODE(const unsigned char c)
+static inline unsigned char UUENCODE(const unsigned long c)
 {
-	return ((c & 077) + ' ');
+	return static_cast <unsigned char>((c & 077) + ' ');
 }
 
 // Single character decoding
-static inline unsigned char UUDECODE(const unsigned char c)
+static inline unsigned char UUDECODE(const unsigned long c)
 {
-	return ((c - ' ') & 077);
+	return static_cast <unsigned char>((c - ' ') & 077);
 }
 
 
diff --git a/src/utility/progressListener.cpp b/src/utility/progressListener.cpp
index 4bce3721..ae5a455c 100644
--- a/src/utility/progressListener.cpp
+++ b/src/utility/progressListener.cpp
@@ -31,7 +31,7 @@ namespace utility {
 // progressListenerSizeAdapter
 
 progressListenerSizeAdapter::progressListenerSizeAdapter
-	(progressListener* list, const int total)
+	(progressListener* list, const long total)
 	: m_wrapped(list), m_total(total)
 {
 }
@@ -43,14 +43,14 @@ bool progressListenerSizeAdapter::cancel() const
 }
 
 
-void progressListenerSizeAdapter::start(const int predictedTotal)
+void progressListenerSizeAdapter::start(const long predictedTotal)
 {
 	if (m_wrapped)
 		m_wrapped->start(predictedTotal);
 }
 
 
-void progressListenerSizeAdapter::progress(const int current, const int currentTotal)
+void progressListenerSizeAdapter::progress(const long current, const long currentTotal)
 {
 	if (m_wrapped)
 	{
@@ -62,7 +62,7 @@ void progressListenerSizeAdapter::progress(const int current, const int currentT
 }
 
 
-void progressListenerSizeAdapter::stop(const int total)
+void progressListenerSizeAdapter::stop(const long total)
 {
 	if (m_wrapped)
 	{