reworder KviError stuff

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5266 17fca916-40b9-46aa-a4ea-0a15b648b75c

9 files changed, 119 insertions, 108 deletions

diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index bac2496f3..a882c569f 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -37,7 +37,6 @@
 #include "KviIrcView.h"
 #include "KviIconManager.h"
 #include "KviLocale.h"
-#include "KviError.h"
 #include "kvi_out.h"
 #include "KviNetUtils.h"
 #include "KviConsoleWindow.h"
@@ -160,20 +159,22 @@ void KviDccChat::startConnection()
 		// PASSIVE CONNECTION
 		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting a passive DCC %s connection","dcc"),m_pDescriptor->szType.toUtf8().data());
 #ifdef COMPILE_SSL_SUPPORT
-		int ret = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
+		KviError::Code eError = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
 #else
-		int ret = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout);
+		KviError::Code eError = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout);
 #endif
-		if(ret != KviError_success)handleMarshalError(ret);
+		if(eError != KviError::Success)
+			handleMarshalError(eError);
 	} else {
 		// ACTIVE CONNECTION
 		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting an active DCC %s connection","dcc"),m_pDescriptor->szType.toUtf8().data());
 #ifdef COMPILE_SSL_SUPPORT
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
+		KviError::Code eError = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
 #else
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
+		KviError::Code eError = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
 #endif
-		if(ret != KviError_success)handleMarshalError(ret);
+		if(eError != KviError::Success)
+			handleMarshalError(eError);
 	}
 }
 
@@ -392,7 +393,8 @@ void KviDccChat::ownAction(const QString &text)
 
 		QByteArray szData = encodeText(szTmpBuffer);
 		const char * d = szData.data();
-		if(!d)return;
+		if(!d)
+			return;
 		KviCString buf(KviCString::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
 		m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 		output(KVI_OUT_ACTION,"%Q %Q",&(m_pDescriptor->szLocalNick),&szTmpBuffer);
@@ -409,12 +411,12 @@ bool KviDccChat::event(QEvent *e)
 		{
 			case KVI_DCC_THREAD_EVENT_ERROR:
 			{
-				int * err = ((KviThreadDataEvent<int> *)e)->getData();
-				QString szErr = KviError::getDescription(*err);
+				KviError::Code * pError = ((KviThreadDataEvent<KviError::Code> *)e)->getData();
+				QString szErr = KviError::getDescription(*pError);
 				if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatError,this,szErr,m_pDescriptor->idString()))
 					output(KVI_OUT_DCCERROR,__tr2qs_ctx("ERROR: %Q","dcc"),&szErr);
 				KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatDisconnected,this,m_pDescriptor->idString());
-				delete err;
+				delete pError;
 				return true;
 			}
 			break;
@@ -528,9 +530,9 @@ QSize KviDccChat::sizeHint() const
 	return ret;
 }
 
-void KviDccChat::handleMarshalError(int err)
+void KviDccChat::handleMarshalError(KviError::Code eError)
 {
-	QString szErr = KviError::getDescription(err);
+	QString szErr = KviError::getDescription(eError);
 	if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatError,this,szErr,m_pDescriptor->idString()))
 		output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC %Q failed: %Q","dcc"),&(m_pDescriptor->szType),&szErr);
 }
@@ -666,7 +668,7 @@ void KviDccChatThread::run()
 								if(iE != 0)
 								{
 									raiseSSLError();
-									postErrorEvent(KviError_SSLError);
+									postErrorEvent(KviError::SSLError);
 									goto out_of_the_loop;
 								}
 							}
@@ -674,13 +676,13 @@ void KviDccChatThread::run()
 							case KviSSL::SSLError:
 							{
 								raiseSSLError();
-								postErrorEvent(KviError_SSLError);
+								postErrorEvent(KviError::SSLError);
 								goto out_of_the_loop;
 							}
 							break;
 							default:
 								// Raise unknown SSL ERROR
-								postErrorEvent(KviError_SSLError);
+								postErrorEvent(KviError::SSLError);
 								goto out_of_the_loop;
 							break;
 						}
@@ -833,7 +835,7 @@ bool KviDccChatThread::tryFlushOutBuffers()
 						if(sentLen == 0)
 						{
 							raiseSSLError();
-							postErrorEvent(KviError_remoteEndClosedConnection);
+							postErrorEvent(KviError::RemoteEndClosedConnection);
 							bRet = false;
 							goto out_of_the_loop;
 						} else {
@@ -841,7 +843,7 @@ bool KviDccChatThread::tryFlushOutBuffers()
 							if(iSSLErr != 0)
 							{
 								raiseSSLError();
-								postErrorEvent(KviError_SSLError);
+								postErrorEvent(KviError::SSLError);
 								bRet = false;
 								goto out_of_the_loop;
 							} else {
@@ -851,12 +853,12 @@ bool KviDccChatThread::tryFlushOutBuffers()
 					break;
 					case KviSSL::SSLError:
 						raiseSSLError();
-						postErrorEvent(KviError_SSLError);
+						postErrorEvent(KviError::SSLError);
 						bRet = false;
 						goto out_of_the_loop;
 					break;
 					default:
-						postErrorEvent(KviError_SSLError);
+						postErrorEvent(KviError::SSLError);
 						bRet = false;
 						goto out_of_the_loop;
 					break;
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index 09834d89a..dddf0a6ba 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -33,6 +33,7 @@
 #include "KviThemedLabel.h"
 #include "KviCString.h"
 #include "KviWindow.h"
+#include "KviError.h"
 
 #ifdef COMPILE_SSL_SUPPORT
 	class KviSSL;
@@ -94,7 +95,7 @@ protected:
 	void startConnection();
 	virtual KviDccThread * getSlaveThread() { return m_pSlaveThread; };
 protected slots:
-	void handleMarshalError(int err);
+	void handleMarshalError(KviError::Code eError);
 	void connected();
 	void sslError(const char * msg);
 	void connectionInProgress();
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index b74b34008..b2bbda32f 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -26,7 +26,6 @@
 
 #include "kvi_settings.h"
 #include "KviNetUtils.h"
-#include "KviError.h"
 #include "KviOptions.h"
 #include "KviLocale.h"
 #include "KviMemory.h"
@@ -105,9 +104,10 @@ void KviDccMarshal::reset()
 	m_bIPv6 = false;
 }
 
-int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTimeout,bool bUseSSL)
+KviError::Code KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTimeout,bool bUseSSL)
 {
-	if(m_fd != KVI_INVALID_SOCKET)return KviError_anotherConnectionInProgress;
+	if(m_fd != KVI_INVALID_SOCKET)
+		return KviError::AnotherConnectionInProgress;
 
 	m_szIp = ip;
 	m_szPort = port;
@@ -125,11 +125,12 @@ int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTime
 #ifdef COMPILE_SSL_SUPPORT
 	m_bUseSSL = bUseSSL;
 #else
-	if(bUseSSL)return KviError_noSSLSupport;
+	if(bUseSSL)
+		return KviError::NoSSLSupport;
 #endif
 	QTimer::singleShot(100, this, SLOT(doListen()));
 
-	return KviError_success;
+	return KviError::Success;
 }
 
 void KviDccMarshal::doListen()
@@ -140,11 +141,11 @@ void KviDccMarshal::doListen()
 #ifdef COMPILE_IPV6_SUPPORT
 		if(!KviNetUtils::isValidStringIPv6(m_szIp))
 		{
-			emit error(KviError_invalidIpAddress);
+			emit error(KviError::InvalidIpAddress);
 			return;
 		} else m_bIPv6 = true;
 #else
-		emit error(KviError_invalidIpAddress);
+		emit error(KviError::InvalidIpAddress);
 		return;
 #endif
 	}
@@ -153,14 +154,14 @@ void KviDccMarshal::doListen()
 	m_uPort = m_szPort.toUInt(&bOk);
 	if(!bOk)
 	{
-		emit error(KviError_invalidPortNumber);
+		emit error(KviError::InvalidPortNumber);
 		return;
 	}
 
 #ifndef COMPILE_IPV6_SUPPORT
 	if(m_bIPv6)
 	{
-		emit error(KviError_noIPv6Support);
+		emit error(KviError::NoIPv6Support);
 		return;
 	}
 #endif
@@ -175,7 +176,7 @@ void KviDccMarshal::doListen()
 
 	if(m_fd == KVI_INVALID_SOCKET)
 	{
-		emit error(KviError_socketCreationFailed);
+		emit error(KviError::SocketCreationFailed);
 		return;
 	}
 
@@ -190,14 +191,14 @@ void KviDccMarshal::doListen()
 		if(!sa.socketAddress())
 		{
 			reset();
-			emit error(KviError_bindFailed);
+			emit error(KviError::BindFailed);
 			return;
 		}
 
 		if(!kvi_socket_bind(m_fd,sa.socketAddress(),sa.addressLength()))
 		{
 			reset();
-			emit error(KviError_bindFailed);
+			emit error(KviError::BindFailed);
 			return;
 		}
 
@@ -214,7 +215,7 @@ void KviDccMarshal::doListen()
 			if(!sa.socketAddress())
 			{
 				reset();
-				emit error(KviError_bindFailed);
+				emit error(KviError::BindFailed);
 				return;
 			}
 
@@ -225,7 +226,7 @@ void KviDccMarshal::doListen()
 				if(m_uPort == 65535)
 				{
 					reset();
-					emit error(KviError_bindFailed);
+					emit error(KviError::BindFailed);
 					return;
 				}
 				m_uPort++;
@@ -236,7 +237,7 @@ void KviDccMarshal::doListen()
 		if(!bBindSuccess)
 		{
 			reset();
-			emit error(KviError_bindFailed);
+			emit error(KviError::BindFailed);
 			return;
 		}
 
@@ -245,7 +246,7 @@ void KviDccMarshal::doListen()
 	if(!kvi_socket_listen(m_fd,1))
 	{
 		reset();
-		emit error(KviError_listenFailed);
+		emit error(KviError::ListenFailed);
 		return;
 	}
 
@@ -299,9 +300,10 @@ void KviDccMarshal::doListen()
 	emit inProgress();
 }
 
-int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout,bool bUseSSL)
+KviError::Code KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout,bool bUseSSL)
 {
-	if(m_fd != KVI_INVALID_SOCKET)return KviError_anotherConnectionInProgress;
+	if(m_fd != KVI_INVALID_SOCKET)
+		return KviError::AnotherConnectionInProgress;
 
 	m_bUseTimeout = bUseTimeout;
 	m_szIp = ip;
@@ -311,11 +313,12 @@ int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout
 #ifdef COMPILE_SSL_SUPPORT
 	m_bUseSSL = bUseSSL;
 #else
-	if(bUseSSL)return KviError_noSSLSupport;
+	if(bUseSSL)
+		return KviError::NoSSLSupport;
 #endif
 
 	QTimer::singleShot(100, this, SLOT(doConnect()));
-	return KviError_success;
+	return KviError::Success;
 }
 
 void KviDccMarshal::doConnect()
@@ -331,11 +334,11 @@ void KviDccMarshal::doConnect()
 #ifdef COMPILE_IPV6_SUPPORT
 		if(!KviNetUtils::isValidStringIPv6(m_szIp))
 		{
-			emit error(KviError_invalidIpAddress);
+			emit error(KviError::InvalidIpAddress);
 			return;
 		} else m_bIPv6 = true;
 #else
-		emit error(KviError_invalidIpAddress);
+		emit error(KviError::InvalidIpAddress);
 		return;
 #endif
 	}
@@ -344,7 +347,7 @@ void KviDccMarshal::doConnect()
 	m_uPort = m_szPort.toUInt(&bOk);
 	if(!bOk)
 	{
-		emit error(KviError_invalidPortNumber);
+		emit error(KviError::InvalidPortNumber);
 		return;
 	}
 
@@ -359,7 +362,7 @@ void KviDccMarshal::doConnect()
 #endif
 	if(m_fd == KVI_INVALID_SOCKET)
 	{
-		emit error(KviError_socketCreationFailed);
+		emit error(KviError::SocketCreationFailed);
 		return;
 	}
 
@@ -367,7 +370,7 @@ void KviDccMarshal::doConnect()
 	if(!kvi_socket_setNonBlocking(m_fd))
 	{
 		reset();
-		emit error(KviError_asyncSocketFailed);
+		emit error(KviError::AsyncSocketFailed);
 		return;
 	}
 
@@ -383,7 +386,7 @@ void KviDccMarshal::doConnect()
 	if(!sa.socketAddress())
 	{
 		reset();
-		emit error(KviError_socketCreationFailed);
+		emit error(KviError::SocketCreationFailed);
 		return;
 	}
 
@@ -406,7 +409,7 @@ void KviDccMarshal::doConnect()
 			reset();
 			// And declare problems :)
 			if(sockError)emit error(KviError::translateSystemError(sockError));
-			else emit error(KviError_unknownError); //Error 0 ?
+			else emit error(KviError::UnknownError); //Error 0 ?
 			return;
 		}
 	}
@@ -475,7 +478,7 @@ void KviDccMarshal::snActivated(int)
 		{
 			//failed
 			if(sockError > 0)sockError = KviError::translateSystemError(sockError);
-			else sockError = KviError_unknownError; //Error 0 ?
+			else sockError = KviError::UnknownError; //Error 0 ?
 			reset();
 			emit error(sockError);
 			return;
@@ -531,7 +534,7 @@ void KviDccMarshal::snActivated(int)
 			if(!kvi_socket_setNonBlocking(m_fd))
 			{
 				reset();
-				emit error(KviError_asyncSocketFailed);
+				emit error(KviError::AsyncSocketFailed);
 				return;
 			}
 
@@ -553,7 +556,7 @@ void KviDccMarshal::snActivated(int)
 			doSSLHandshake(0);
 		} else {
 			reset();
-			emit error(KviError_SSLError);
+			emit error(KviError::SSLError);
 		}
 		return;
 	}
@@ -576,7 +579,7 @@ void KviDccMarshal::doSSLHandshake(int)
 	{
 		qDebug("Ops... I've lost the SSL class ?");
 		reset();
-		emit error(KviError_internalError);
+		emit error(KviError::InternalError);
 		return; // ops ?
 	}
 
@@ -602,7 +605,7 @@ void KviDccMarshal::doSSLHandshake(int)
 		break;
 		case KviSSL::RemoteEndClosedConnection:
 			reset();
-			emit error(KviError_remoteEndClosedConnection);
+			emit error(KviError::RemoteEndClosedConnection);
 		break;
 		case KviSSL::SyscallError:
 		{
@@ -618,7 +621,7 @@ void KviDccMarshal::doSSLHandshake(int)
 			} else {
 				// Declare problems :)
 				reset();
-				emit error(err ? KviError::translateSystemError(err) : KviError_unknownError);
+				emit error(err ? KviError::translateSystemError(err) : KviError::UnknownError);
 			}
 		}
 		break;
@@ -627,7 +630,7 @@ void KviDccMarshal::doSSLHandshake(int)
 			KviCString buffer;
 			while(m_pSSL->getLastErrorString(buffer))emit sslError(buffer.ptr());
 			reset();
-			emit error(KviError_SSLError);
+			emit error(KviError::SSLError);
 		}
 		break;
 	}
@@ -645,7 +648,7 @@ void KviDccMarshal::abort()
 void KviDccMarshal::connectionTimedOut()
 {
 	reset();
-	emit error(KviError_connectionTimedOut);
+	emit error(KviError::ConnectionTimedOut);
 }
 
 
diff --git a/src/modules/dcc/marshal.h b/src/modules/dcc/marshal.h
index cf0fd11af..aec02107e 100644
--- a/src/modules/dcc/marshal.h
+++ b/src/modules/dcc/marshal.h
@@ -25,6 +25,7 @@
 //=============================================================================
 
 #include "KviCString.h"
+#include "KviError.h"
 #include "kvi_sockettype.h"
 #include "kvi_inttypes.h"
 
@@ -84,8 +85,8 @@ public:
 	const QString & localPort() const { return m_bOutgoing ? m_szSecondaryPort : m_szPort; };
 	const QString & remoteIp() const { return m_bOutgoing ? m_szIp : m_szSecondaryIp; };
 	const QString & remotePort() const { return m_bOutgoing ? m_szPort : m_szSecondaryPort; };
-	int dccListen(const QString &ip,const QString &port,bool bUseTimeout,bool bUseSSL = false);
-	int dccConnect(const char * ip,const char * port,bool bUseTimeout,bool bUseSSL = false);
+	KviError::Code dccListen(const QString &ip,const QString &port,bool bUseTimeout,bool bUseSSL = false);
+	KviError::Code dccConnect(const char * ip,const char * port,bool bUseTimeout,bool bUseSSL = false);
 	kvi_socket_t releaseSocket();
 #ifdef COMPILE_SSL_SUPPORT
 	KviSSL * releaseSSL();
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 6d9ccbbef..b4c1f0cde 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -130,7 +130,7 @@ bool KviDccRecvThread::sendAck(int filePos)
 
 	if(iRet != 4)
 	{
-		postErrorEvent(KviError_acknowledgeError);
+		postErrorEvent(KviError::AcknowledgeError);
 		return false;
 	}
 	return true;
@@ -206,13 +206,13 @@ void KviDccRecvThread::run()
 	{
 		if(!m_pFile->open(QIODevice::WriteOnly | QIODevice::Append))
 		{
-			postErrorEvent(KviError_cantOpenFileForAppending);
+			postErrorEvent(KviError::CantOpenFileForAppending);
 			goto exit_dcc;
 		} // else pFile is already at end
 	} else {
 		if(!m_pFile->open(QIODevice::WriteOnly))
 		{
-			postErrorEvent(KviError_cantOpenFileForWriting);
+			postErrorEvent(KviError::CantOpenFileForWriting);
 			goto exit_dcc;
 		}
 	}
@@ -283,14 +283,14 @@ void KviDccRecvThread::run()
 							if(readLen > 0)
 							{
 								if(m_pFile->write(buffer,readLen) != readLen)
-									postErrorEvent(KviError_fileIOError);
+									postErrorEvent(KviError::FileIOError);
 							}
 							break;
 
 						} else {
 							if(m_pFile->write(buffer,readLen) != readLen)
 							{
-								postErrorEvent(KviError_fileIOError);
+								postErrorEvent(KviError::FileIOError);
 								break;
 							}
 						}
@@ -358,7 +358,7 @@ void KviDccRecvThread::run()
 									if(iE != 0)
 									{
 										raiseSSLError();
-										postErrorEvent(KviError_SSLError);
+										postErrorEvent(KviError::SSLError);
 										goto exit_dcc;
 									}
 								}
@@ -366,13 +366,13 @@ void KviDccRecvThread::run()
 								case KviSSL::SSLError:
 								{
 									raiseSSLError();
-									postErrorEvent(KviError_SSLError);
+									postErrorEvent(KviError::SSLError);
 									goto exit_dcc;
 								}
 								break;
 								default:
 									// Raise unknown SSL ERROR
-									postErrorEvent(KviError_SSLError);
+									postErrorEvent(KviError::SSLError);
 									goto exit_dcc;
 								break;
 							}
@@ -568,13 +568,13 @@ void KviDccSendThread::run()
 
 	if(!pFile->open(QIODevice::ReadOnly))
 	{
-		postErrorEvent(KviError_cantOpenFileForReading);
+		postErrorEvent(KviError::CantOpenFileForReading);
 		goto exit_dcc;
 	}
 
 	if(pFile->size() < 1)
 	{
-		postErrorEvent(KviError_cantSendAZeroSizeFile);
+		postErrorEvent(KviError::CantSendAZeroSizeFile);
 		goto exit_dcc;
 	}
 
@@ -589,7 +589,7 @@ void KviDccSendThread::run()
 		// seek
 		if(!(pFile->seek(m_pOpt->uStartPosition)))
 		{
-			postErrorEvent(KviError_fileIOError);
+			postErrorEvent(KviError::FileIOError);
 			goto exit_dcc;
 		}
 	}
@@ -645,7 +645,7 @@ void KviDccSendThread::run()
 							if(iNewAck > pFile->pos())
 							{
 								// the peer is drunk or is trying to fool us
-								postErrorEvent(KviError_acknowledgeError);
+								postErrorEvent(KviError::AcknowledgeError);
 								break;
 							}
 							if(iNewAck < uLastAck)
@@ -656,7 +656,7 @@ void KviDccSendThread::run()
 									iAckHackRounds++;
 								} else {
 									// the peer is drunk or is trying to fool us
-									postErrorEvent(KviError_acknowledgeError);
+									postErrorEvent(KviError::AcknowledgeError);
 									break;
 								}
 							}
@@ -690,7 +690,7 @@ void KviDccSendThread::run()
 									if(iE != 0)
 									{
 										raiseSSLError();
-										postErrorEvent(KviError_SSLError);
+										postErrorEvent(KviError::SSLError);
 										goto exit_dcc;
 									}
 								}
@@ -698,13 +698,13 @@ void KviDccSendThread::run()
 								case KviSSL::SSLError:
 								{
 									raiseSSLError();
-									postErrorEvent(KviError_SSLError);
+									postErrorEvent(KviError::SSLError);
 									goto exit_dcc;
 								}
 								break;
 								default:
 									// Raise unknown SSL ERROR
-									postErrorEvent(KviError_SSLError);
+									postErrorEvent(KviError::SSLError);
 									goto exit_dcc;
 								break;
 							}
@@ -773,7 +773,7 @@ void KviDccSendThread::run()
 												if(iE != 0)
 												{
 													raiseSSLError();
-													postErrorEvent(KviError_SSLError);
+													postErrorEvent(KviError::SSLError);
 													goto exit_dcc;
 												}
 											}
@@ -781,13 +781,13 @@ void KviDccSendThread::run()
 											case KviSSL::SSLError:
 											{
 												raiseSSLError();
-												postErrorEvent(KviError_SSLError);
+												postErrorEvent(KviError::SSLError);
 												goto exit_dcc;
 											}
 											break;
 											default:
 												// Raise unknown SSL ERROR
-												postErrorEvent(KviError_SSLError);
+												postErrorEvent(KviError::SSLError);
 												goto exit_dcc;
 											break;
 										}
@@ -832,7 +832,7 @@ void KviDccSendThread::run()
 							int readed = pFile->read(buffer,toRead);
 							if(readed < toRead)
 							{
-								postErrorEvent(KviError_fileIOError);
+								postErrorEvent(KviError::FileIOError);
 								break;
 							}
 							// send it out
@@ -867,14 +867,14 @@ void KviDccSendThread::run()
 												if(written == 0)
 												{
 													raiseSSLError();
-													postErrorEvent(KviError_remoteEndClosedConnection);
+													postErrorEvent(KviError::RemoteEndClosedConnection);
 													goto exit_dcc;
 												} else {
 													int iSSLErr = m_pSSL->getLastError(true);
 													if(iSSLErr != 0)
 													{
 														raiseSSLError();
-														postErrorEvent(KviError_SSLError);
+														postErrorEvent(KviError::SSLError);
 														goto exit_dcc;
 													} else {
 														goto handle_system_error;
@@ -883,11 +883,11 @@ void KviDccSendThread::run()
 											break;
 											case KviSSL::SSLError:
 												raiseSSLError();
-												postErrorEvent(KviError_SSLError);
+												postErrorEvent(KviError::SSLError);
 												goto exit_dcc;
 											break;
 											default:
-												postErrorEvent(KviError_SSLError);
+												postErrorEvent(KviError::SSLError);
 												goto exit_dcc;
 											break;
 										}
@@ -1144,18 +1144,20 @@ void KviDccFileTransfer::listenOrConnect()
 	if(!(m_pDescriptor->bActive))
 	{
 #ifdef COMPILE_SSL_SUPPORT
-		int ret = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
+		KviError::Code eError = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
 #else
-		int ret = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout);
+		KviError::Code eError = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout);
 #endif
-		if(ret != KviError_success)handleMarshalError(ret);
+		if(eError != KviError::Success)
+			handleMarshalError(eError);
 	} else {
 #ifdef COMPILE_SSL_SUPPORT
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
+		KviError::Code eError = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout,m_pDescriptor->bIsSSL);
 #else
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
+		KviError::Code eError = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
 #endif
-		if(ret != KviError_success)handleMarshalError(ret);
+		if(eError != KviError::Success)
+			handleMarshalError(eError);
 	}
 
 	displayUpdate();
@@ -1168,7 +1170,7 @@ void KviDccFileTransfer::resumeTimedOut()
 		delete m_pResumeTimer;
 		m_pResumeTimer = 0;
 	}
-	handleMarshalError(KviError_connectionTimedOut);
+	handleMarshalError(KviError::ConnectionTimedOut);
 }
 
 KviWindow * KviDccFileTransfer::dccMarshalOutputWindow()
@@ -1869,9 +1871,9 @@ bool KviDccFileTransfer::event(QEvent *e)
 		{
 			case KVI_DCC_THREAD_EVENT_ERROR:
 			{
-				int * err = ((KviThreadDataEvent<int> *)e)->getData();
-				QString szErrorString = KviError::getDescription(*err);
-				delete err;
+				KviError::Code * pError = ((KviThreadDataEvent<KviError::Code> *)e)->getData();
+				QString szErrorString = KviError::getDescription(*pError);
+				delete pError;
 				if(m_pDescriptor->bRecvFile)
 					g_pApp->fileDownloadTerminated(false,m_pDescriptor->szFileName.toUtf8().data(),m_pDescriptor->szLocalFileName.toUtf8().data(),m_pDescriptor->szNick.toUtf8().data(),szErrorString.toUtf8().data());
 
@@ -1950,9 +1952,9 @@ bool KviDccFileTransfer::event(QEvent *e)
 	return KviFileTransfer::event(e);
 }
 
-void KviDccFileTransfer::handleMarshalError(int err)
+void KviDccFileTransfer::handleMarshalError(KviError::Code eError)
 {
-	QString szErr = KviError::getDescription(err);
+	QString szErr = KviError::getDescription(eError);
 	m_eGeneralStatus = Failure;
 	m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc");
 	m_szStatusString += szErr;
@@ -2057,7 +2059,7 @@ bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,co
 	int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),
 					m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
 
-	if(ret != KviError_success)handleMarshalError(ret);
+	if(ret != KviError::Success)handleMarshalError(ret);
 	else {
 		m_szStatusString = __tr2qs_ctx("Contacting host %1 on port %2","dcc").arg(m_pDescriptor->szIp, m_pDescriptor->szPort);
 		outputAndLog(m_szStatusString);
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 6fd393a39..b4f5eb467 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -241,7 +241,7 @@ protected slots:
 	void connectionInProgress();
 	void sslError(const char * msg);
 	void startingSSLHandshake();
-	void handleMarshalError(int err);
+	void handleMarshalError(KviError::Code);
 	void connected();
 	void bandwidthDialogDestroyed();
 	void configureBandwidth();
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp
index 3d7f38983..9930866df 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/thread.cpp
@@ -73,7 +73,7 @@ bool KviDccThread::handleInvalidSocketRead(int readLen)
 	if(readLen == 0)
 	{
 		// connection closed
-		postErrorEvent(KviError_remoteEndClosedConnection);
+		postErrorEvent(KviError::RemoteEndClosedConnection);
 		return false;
 	} else {
 		// error ?
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index a85d9b85b..d78cdfa0a 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -33,7 +33,6 @@
 #include "KviIrcView.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
-#include "KviError.h"
 #include "KviNetUtils.h"
 #include "KviOptions.h"
 #include "KviConsoleWindow.h"
@@ -738,13 +737,15 @@ void KviDccVoice::startConnection()
 	{
 		// PASSIVE CONNECTION
 		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting a passive DCC VOICE connection","dcc"));
-		int ret = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout);
-		if(ret != KviError_success)handleMarshalError(ret);
+		KviError::Code eError = m_pMarshal->dccListen(m_pDescriptor->szListenIp,m_pDescriptor->szListenPort,m_pDescriptor->bDoTimeout);
+		if(eError != KviError::Success)
+			handleMarshalError(eError);
 	} else {
 		// ACTIVE CONNECTION
 		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Attempting an active DCC VOICE connection","dcc"));
-		int ret = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
-		if(ret != KviError_success)handleMarshalError(ret);
+		KviError::Code eError = m_pMarshal->dccConnect(m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),m_pDescriptor->bDoTimeout);
+		if(eError != KviError::Success)
+			handleMarshalError(eError);
 	}
 }
 
@@ -813,10 +814,10 @@ bool KviDccVoice::event(QEvent *e)
 		{
 			case KVI_DCC_THREAD_EVENT_ERROR:
 			{
-				int * err = ((KviThreadDataEvent<int> *)e)->getData();
-				QString ssss = KviError::getDescription(*err);
+				KviError::Code * pError = ((KviThreadDataEvent<KviError::Code> *)e)->getData();
+				QString ssss = KviError::getDescription(*pError);
 				output(KVI_OUT_DCCERROR,__tr2qs_ctx("ERROR: %Q","dcc"),&(ssss));
-				delete err;
+				delete pError;
 				m_pUpdateTimer->stop();
 				updateInfo();
 				m_pTalkButton->setEnabled(false);
@@ -895,9 +896,9 @@ QSize KviDccVoice::sizeHint() const
 	return ret;
 }
 
-void KviDccVoice::handleMarshalError(int err)
+void KviDccVoice::handleMarshalError(KviError::Code eError)
 {
-	QString ssss = KviError::getDescription(err);
+	QString ssss = KviError::getDescription(eError);
 	output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC Failed: %Q","dcc"),&ssss);
 	m_pTalkButton->setEnabled(false);
 	m_pTalkButton->setChecked(false);
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index 001a2a718..5f6ec6bff 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -33,6 +33,7 @@
 #include "KviDataBuffer.h"
 #include "kvi_sockettype.h"
 #include "KviTalHBox.h"
+#include "KviError.h"
 
 #include <QLabel>
 #include <QToolButton>
@@ -133,7 +134,7 @@ protected:
 	void startConnection();
 	int getMixerVolume(void) const;
 protected slots:
-	void handleMarshalError(int err);
+	void handleMarshalError(KviError::Code eError);
 	void connected();
 	void updateInfo();
 	void startOrStopTalking(bool bStart);