reworder KviError stuff

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

7 files changed, 227 insertions, 245 deletions

diff --git a/src/kvilib/core/KviError.cpp b/src/kvilib/core/KviError.cpp
index 462e3bed5..e2f45b943 100644
--- a/src/kvilib/core/KviError.cpp
+++ b/src/kvilib/core/KviError.cpp
@@ -145,7 +145,6 @@ const char * g_errorTable[KVI_NUM_ERRORS]=
 	__tr_no_lookup("Missing popup name"),
 	__tr_no_lookup("'item', 'popup', 'label' or 'separator' keyword expected"),
 	__tr_no_lookup("Self modification not allowed"),
-	__tr_no_lookup("UNUSED"),
 	__tr_no_lookup("Feature not available"),
 	__tr_no_lookup("Unexpected characters in array index"),
 	__tr_no_lookup("Unexpected end in expression"),
@@ -172,62 +171,63 @@ const char * g_errorTable[KVI_NUM_ERRORS]=
 
 namespace KviError
 {
-	const char * getUntranslatedDescription(int iErrorCode)
+	const char * getUntranslatedDescription(KviError::Code eError)
 	{
-		if((iErrorCode < KVI_NUM_ERRORS) && (iErrorCode >= 0))
-			return g_errorTable[iErrorCode];
+		if((eError < KVI_NUM_ERRORS) && (eError >= 0))
+			return g_errorTable[eError];
 #ifdef HAVE_STRERROR
-		if(iErrorCode < 0)return strerror(-iErrorCode);
+		if(eError < 0)
+			return strerror(-eError);
 #endif
-		return g_errorTable[KviError_unknownError];
+		return g_errorTable[KviError::UnknownError];
 	}
 
-	QString getDescription(int iErrorCode)
+	QString getDescription(KviError::Code eError)
 	{
-		return __tr2qs_no_xgettext(getUntranslatedDescription(iErrorCode));
+		return __tr2qs_no_xgettext(getUntranslatedDescription(eError));
 	}
 
-	int translateSystemError(int iErrNo)
+	KviError::Code translateSystemError(int iErrNo)
 	{
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		switch(iErrNo)
 		{
-			case EBADF:            return KviError_badFileDescriptor;          break;
+			case EBADF:            return KviError::BadFileDescriptor;          break;
 			case WSAEINVAL:
 			case WSAEFAULT:
-			case EFAULT:           return KviError_outOfAddressSpace;          break;
-			case WSAECONNREFUSED:  return KviError_connectionRefused;          break;
-			case WSAENOTSOCK:      return KviError_kernelNetworkingPanic;      break;
-			case WSAETIMEDOUT:     return KviError_connectionTimedOut;         break;
-			case WSAENETUNREACH:   return KviError_networkUnreachable;         break;
-			case EPIPE:            return KviError_brokenPipe;                 break;
-			case WSAENOTCONN:      return KviError_socketNotConnected;         break;
-			case WSAEACCES:        return KviError_accessDenied;               break;
-			case WSAEADDRINUSE:    return KviError_addressAlreadyInUse;        break;
-			case WSAEADDRNOTAVAIL: return KviError_cantAssignRequestedAddress; break;
-			case WSAEAFNOSUPPORT:  return KviError_unsupportedAddressFamily;   break;
-			case WSAECONNRESET:    return KviError_connectionResetByPeer;      break;
-			case WSAEHOSTUNREACH:  return KviError_hostUnreachable;            break;
+			case EFAULT:           return KviError::OutOfAddressSpace;          break;
+			case WSAECONNREFUSED:  return KviError::ConnectionRefused;          break;
+			case WSAENOTSOCK:      return KviError::KernelNetworkingPanic;      break;
+			case WSAETIMEDOUT:     return KviError::ConnectionTimedOut;         break;
+			case WSAENETUNREACH:   return KviError::NetworkUnreachable;         break;
+			case EPIPE:            return KviError::BrokenPipe;                 break;
+			case WSAENOTCONN:      return KviError::SocketNotConnected;         break;
+			case WSAEACCES:        return KviError::AccessDenied;               break;
+			case WSAEADDRINUSE:    return KviError::AddressAlreadyInUse;        break;
+			case WSAEADDRNOTAVAIL: return KviError::CantAssignRequestedAddress; break;
+			case WSAEAFNOSUPPORT:  return KviError::UnsupportedAddressFamily;   break;
+			case WSAECONNRESET:    return KviError::ConnectionResetByPeer;      break;
+			case WSAEHOSTUNREACH:  return KviError::HostUnreachable;            break;
 
-			//case ENOBUFS:      return KviError_insufficientResources; break;
+			//case ENOBUFS:          return KviError::InsufficientResources;      break;
 			// Unhandled error...pass errno to the strerror function
-			default:              return -iErrNo;                              break;
+			default:              return KviError::UnknownError;                break;
 		}
 #else
 		switch(iErrNo)
 		{
-			case EBADF:        return KviError_badFileDescriptor;     break;
-			case EFAULT:       return KviError_outOfAddressSpace;     break;
-			case ECONNREFUSED: return KviError_connectionRefused;     break;
-			case ENOTSOCK:     return KviError_kernelNetworkingPanic; break;
-			case ETIMEDOUT:    return KviError_connectionTimedOut;    break;
-			case ENETUNREACH:  return KviError_networkUnreachable;    break;
-			case EPIPE:        return KviError_brokenPipe;            break;
-			case ENOTCONN:     return KviError_socketNotConnected;    break;
-			case ENOBUFS:      return KviError_insufficientResources; break;
-			case EHOSTUNREACH: return KviError_hostUnreachable;       break;
+			case EBADF:        return KviError::BadFileDescriptor;     break;
+			case EFAULT:       return KviError::OutOfAddressSpace;     break;
+			case ECONNREFUSED: return KviError::ConnectionRefused;     break;
+			case ENOTSOCK:     return KviError::KernelNetworkingPanic; break;
+			case ETIMEDOUT:    return KviError::ConnectionTimedOut;    break;
+			case ENETUNREACH:  return KviError::NetworkUnreachable;    break;
+			case EPIPE:        return KviError::BrokenPipe;            break;
+			case ENOTCONN:     return KviError::SocketNotConnected;    break;
+			case ENOBUFS:      return KviError::InsufficientResources; break;
+			case EHOSTUNREACH: return KviError::HostUnreachable;       break;
 			// Unhandled error...pass errno to the strerror function
-			default:           return -iErrNo;                        break;
+			default:           return KviError::UnknownError;          break;
 		}
 #endif
 	}
diff --git a/src/kvilib/core/KviError.h b/src/kvilib/core/KviError.h
index f3779cf7b..4a0dd1dfc 100644
--- a/src/kvilib/core/KviError.h
+++ b/src/kvilib/core/KviError.h
@@ -33,156 +33,7 @@
 #include "kvi_settings.h"
 #include "KviQString.h"
 
-#define KviError_success 0
-#define KviError_unknownError 1
-#define KviError_internalError 2
-#define KviError_unknownCommand 3
-#define KviError_missingClosingBrace 4
-#define KviError_unexpectedEndInString 5
-#define KviError_unexpectedEndInDictionaryKey 6
-#define KviError_switchDashWithoutSwitchLetter 7
-#define KviError_unknownFunction 8
-#define KviError_unexpectedEndInParenthesis 9
-#define KviError_unexpectedEndInFunctionParams 10
-#define KviError_missingVariableName 11
-#define KviError_variableOrIdentifierExpected 12
-#define KviError_leftOperandIsNotANumber 13
-#define KviError_multipleOpsNotSupportedForOperator 14
-#define KviError_divisionByZero 15
-#define KviError_moduloByZero 16
-#define KviError_rightOperandIsNotANumber 17
-#define KviError_unterminatedExpression 18
-#define KviError_unterminatedSubexpression 19
-#define KviError_unexpectedCharacter 20
-#define KviError_unknownOperator 21
-
-#define KviError_noHostToResolve 22
-#define KviError_unsupportedAddressFamily 23
-#define KviError_validNameButNoIpAddress 24
-#define KviError_unrecoverableNameserverError 25
-#define KviError_dnsTemporaneousFault 26
-#define KviError_dnsInternalErrorBadFlags 27
-#define KviError_dnsInternalErrorOutOfMemory 28
-#define KviError_dnsInternalErrorServiceNotSupported 29
-#define KviError_dnsNoName 30
-#define KviError_dnsInternalErrorUnsupportedSocketType 31
-#define KviError_dnsQueryFailed 32
-#define KviError_noIPv6Support 33
-#define KviError_hostNotFound 34
-#define KviError_dnsInternalIPCFailure 35
-
-#define KviError_anotherConnectionInProgress 36
-#define KviError_invalidIpAddress 37
-#define KviError_socketCreationFailed 38
-#define KviError_asyncSocketFailed 39
-#define KviError_badFileDescriptor 40
-#define KviError_outOfAddressSpace 41
-#define KviError_connectionRefused 42
-#define KviError_kernelNetworkingPanic 43
-#define KviError_connectionTimedOut 44
-#define KviError_networkUnreachable 45
-#define KviError_brokenPipe 46
-#define KviError_invalidProxyAddress 47
-#define KviError_remoteEndClosedConnection 48
-
-#define KviError_invalidIrcContextId 49
-#define KviError_errorInLoadingModule 50
-#define KviError_noSuchModuleCommand 51
-#define KviError_noSuchModuleFunction 52
-
-#define KviError_leftOperandIsNotADictionaryReference 53
-#define KviError_rightOperandIsNotADictionaryReference 54
-
-#define KviError_missingObjectClassName 55
-#define KviError_noSuchObjectClass 56
-#define KviError_noSuchObject 57
-#define KviError_noSuchObjectFunction 58
-
-#define KviError_invalidLeftOperand 59
-
-#define KviError_notEnoughParameters 60
-#define KviError_integerParameterExpected 61
-#define KviError_invalidParameter 62
-
-#define KviError_noSuchFile 63
-
-#define KviError_openParenthesisExpected 64
-#define KviError_openBraceExpected 65
-
-#define KviError_cantKillABuiltinClass 66
-#define KviError_socksV4LacksIPv6Support 67
-#define KviError_unrecognizedProxyReply 68
-#define KviError_proxyAuthFailed 69
-#define KviError_proxyNoAcceptableAuthMethod 70
-
-#define KviError_proxyReply91RequestFailed 71
-#define KviError_proxyReply92IdentFailed 72
-#define KviError_proxyReply93IdentNotMatching 73
-#define KviError_proxyReply01GeneralSOCKSFailure 74
-#define KviError_proxyReply02ConnectionNotAllowed 75
-#define KviError_proxyReply03NetworkUnreachable 76
-#define KviError_proxyReply04HostUnreachable 77
-#define KviError_proxyReply05ConnectionRefused 78
-#define KviError_proxyReply06TTLExpired 79
-#define KviError_proxyReply07CommandNotSupported 80
-#define KviError_proxyReply08AddressTypeNotSupported 81
-#define KviError_proxyReply09InvalidAddress 82
-
-#define KviError_invalidPortNumber 83
-#define KviError_socketNotConnected 84
-#define KviError_insufficientResources 85
-#define KviError_bindFailed 86
-#define KviError_cantResolveLocalhost 87
-
-#define KviError_unsupportedImageFormat 88
-
-#define KviError_cantOpenFileForAppending 89
-#define KviError_cantOpenFileForWriting 90
-#define KviError_fileIOError 91
-#define KviError_acknowledgeError 92
-#define KviError_cantOpenFileForReading 93
-#define KviError_cantSendAZeroSizeFile 94
-
-#define KviError_missingPopupName 95
-#define KviError_itemPopupOrSeparatorExpected 96
-#define KviError_selfModificationNotAllowed 97
-
-//#define KviError_recursionTooDeep 98
-#define KviError_featureNotAvailable 99
-
-#define KviError_unexpectedCharactersInArrayIndex 100
-#define KviError_unexpectedEndInExpression 101
-#define KviError_unexpectedEndInArrayIndex 102
-
-#define KviError_proxyHttpFailure 103
-#define KviError_caseMatchRegexpDefaultOrBreakExpected 104
-
-
-#define KviError_accessDenied 105
-#define KviError_addressAlreadyInUse 106
-#define KviError_cantAssignRequestedAddress 107
-#define KviError_connectionResetByPeer 108
-#define KviError_hostUnreachable 109
-
-#define KviError_variableExpected 110
-#define KviError_invalidArrayIndex 111
-
-#define KviError_listenFailed 112
-
-#define KviError_noSSLSupport 113
-#define KviError_SSLError 114
-
-#define KviError_slashCharacterExpected 115
-#define KviError_unknownStringManipulationOperator 116
-
-#define KviError_operationAborted 117
-
-#define KviError_unexpectedToken 118
-
-#define KviError_scopeObjectAlreadyDefined 119
-#define KviError_noThisObject 120
-
-#define KVI_NUM_ERRORS 121
+#define KVI_NUM_ERRORS 120
 
 /**
 * \namespace KviError
@@ -191,25 +42,152 @@
 namespace KviError
 {
 	/**
+	* \enum Code
+	* \brief Contains all error codes
+	*/
+	enum Code {
+		Success                               =   0,
+		UnknownError                          =   1,
+		InternalError                         =   2,
+		UnknownCommand                        =   3,
+		MissingClosingBrace                   =   4,
+		UnexpectedEndInString                 =   5,
+		UnexpectedEndInDictionaryKey          =   6,
+		SwitchDashWithoutSwitchLetter         =   7,
+		UnknownFunction                       =   8,
+		UnexpectedEndInParenthesis            =   9,
+		UnexpectedEndInFunctionParams         =  10,
+		MissingVariableName                   =  11,
+		VariableOrIdentifierExpected          =  12,
+		LeftOperandIsNotANumber               =  13,
+		MultipleOpsNotSupportedForOperator    =  14,
+		DivisionByZero                        =  15,
+		ModuloByZero                          =  16,
+		RightOperandIsNotANumber              =  17,
+		UnterminatedExpression                =  18,
+		UnterminatedSubexpression             =  19,
+		UnexpectedCharacter                   =  20,
+		UnknownOperator                       =  21,
+		NoHostToResolve                       =  22,
+		UnsupportedAddressFamily              =  23,
+		ValidNameButNoIpAddress               =  24,
+		UnrecoverableNameserverError          =  25,
+		DNSTemporaneousFault                  =  26,
+		DNSInternalErrorBadFlags              =  27,
+		DNSInternalErrorOutOfMemory           =  28,
+		DNSInternalErrorServiceNotSupported   =  29,
+		DNSNoName                             =  30,
+		DNSInternalErrorUnsupportedSocketType =  31,
+		DNSQueryFailed                        =  32,
+		NoIPv6Support                         =  33,
+		HostNotFound                          =  34,
+		DNSInternalIPCFailure                 =  35,
+		AnotherConnectionInProgress           =  36,
+		InvalidIpAddress                      =  37,
+		SocketCreationFailed                  =  38,
+		AsyncSocketFailed                     =  39,
+		BadFileDescriptor                     =  40,
+		OutOfAddressSpace                     =  41,
+		ConnectionRefused                     =  42,
+		KernelNetworkingPanic                 =  43,
+		ConnectionTimedOut                    =  44,
+		NetworkUnreachable                    =  45,
+		BrokenPipe                            =  46,
+		InvalidProxyAddress                   =  47,
+		RemoteEndClosedConnection             =  48,
+		InvalidIrcContextId                   =  49,
+		ErrorInLoadingModule                  =  50,
+		NoSuchModuleCommand                   =  51,
+		NoSuchModuleFunction                  =  52,
+		LeftOperandIsNotADictionaryReference  =  53,
+		RightOperandIsNotADictionaryReference =  54,
+		MissingObjectClassName                =  55,
+		NoSuchObjectClass                     =  56,
+		NoSuchObject                          =  57,
+		NoSuchObjectFunction                  =  58,
+		InvalidLeftOperand                    =  59,
+		NotEnoughParameters                   =  60,
+		IntegerParameterExpected              =  61,
+		InvalidParameter                      =  62,
+		NoSuchFile                            =  63,
+		OpenParenthesisExpected               =  64,
+		OpenBraceExpected                     =  65,
+		CantKillABuiltinClass                 =  66,
+		SocksV4LacksIPv6Support               =  67,
+		UnrecognizedProxyReply                =  68,
+		ProxyAuthFailed                       =  69,
+		ProxyNoAcceptableAuthMethod           =  70,
+		ProxyReply91RequestFailed             =  71,
+		ProxyReply92IdentFailed               =  72,
+		ProxyReply93IdentNotMatching          =  73,
+		ProxyReply01GeneralSOCKSFailure       =  74,
+		ProxyReply02ConnectionNotAllowed      =  75,
+		ProxyReply03NetworkUnreachable        =  76,
+		ProxyReply04HostUnreachable           =  77,
+		ProxyReply05ConnectionRefused         =  78,
+		ProxyReply06TTLExpired                =  79,
+		ProxyReply07CommandNotSupported       =  80,
+		ProxyReply08AddressTypeNotSupported   =  81,
+		ProxyReply09InvalidAddress            =  82,
+		InvalidPortNumber                     =  83,
+		SocketNotConnected                    =  84,
+		InsufficientResources                 =  85,
+		BindFailed                            =  86,
+		CantResolveLocalhost                  =  87,
+		UnsupportedImageFormat                =  88,
+		CantOpenFileForAppending              =  89,
+		CantOpenFileForWriting                =  90,
+		FileIOError                           =  91,
+		AcknowledgeError                      =  92,
+		CantOpenFileForReading                =  93,
+		CantSendAZeroSizeFile                 =  94,
+		MissingPopupName                      =  95,
+		ItemPopupOrSeparatorExpected          =  96,
+		SelfModificationNotAllowed            =  97,
+		FeatureNotAvailable                   =  98,
+		UnexpectedCharactersInArrayIndex      =  99,
+		UnexpectedEndInExpression             = 100,
+		UnexpectedEndInArrayIndex             = 101,
+		ProxyHttpFailure                      = 102,
+		CaseMatchRegexpDefaultOrBreakExpected = 103,
+		AccessDenied                          = 104,
+		AddressAlreadyInUse                   = 105,
+		CantAssignRequestedAddress            = 106,
+		ConnectionResetByPeer                 = 107,
+		HostUnreachable                       = 108,
+		VariableExpected                      = 109,
+		InvalidArrayIndex                     = 110,
+		ListenFailed                          = 111,
+		NoSSLSupport                          = 112,
+		SSLError                              = 113,
+		SlashCharacterExpected                = 114,
+		UnknownStringManipulationOperator     = 115,
+		OperationAborted                      = 116,
+		UnexpectedToken                       = 117,
+		ScopeObjectAlreadyDefined             = 118,
+		NoThisObject                          = 119
+	};
+
+	/**
 	* \brief Returns the description of the error
-	* \param iErrorCode The code number of the error
+	* \param error The code number of the error
 	* \return QString
 	*/
-	KVILIB_API QString getDescription(int iErrorCode);
+	KVILIB_API QString getDescription(KviError::Code eError);
 
 	/**
 	* \brief Returns an untranslated description of the error
-	* \param iErrorCode The code number of the error
+	* \param error The code number of the error
 	* \return const char *
 	*/
-	KVILIB_API const char * getUntranslatedDescription(int iErrorCode);
+	KVILIB_API const char * getUntranslatedDescription(KviError::Code eError);
 
 	/**
 	* \brief Gets system errors and returns their code number
 	* \param iErrNo The code number of the system error
 	* \return int
 	*/
-	KVILIB_API int translateSystemError(int iErrNo);
+	KVILIB_API KviError::Code translateSystemError(int iErrNo);
 }
 
 #endif //_KVI_ERROR_H_
diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp
index 9c69dfb8f..6d4f48170 100644
--- a/src/kvilib/net/KviDnsResolver.cpp
+++ b/src/kvilib/net/KviDnsResolver.cpp
@@ -58,7 +58,7 @@
 
 KviDnsResolverResult::KviDnsResolverResult()
 {
-	m_iError = KviError_success;
+	m_eError = KviError::Success;
 	m_pHostnameList = new KviPointerList<QString>;
 	m_pHostnameList->setAutoDelete(true);
 	m_pIpAddressList = new KviPointerList<QString>;
@@ -94,47 +94,47 @@ KviDnsResolverThread::~KviDnsResolverThread()
 {
 }
 
-int KviDnsResolverThread::translateDnsError(int iErr)
+KviError::Code KviDnsResolverThread::translateDnsError(int iErr)
 {
 #if defined(COMPILE_IPV6_SUPPORT) || (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW))
 
 	switch(iErr)
 	{
-		case EAI_FAMILY:     return KviError_unsupportedAddressFamily; break;
+		case EAI_FAMILY:     return KviError::UnsupportedAddressFamily; break;
 #if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)) && defined(EAI_ADDRFAMILY) && (EAI_ADDRFAMILY != EAI_FAMILY)
-		case EAI_ADDRFAMILY: return KviError_unsupportedAddressFamily; break;
+		case EAI_ADDRFAMILY: return KviError::UnsupportedAddressFamily; break;
 #endif
 // NOT FreeBSD ARE WE?
 #if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)
 // YARR
-		case EAI_NODATA:     return KviError_validNameButNoIpAddress; break;
+		case EAI_NODATA:     return KviError::ValidNameButNoIpAddress; break;
 #endif
-		case EAI_FAIL:       return KviError_unrecoverableNameserverError; break;
-		case EAI_AGAIN:      return KviError_dnsTemporaneousFault; break;
+		case EAI_FAIL:       return KviError::UnrecoverableNameserverError; break;
+		case EAI_AGAIN:      return KviError::DNSTemporaneousFault; break;
 		// this should never happen
-		case EAI_BADFLAGS:   return KviError_dnsInternalErrorBadFlags; break;
-		case EAI_MEMORY:     return KviError_dnsInternalErrorOutOfMemory; break;
+		case EAI_BADFLAGS:   return KviError::DNSInternalErrorBadFlags; break;
+		case EAI_MEMORY:     return KviError::DNSInternalErrorOutOfMemory; break;
 		// got this when experimenting with protocols
-		case EAI_SERVICE:    return KviError_dnsInternalErrorServiceNotSupported; break;
+		case EAI_SERVICE:    return KviError::DNSInternalErrorServiceNotSupported; break;
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
-		case EAI_NONAME:     return KviError_dnsNoName; break;
+		case EAI_NONAME:     return KviError::DNSNoName; break;
 #endif
 		// got this when experimenting with protocols
-		case EAI_SOCKTYPE:   return KviError_dnsInternalErrorUnsupportedSocketType; break;
+		case EAI_SOCKTYPE:   return KviError::DNSInternalErrorUnsupportedSocketType; break;
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
-		case EAI_SYSTEM:     return -errno;
+		case EAI_SYSTEM:     return KviError::DNSQueryFailed;
 #endif
 	}
 
 #endif
-	return KviError_dnsQueryFailed;
+	return KviError::DNSQueryFailed;
 }
 
-void KviDnsResolverThread::postDnsError(KviDnsResolverResult * dns,int iErr)
+void KviDnsResolverThread::postDnsError(KviDnsResolverResult * pDns, KviError::Code error)
 {
-	dns->setError(iErr);
+	pDns->setError(error);
 	KviThreadDataEvent<KviDnsResolverResult> * e = new KviThreadDataEvent<KviDnsResolverResult>(KVI_DNS_THREAD_EVENT_DATA);
-	e->setData(dns);
+	e->setData(pDns);
 	postEvent(m_pParentDns,e);
 }
 
@@ -146,7 +146,7 @@ void KviDnsResolverThread::run()
 
 	if(m_szQuery.isEmpty())
 	{
-		postDnsError(dns,KviError_noHostToResolve);
+		postDnsError(dns,KviError::NoHostToResolve);
 		return;
 	}
 
@@ -155,7 +155,7 @@ void KviDnsResolverThread::run()
 	{
 		if(m_queryType == KviDnsResolver::IPv6)
 		{
-			postDnsError(dns,KviError_noIPv6Support);
+			postDnsError(dns,KviError::NoIPv6Support);
 			return;
 		}
 		m_queryType = KviDnsResolver::IPv4;
@@ -166,7 +166,7 @@ void KviDnsResolverThread::run()
 
 	if(m_queryType == KviDnsResolver::IPv6)
 	{
-		postDnsError(dns,KviError_noIPv6Support);
+		postDnsError(dns,KviError::NoIPv6Support);
 		return;
 	}
 
@@ -188,11 +188,11 @@ void KviDnsResolverThread::run()
 	{
 		switch(h_errno)
 		{
-			case HOST_NOT_FOUND: dns->setError(KviError_hostNotFound); break;
-			case NO_ADDRESS:     dns->setError(KviError_validNameButNoIpAddress); break;
-			case NO_RECOVERY:    dns->setError(KviError_unrecoverableNameserverError); break;
-			case TRY_AGAIN:      dns->setError(KviError_dnsTemporaneousFault); break;
-			default:             dns->setError(KviError_dnsQueryFailed); break;
+			case HOST_NOT_FOUND: dns->setError(KviError::HostNotFound); break;
+			case NO_ADDRESS:     dns->setError(KviError::ValidNameButNoIpAddress); break;
+			case NO_RECOVERY:    dns->setError(KviError::UnrecoverableNameserverError); break;
+			case TRY_AGAIN:      dns->setError(KviError::DNSTemporaneousFault); break;
+			default:             dns->setError(KviError::DNSQueryFailed); break;
 		}
 	} else {
 		dns->appendHostname(pHostEntry->h_name);
@@ -370,22 +370,25 @@ bool KviDnsResolver::isRunning() const
 
 bool KviDnsResolver::lookup(const QString &query,QueryType type)
 {
-	if(m_state == Busy)return false;
+	if(m_state == Busy)
+		return false;
 	m_pSlaveThread->setQuery(KviQString::trimmed(query),type);
 	bool bStarted = m_pSlaveThread->start();
 	m_state = bStarted ? Busy : Failure;
 	return bStarted;
 }
 
-int KviDnsResolver::error()
+KviError::Code KviDnsResolver::error()
 {
-	if(!m_pDnsResult)return KviError_dnsQueryFailed;
+	if(!m_pDnsResult)
+		return KviError::DNSQueryFailed;
 	return m_pDnsResult->error();
 }
 
 KviDnsResolverResult * KviDnsResolver::result()
 {
-	if(!m_pDnsResult)m_pDnsResult = new KviDnsResolverResult();
+	if(!m_pDnsResult)
+		m_pDnsResult = new KviDnsResolverResult();
 	return m_pDnsResult;
 }
 
@@ -436,7 +439,7 @@ bool KviDnsResolver::event(QEvent *e)
 		{
 			if(m_pDnsResult)delete m_pDnsResult;
 			m_pDnsResult = ((KviThreadDataEvent<KviDnsResolverResult> *)e)->getData();
-			m_state = (m_pDnsResult->error() == KviError_success) ? Success : Failure;
+			m_state = (m_pDnsResult->error() == KviError::Success) ? Success : Failure;
 			emit lookupDone(this);
 			return true;
 		} // else ops... unknown thread event ?
diff --git a/src/kvilib/net/KviDnsResolver.h b/src/kvilib/net/KviDnsResolver.h
index 6d47862b2..d8f43648c 100644
--- a/src/kvilib/net/KviDnsResolver.h
+++ b/src/kvilib/net/KviDnsResolver.h
@@ -29,10 +29,10 @@
 #include "KviHeapObject.h"
 #include "KviThread.h"
 #include "KviQString.h"
+#include "KviError.h"
 
 class KviDnsResolverThread;
 
-
 class KVILIB_API KviDnsResolverResult : public KviHeapObject
 {
 	friend class KviDnsResolver;
@@ -42,14 +42,14 @@ protected:
 public:
 	~KviDnsResolverResult();
 protected:
-	int m_iError;
+	KviError::Code m_eError;
 	KviPointerList<QString> * m_pHostnameList;
 	KviPointerList<QString> * m_pIpAddressList;
 	QString m_szQuery;
 public:
-	int error()
+	KviError::Code error()
 	{
-		return m_iError;
+		return m_eError;
 	}
 
 	// never store nor delete these pointers!
@@ -70,18 +70,18 @@ public:
 	}
 
 protected:
-	void setError(int iError)
+	void setError(KviError::Code eError)
 	{
-		m_iError = iError;
+		m_eError = eError;
 	}
 
-	void setQuery(const QString &query)
+	void setQuery(const QString & szQuery)
 	{
-		m_szQuery = query;
+		m_szQuery = szQuery;
 	}
 
-	void appendHostname(const QString &host);
-	void appendAddress(const QString &addr);
+	void appendHostname(const QString & szHost);
+	void appendAddress(const QString & szAddr);
 };
 
 
@@ -108,13 +108,13 @@ public:
 	//
 
 	// Lookup start
-	bool lookup(const QString &szQuery,QueryType type);
+	bool lookup(const QString & szQuery, QueryType type);
 
 	// Current object state
 	State state(){ return m_state; };
 
 	// Results (return always non null-data..but valid results only if state() == Success or Failure)
-	int error();
+	KviError::Code error();
 	const QString & firstHostname();
 	const QString & firstIpAddress();
 	int hostnameCount();
@@ -150,15 +150,15 @@ protected:
 	KviDnsResolverThread(KviDnsResolver * pDns);
 	virtual ~KviDnsResolverThread();
 protected:
-	QString              m_szQuery;
+	QString                      m_szQuery;
 	KviDnsResolver::QueryType    m_queryType;
 	KviDnsResolver             * m_pParentDns;
 public:
-	void setQuery(const QString &query,KviDnsResolver::QueryType type){ m_szQuery = query; m_queryType = type; };
+	void setQuery(const QString & szQuery, KviDnsResolver::QueryType type){ m_szQuery = szQuery; m_queryType = type; };
 protected:
 	virtual void run();
-	int translateDnsError(int iErr);
-	void postDnsError(KviDnsResolverResult * dns,int iErr);
+	KviError::Code translateDnsError(int iErr);
+	void postDnsError(KviDnsResolverResult * pDns, KviError::Code error);
 };
 
 
diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp
index 30f97887d..4f605d6c5 100644
--- a/src/kvilib/net/KviHttpRequest.cpp
+++ b/src/kvilib/net/KviHttpRequest.cpp
@@ -204,9 +204,8 @@ void KviHttpRequest::dnsLookupDone(KviDnsResolver *d)
 		emit status(tmp);
 		haveServerIp();
 	} else {
-		int iErr = d->error();
 		resetInternalStatus();
-		m_szLastError = KviError::getDescription(iErr);
+		m_szLastError = KviError::getDescription(d->error());
 		emit terminated(false);
 	}
 }
diff --git a/src/kvilib/net/KviHttpRequestThread.cpp b/src/kvilib/net/KviHttpRequestThread.cpp
index 21e1d2a9e..88258dde5 100644
--- a/src/kvilib/net/KviHttpRequestThread.cpp
+++ b/src/kvilib/net/KviHttpRequestThread.cpp
@@ -210,14 +210,17 @@ bool KviHttpRequestThread::connectToRemoteHost()
 		return false;
 
 	int sockError;
-	int iSize=sizeof(sockError);
+	int iSize = sizeof(sockError);
 	if(!kvi_socket_getsockopt(m_sock,SOL_SOCKET,SO_ERROR,(void *)&sockError,&iSize))sockError = -1;
 	if(sockError != 0)
 	{
 		//failed
-		if(sockError > 0)sockError = KviError::translateSystemError(sockError);
-		else sockError = KviError_unknownError;
-		return failure(KviError::getUntranslatedDescription(sockError));
+		KviError::Code eError;
+		if(sockError > 0)
+			eError = KviError::translateSystemError(sockError);
+		else
+			eError = KviError::UnknownError;
+		return failure(KviError::getUntranslatedDescription(eError));
 	}
 
 #ifdef COMPILE_SSL_SUPPORT
diff --git a/src/kvilib/system/KviThread.cpp b/src/kvilib/system/KviThread.cpp
index 5187e717c..5ab839e74 100644
--- a/src/kvilib/system/KviThread.cpp
+++ b/src/kvilib/system/KviThread.cpp
@@ -164,7 +164,7 @@ void KviThreadManager::globalInit()
 void KviThreadManager::globalDestroy()
 {
 	delete g_pThreadManager;
-    g_pThreadManager = 0;
+	g_pThreadManager = 0;
 }
 
 KviThreadManager::KviThreadManager()
@@ -172,7 +172,6 @@ KviThreadManager::KviThreadManager()
 {
 	if(g_pThreadManager)qDebug("Hey...what are ya doing ?");
 
-
 	m_pMutex = new KviMutex();
 	m_pThreadList = new KviPointerList<KviThread>;
 	m_pThreadList->setAutoDelete(false);