fixed protocols name

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

50 files changed, 274 insertions, 274 deletions

diff --git a/src/kvilib/config/kvi_wincfg.h b/src/kvilib/config/kvi_wincfg.h
index e42d3a07b..59c42c415 100644
--- a/src/kvilib/config/kvi_wincfg.h
+++ b/src/kvilib/config/kvi_wincfg.h
@@ -73,7 +73,7 @@
 /* define if you want to compile the localization support */
 #define COMPILE_LOCALE_STUFF 1
 
-/* define if you want the IpV6 support */
+/* define if you want the IPv6 support */
 #define COMPILE_IPV6_SUPPORT 1
 
 /* define if you want zlib support */
diff --git a/src/kvilib/core/kvi_error.cpp b/src/kvilib/core/kvi_error.cpp
index 844a26fcb..dd4355117 100644
--- a/src/kvilib/core/kvi_error.cpp
+++ b/src/kvilib/core/kvi_error.cpp
@@ -115,7 +115,7 @@ const char * g_errorTable[KVI_NUM_ERRORS]=
 	__tr_no_lookup("Open parenthesis expected"),                                // 064
 	__tr_no_lookup("Open brace expected"),                                      // 065
 	__tr_no_lookup("Can't kill a builtin class"),                               // 066
-	__tr_no_lookup("The SOCKSV4 protocol lacks IpV6 support"),                  // 067
+	__tr_no_lookup("The SOCKSv4 protocol lacks IPv6 support"),                  // 067
 	__tr_no_lookup("Unrecognized proxy reply"),                                 // 068
 	__tr_no_lookup("Proxy response: auth failed: access denied"),
 	__tr_no_lookup("Proxy response: No acceptable auth method: request rejected"),
diff --git a/src/kvilib/core/kvi_error.h b/src/kvilib/core/kvi_error.h
index 7190eae06..ab3d68c92 100644
--- a/src/kvilib/core/kvi_error.h
+++ b/src/kvilib/core/kvi_error.h
@@ -61,7 +61,7 @@
 #define KviError_dnsNoName 30
 #define KviError_dnsInternalErrorUnsupportedSocketType 31
 #define KviError_dnsQueryFailed 32
-#define KviError_noIpV6Support 33
+#define KviError_noIPv6Support 33
 #define KviError_hostNotFound 34
 #define KviError_dnsInternalIPCFailure 35
 
@@ -104,7 +104,7 @@
 #define KviError_openBraceExpected 65
 
 #define KviError_cantKillABuiltinClass 66
-#define KviError_socksV4LacksIpV6Support 67
+#define KviError_socksV4LacksIPv6Support 67
 #define KviError_unrecognizedProxyReply 68
 #define KviError_proxyAuthFailed 69
 #define KviError_proxyNoAcceptableAuthMethod 70
diff --git a/src/kvilib/ext/kvi_proxydb.cpp b/src/kvilib/ext/kvi_proxydb.cpp
index 97c8f1a41..602fda406 100644
--- a/src/kvilib/ext/kvi_proxydb.cpp
+++ b/src/kvilib/ext/kvi_proxydb.cpp
@@ -32,7 +32,7 @@ KviProxy::KviProxy()
 	m_szHostname = "proxy.example.net";
 	m_uPort      = 1080;
 	m_protocol   = Socks4;
-	m_bIsIpV6    = false;
+	m_bIsIPv6    = false;
 }
 
 KviProxy::KviProxy(const KviProxy &prx)
@@ -43,7 +43,7 @@ KviProxy::KviProxy(const KviProxy &prx)
 	m_szPass     = prx.m_szPass;
 	m_uPort      = prx.m_uPort;
 	m_protocol   = prx.m_protocol;
-	m_bIsIpV6    = prx.m_bIsIpV6;
+	m_bIsIPv6    = prx.m_bIsIPv6;
 }
 
 KviProxy::~KviProxy()
@@ -139,8 +139,8 @@ void KviProxyDataBase::load(const QString &filename)
 		KviStr type    = cfg.readEntry(tmp.ptr(),"SOCKSv4");
 		p->setNamedProtocol(type.ptr());
 
-		tmp.sprintf("%u_IsIpV6",i);
-		p->m_bIsIpV6   = cfg.readBoolEntry(tmp.ptr(),false);
+		tmp.sprintf("%u_IsIPv6",i);
+		p->m_bIsIPv6   = cfg.readBoolEntry(tmp.ptr(),false);
 		tmp.sprintf("%u_Current",i);
 		if(cfg.readBoolEntry(tmp.ptr(),false))m_pCurrentProxy = p;
 		m_pProxyList->append(p);
@@ -183,8 +183,8 @@ void KviProxyDataBase::save(const QString &filename)
 		}
 		cfg.writeEntry(tmp.ptr(),type.ptr());
 
-		tmp.sprintf("%u_IsIpV6",i);
-		cfg.writeEntry(tmp.ptr(),p->m_bIsIpV6);
+		tmp.sprintf("%u_IsIPv6",i);
+		cfg.writeEntry(tmp.ptr(),p->m_bIsIPv6);
 		tmp.sprintf("%u_Current",i);
 		if(m_pCurrentProxy == p)cfg.writeEntry(tmp.ptr(),true);
 		i++;
diff --git a/src/kvilib/ext/kvi_proxydb.h b/src/kvilib/ext/kvi_proxydb.h
index 260488ba6..8a9cae321 100644
--- a/src/kvilib/ext/kvi_proxydb.h
+++ b/src/kvilib/ext/kvi_proxydb.h
@@ -44,9 +44,9 @@ public:
 	KviStr             m_szUser;
 	kvi_u32_t          m_uPort;
 	Protocol           m_protocol;
-	bool               m_bIsIpV6;
+	bool               m_bIsIPv6;
 public:
-	bool isIpV6() const             { return m_bIsIpV6; };
+	bool isIPv6() const             { return m_bIsIPv6; };
 	Protocol protocol() const       { return m_protocol; };
 	const char * protocolName() const;
 	void setNamedProtocol(const char * proto);
diff --git a/src/kvilib/irc/kvi_ircserver.cpp b/src/kvilib/irc/kvi_ircserver.cpp
index 6797e7832..0f5dfaa04 100644
--- a/src/kvilib/irc/kvi_ircserver.cpp
+++ b/src/kvilib/irc/kvi_ircserver.cpp
@@ -137,7 +137,7 @@ QString KviServer::ircUri()
 {
 	QString uri("irc");
 	if(useSSL())uri += "s";
-	if(isIpV6())uri += "6";
+	if(isIPv6())uri += "6";
 	uri += "://";
 	uri += m_szHostname;
 
@@ -196,7 +196,7 @@ bool KviServer::load(KviConfig * cfg,const QString &prefix)
 	KviQString::sprintf(tmp,"%QId",&prefix);
 	m_szId = cfg->readQStringEntry(tmp);
 	if(m_szId.isEmpty())generateUniqueId();
-	KviQString::sprintf(tmp,"%QIpV6",&prefix);
+	KviQString::sprintf(tmp,"%QIPv6",&prefix);
 	setIPv6(cfg->readBoolEntry(tmp,false));
 	KviQString::sprintf(tmp,"%QCacheIp",&prefix);
 	setCacheIp(cfg->readBoolEntry(tmp,false)); // true ?
@@ -286,10 +286,10 @@ void KviServer::save(KviConfig * cfg,const QString &prefix)
 		KviQString::sprintf(tmp,"%QPort",&prefix);
 		cfg->writeEntry(tmp,m_uPort);
 	}
-	if(isIpV6())
+	if(isIPv6())
 	{
-		KviQString::sprintf(tmp,"%QIpV6",&prefix);
-		cfg->writeEntry(tmp,isIpV6());
+		KviQString::sprintf(tmp,"%QIPv6",&prefix);
+		cfg->writeEntry(tmp,isIPv6());
 	}
 	if(cacheIp())
 	{
diff --git a/src/kvilib/irc/kvi_ircserver.h b/src/kvilib/irc/kvi_ircserver.h
index 46dc4974d..449671bf8 100644
--- a/src/kvilib/irc/kvi_ircserver.h
+++ b/src/kvilib/irc/kvi_ircserver.h
@@ -104,7 +104,7 @@ public:
 	const QString & userIdentityId() const { return m_szUserIdentityId; };
 	bool autoConnect() const { return m_bAutoConnect; };
 	QStringList* autoJoinChannelList(){ return m_pChannelList; };
-	bool isIpV6() const { return (m_uFlags & KVI_IRCSERVER_FLAG_IPV6); };
+	bool isIPv6() const { return (m_uFlags & KVI_IRCSERVER_FLAG_IPV6); };
 	bool useSSL() const { return (m_uFlags & KVI_IRCSERVER_FLAG_SSL); };
 	bool cacheIp() const { return (m_uFlags & KVI_IRCSERVER_FLAG_CACHEIP); };
 	
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index ebf2d879c..8e83468f1 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -62,7 +62,7 @@ KviServer * KviServerDataBaseRecord::findServer(const KviServer * pServer)
 		if(KviQString::equalCI(s->m_szHostname,pServer->m_szHostname) &&
 			(s->m_uPort == pServer->m_uPort) &&
 			(s->useSSL() == pServer->useSSL()) &&
-			(s->isIpV6() == pServer->isIpV6()))return s;
+			(s->isIPv6() == pServer->isIPv6()))return s;
 	}
 	return 0;
 }
@@ -257,7 +257,7 @@ bool KviServerDataBase::makeCurrentServer(KviServerDefinition * d,QString &szErr
 		{
 			if(KviQString::equalCI(srv->hostName(),d->szServer))
 			{
-				if(d->bIpV6 == srv->isIpV6())
+				if(d->bIPv6 == srv->isIPv6())
 				{
 					if(d->bSSL == srv->useSSL())
 					{
@@ -320,14 +320,14 @@ search_finished:
 	}
 
 	// no such server: is it a valid ip address or hostname ?
-	bool bIsValidIpV4 = KviNetUtils::isValidStringIp(d->szServer);
+	bool bIsValidIPv4 = KviNetUtils::isValidStringIp(d->szServer);
 #ifdef COMPILE_IPV6_SUPPORT
-	bool bIsValidIpV6 =KviNetUtils::isValidStringIp_V6(d->szServer);
+	bool bIsValidIPv6 =KviNetUtils::isValidStringIp_V6(d->szServer);
 #else
-	bool bIsValidIpV6 = false;
+	bool bIsValidIPv6 = false;
 #endif
 
-	if(!(bIsValidIpV4 || bIsValidIpV6))
+	if(!(bIsValidIPv4 || bIsValidIPv6))
 	{
 		// is it a valid hostname ? (must contain at least one dot)
 		if(!d->szServer.contains('.'))
@@ -350,17 +350,17 @@ search_finished:
 
 	KviServer * s = new KviServer();
 	s->m_szHostname = d->szServer;
-	if(bIsValidIpV4)
+	if(bIsValidIPv4)
 	{
 		s->m_szIp = d->szServer;
 		s->setCacheIp(true);
 #ifdef COMPILE_IPV6_SUPPORT
 	} else {
-		if(bIsValidIpV6)
+		if(bIsValidIPv6)
 		{
 			s->m_szIp = d->szServer;
 			s->setCacheIp(true);
-			d->bIpV6 = true;
+			d->bIPv6 = true;
 		}
 	}
 #else
@@ -371,7 +371,7 @@ search_finished:
 	s->m_szPass= d->szPass;
 	s->m_szNick= d->szNick;
 	s->m_szInitUMode = d->szInitUMode;
-	s->setIPv6(d->bIpV6);
+	s->setIPv6(d->bIPv6);
 	s->setUseSSL(d->bSSL);
 	r->insertServer(s);
 	m_szCurrentNetwork = r->network()->name();
diff --git a/src/kvilib/irc/kvi_ircserverdb.h b/src/kvilib/irc/kvi_ircserverdb.h
index 8617fd632..42b80a821 100644
--- a/src/kvilib/irc/kvi_ircserverdb.h
+++ b/src/kvilib/irc/kvi_ircserverdb.h
@@ -35,7 +35,7 @@ typedef struct _KviServerDefinition
 	QString            szServer;
 	kvi_u32_t          uPort;
 	bool               bPortIsValid;
-	bool               bIpV6;
+	bool               bIPv6;
 	bool               bSSL;
 	QString            szLinkFilter;
 	QString            szPass;
diff --git a/src/kvilib/net/kvi_dns.cpp b/src/kvilib/net/kvi_dns.cpp
index 899420c31..f46333981 100644
--- a/src/kvilib/net/kvi_dns.cpp
+++ b/src/kvilib/net/kvi_dns.cpp
@@ -152,22 +152,22 @@ void KviDnsThread::run()
 	}
 
 #ifndef COMPILE_IPV6_SUPPORT
-	if(m_queryType != KviDns::IpV4)
+	if(m_queryType != KviDns::IPv4)
 	{
-		if(m_queryType == KviDns::IpV6)
+		if(m_queryType == KviDns::IPv6)
 		{
-			postDnsError(dns,KviError_noIpV6Support);
+			postDnsError(dns,KviError_noIPv6Support);
 			return;
 		}
-		m_queryType = KviDns::IpV4;
+		m_queryType = KviDns::IPv4;
 	}
 #endif
 
 #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)) && !defined(COMPILE_IPV6_SUPPORT)
 
-	if(m_queryType == KviDns::IpV6)
+	if(m_queryType == KviDns::IPv6)
 	{
-		postDnsError(dns,KviError_noIpV6Support);
+		postDnsError(dns,KviError_noIPv6Support);
 		return;
 	}
 
@@ -227,29 +227,29 @@ void KviDnsThread::run()
 
 #ifdef COMPILE_IPV6_SUPPORT
 	struct sockaddr_in6 ipv6Addr;
-	bool bIsIpV6Ip = false;
+	bool bIsIPv6Ip = false;
 #endif
 
-	bool bIsIpV4Ip = KviNetUtils::stringIpToBinaryIp(m_szQuery,(struct in_addr *)&(ipv4Addr.sin_addr));
+	bool bIsIPv4Ip = KviNetUtils::stringIpToBinaryIp(m_szQuery,(struct in_addr *)&(ipv4Addr.sin_addr));
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(!bIsIpV4Ip)bIsIpV6Ip = KviNetUtils::stringIpToBinaryIp_V6(m_szQuery,(struct in6_addr *)&(ipv6Addr.sin6_addr));
+	if(!bIsIPv4Ip)bIsIPv6Ip = KviNetUtils::stringIpToBinaryIp_V6(m_szQuery,(struct in6_addr *)&(ipv6Addr.sin6_addr));
 #endif
 
 //#ifdef HAVE_GETNAMEINFO
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(bIsIpV4Ip || bIsIpV6Ip)
+	if(bIsIPv4Ip || bIsIPv6Ip)
 	{
 #else
-	if(bIsIpV4Ip)
+	if(bIsIPv4Ip)
 	{
 #endif
 		// use getnameinfo...
 		char retname[1025]; // should be enough....
 
 #ifdef COMPILE_IPV6_SUPPORT
-		if(bIsIpV4Ip)
+		if(bIsIPv4Ip)
 		{
 #endif
 			ipv4Addr.sin_family = AF_INET;
@@ -282,7 +282,7 @@ void KviDnsThread::run()
 		struct addrinfo hints;
 		hints.ai_flags     = 0; //AI_CANONNAME; <-- for IPV6 it makes cannoname to point to the IP address!
 #ifdef COMPILE_IPV6_SUPPORT
-		hints.ai_family    = (m_queryType == KviDns::IpV6) ? PF_INET6 : ((m_queryType == KviDns::IpV4) ? PF_INET : PF_UNSPEC);
+		hints.ai_family    = (m_queryType == KviDns::IPv6) ? PF_INET6 : ((m_queryType == KviDns::IPv4) ? PF_INET : PF_UNSPEC);
 #else
 		hints.ai_family    = PF_INET;
 #endif
diff --git a/src/kvilib/net/kvi_dns.h b/src/kvilib/net/kvi_dns.h
index 0fa1ed9e9..06a968fae 100644
--- a/src/kvilib/net/kvi_dns.h
+++ b/src/kvilib/net/kvi_dns.h
@@ -71,7 +71,7 @@ public:
 	KviDns();
 	~KviDns();
 public:
-	enum QueryType { IpV4 , IpV6 , Any };
+	enum QueryType { IPv4 , IPv6 , Any };
 	enum State     { Idle , Busy , Failure , Success };
 protected:
 	void         * m_pAuxData;
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index 9f2e51e50..2e4231390 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -184,7 +184,7 @@ bool KviHttpRequest::startDnsLookup()
 	m_pDns = new KviDns();
 	connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(dnsLookupDone(KviDns *)));
 
-	if(!m_pDns->lookup(m_url.host().ptr(),KviDns::IpV4))
+	if(!m_pDns->lookup(m_url.host().ptr(),KviDns::IPv4))
 	{
 		resetInternalStatus();
 		m_szLastError = __tr2qs("Unable to start the DNS lookup");
diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp
index e2836b474..f2c47215e 100644
--- a/src/kvilib/net/kvi_netutils.cpp
+++ b/src/kvilib/net/kvi_netutils.cpp
@@ -714,13 +714,13 @@ bool kvi_getLocalHostAddress(QString &buffer)
 	return true;
 }
 
-KviSockaddr::KviSockaddr(const char * szIpAddress,kvi_u32_t uPort,bool bIpV6,bool bUdp)
+KviSockaddr::KviSockaddr(const char * szIpAddress,kvi_u32_t uPort,bool bIPv6,bool bUdp)
 {
 	struct addrinfo hints;
 	kvi_memset((void *)&hints,0,sizeof(hints));
 	hints.ai_flags = AI_NUMERICHOST;
 #ifdef COMPILE_IPV6_SUPPORT
-	hints.ai_family = bIpV6 ? PF_INET6 : PF_INET;
+	hints.ai_family = bIPv6 ? PF_INET6 : PF_INET;
 #else
 	hints.ai_family = PF_INET;
 #endif
@@ -733,14 +733,14 @@ KviSockaddr::KviSockaddr(const char * szIpAddress,kvi_u32_t uPort,bool bIpV6,boo
 	getaddrinfo(szIpAddress,szPort.ptr(),&hints,(struct addrinfo **)&m_pData);
 }
 
-KviSockaddr::KviSockaddr(kvi_u32_t uPort,bool bIpV6,bool bUdp) // passive sockaddr
+KviSockaddr::KviSockaddr(kvi_u32_t uPort,bool bIPv6,bool bUdp) // passive sockaddr
 
 {
 	struct addrinfo hints;
 	kvi_memset((void *)&hints,0,sizeof(hints));
 	hints.ai_flags = AI_NUMERICHOST | AI_PASSIVE;
 #ifdef COMPILE_IPV6_SUPPORT
-	hints.ai_family = bIpV6 ? PF_INET6 : PF_INET;
+	hints.ai_family = bIPv6 ? PF_INET6 : PF_INET;
 #else
 	hints.ai_family = PF_INET;
 #endif
@@ -778,7 +778,7 @@ int KviSockaddr::addressFamily()
 	return ((struct addrinfo *)m_pData)->ai_family;
 }
 
-bool KviSockaddr::isIpV6()
+bool KviSockaddr::isIPv6()
 {
 	if(!m_pData)return false;
 #ifdef COMPILE_IPV6_SUPPORT
diff --git a/src/kvilib/net/kvi_netutils.h b/src/kvilib/net/kvi_netutils.h
index cde57a783..22b935f58 100644
--- a/src/kvilib/net/kvi_netutils.h
+++ b/src/kvilib/net/kvi_netutils.h
@@ -60,8 +60,8 @@ KVILIB_API extern bool kvi_binaryIpToStringIp(struct in_addr in,QString &szBuffe
 class KVILIB_API KviSockaddr
 {
 public:
-	KviSockaddr(const char * szIpAddress,kvi_u32_t uPort,bool bIpV6,bool bUdp = false);
-	KviSockaddr(kvi_u32_t uPort,bool bIpV6,bool bUdp = false); // passive
+	KviSockaddr(const char * szIpAddress,kvi_u32_t uPort,bool bIPv6,bool bUdp = false);
+	KviSockaddr(kvi_u32_t uPort,bool bIPv6,bool bUdp = false); // passive
 	~KviSockaddr();
 private:
 	void * m_pData; //addrinfo
@@ -69,7 +69,7 @@ public:
 	struct sockaddr * socketAddress();
 	size_t addressLength();
 	int addressFamily();
-	bool isIpV6();
+	bool isIPv6();
 	bool getStringAddress(QString &szBuffer);
 	kvi_u32_t port();
 	
diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
index 442427b89..505d9aedf 100644
--- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
+++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
@@ -40,7 +40,7 @@ public:
 	bool               bUseLastServerInContext; // this is checked ONLY if szServer is empty
 	kvi_u32_t          uPort;
 	bool               bPortIsOk;
-	bool               bUseIpV6;
+	bool               bUseIPv6;
 	bool               bUseSSL;
 	QString            szBindAddress; // ip address (or interface name) to bind the connection to
 	QString            szCommandToExecAfterConnect;
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 87561966f..3a3610c46 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -667,13 +667,13 @@ void KviIrcConnection::resolveLocalHost()
 {
 	QString szIp;
 
-	if(!socket()->getLocalHostIp(szIp,server()->isIpV6()))
+	if(!socket()->getLocalHostIp(szIp,server()->isIPv6()))
 	{
 		bool bGotIp = false;
 		if(!KVI_OPTION_STRING(KviOption_stringLocalHostIp).isEmpty())
 		{
 #ifdef COMPILE_IPV6_SUPPORT
-			if(server()->isIpV6())
+			if(server()->isIPv6())
 			{
 				if(KviNetUtils::isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringLocalHostIp)))bGotIp = true;
 			} else {
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index 53bbdc13c..e2a2bd91d 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -179,7 +179,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 {
 	bool bValidIp;
 #ifdef COMPILE_IPV6_SUPPORT
-	if(m_pTarget->proxy()->isIpV6())
+	if(m_pTarget->proxy()->isIPv6())
 	{
 		bValidIp = kvi_isValidStringIp_V6(m_pTarget->proxy()->m_szIp.ptr());
 	} else {
@@ -201,7 +201,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 		else terminate(Success,KviError_success);
 	} else {
 #ifdef COMPILE_IPV6_SUPPORT
-		if(m_pTarget->proxy()->isIpV6())
+		if(m_pTarget->proxy()->isIPv6())
 		{
 			bValidIp = kvi_isValidStringIp_V6(m_pTarget->proxy()->m_szHostname.ptr());
 		} else {
@@ -233,7 +233,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 			connect(m_pProxyDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(proxyLookupTerminated(KviDns *)));
 	
 			if(!m_pProxyDns->lookup(m_pTarget->proxy()->m_szHostname.ptr(),
-				m_pTarget->proxy()->isIpV6() ? KviDns::IpV6 : KviDns::IpV4))
+				m_pTarget->proxy()->isIPv6() ? KviDns::IPv6 : KviDns::IPv4))
 			{
 				m_pConsole->outputNoFmt(KVI_OUT_SYSTEMWARNING,
 						__tr2qs("Unable to look up the IRC proxy hostname: Can't start the DNS slave"));
@@ -307,7 +307,7 @@ void KviIrcConnectionTargetResolver::lookupServerHostname()
 	bool bValidIp;
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(m_pTarget->server()->isIpV6())
+	if(m_pTarget->server()->isIPv6())
 	{
 		bValidIp = KviNetUtils::isValidStringIp_V6(m_pTarget->server()->m_szIp);
 	} else {
@@ -326,7 +326,7 @@ void KviIrcConnectionTargetResolver::lookupServerHostname()
 		haveServerIp();
 	} else {
 #ifdef COMPILE_IPV6_SUPPORT
-		if(m_pTarget->server()->isIpV6())
+		if(m_pTarget->server()->isIPv6())
 		{
 			bValidIp = KviNetUtils::isValidStringIp_V6(m_pTarget->server()->m_szHostname);
 		} else {
@@ -350,7 +350,7 @@ void KviIrcConnectionTargetResolver::lookupServerHostname()
 			connect(m_pServerDns,SIGNAL(lookupDone(KviDns *)),this,
 				SLOT(serverLookupTerminated(KviDns *)));
 			if(!m_pServerDns->lookup(m_pTarget->server()->m_szHostname,
-				m_pTarget->server()->isIpV6() ? KviDns::IpV6 : KviDns::IpV4))
+				m_pTarget->server()->isIPv6() ? KviDns::IPv6 : KviDns::IPv4))
 			{
 				m_pConsole->outputNoFmt(KVI_OUT_SYSTEMERROR,
 					__tr2qs("Unable to look up the server hostname: Can't start the DNS slave"));
@@ -376,7 +376,7 @@ void KviIrcConnectionTargetResolver::serverLookupTerminated(KviDns *)
 				&szErr);
 
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!(m_pTarget->server()->isIpV6()))
+		if(!(m_pTarget->server()->isIPv6()))
 		{
 			m_pConsole->output(KVI_OUT_SYSTEMERROR,
 				__tr2qs("If this server is an IPv6 one, try /server -i %Q"),
@@ -453,7 +453,7 @@ bool KviIrcConnectionTargetResolver::validateLocalAddress(const QString &szAddre
 {
 	// szAddress may be an ip address or an interface name
 #ifdef COMPILE_IPV6_SUPPORT
-	if(m_pTarget->server()->isIpV6())
+	if(m_pTarget->server()->isIPv6())
 	{
 		if(KviNetUtils::isValidStringIp_V6(szAddress))
 		{
@@ -505,62 +505,62 @@ void KviIrcConnectionTargetResolver::haveServerIp()
 	} else {
 		// the options specify a bind address ?
 #ifdef COMPILE_IPV6_SUPPORT
-		if(m_pTarget->server()->isIpV6())
+		if(m_pTarget->server()->isIPv6())
 		{
-			if(KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress))
+			if(KVI_OPTION_BOOL(KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress))
 			{
-				if(!KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).isEmpty())
+				if(!KVI_OPTION_STRING(KviOption_stringIPv6ConnectionBindAddress).isEmpty())
 				{
-					if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress),bindAddress))
+					if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIPv6ConnectionBindAddress),bindAddress))
 					{
 						// if it is not an interface name , kill it for now and let the user correct the address
-						if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).indexOf(':') != -1)
+						if(KVI_OPTION_STRING(KviOption_stringIPv6ConnectionBindAddress).indexOf(':') != -1)
 						{
 							if(!_OUTPUT_MUTE)
 								m_pConsole->output(KVI_OUT_SYSTEMWARNING,
 									__tr2qs("The system-wide IPv6 bind address (%s) is not valid"),
-									KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).toUtf8().data());
-								KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress) = false;
+									KVI_OPTION_STRING(KviOption_stringIPv6ConnectionBindAddress).toUtf8().data());
+								KVI_OPTION_BOOL(KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress) = false;
 						} else {
 							// this is an interface address: might be down
 							if(!_OUTPUT_MUTE)
 								m_pConsole->output(KVI_OUT_SYSTEMWARNING,
 									__tr2qs("The system-wide IPv6 bind address (%s) is not valid (the interface it refers to might be down)"),
-									KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).toUtf8().data());
+									KVI_OPTION_STRING(KviOption_stringIPv6ConnectionBindAddress).toUtf8().data());
 						}
 					}
 				} else {
 					// empty address....kill it
-					KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress) = false;
+					KVI_OPTION_BOOL(KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress) = false;
 				}
 			}
 		} else {
 #endif
-			if(KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress))
+			if(KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress))
 			{
-				if(!KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).isEmpty())
+				if(!KVI_OPTION_STRING(KviOption_stringIPv4ConnectionBindAddress).isEmpty())
 				{
-					if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress),bindAddress))
+					if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIPv4ConnectionBindAddress),bindAddress))
 					{
 						// if it is not an interface name , kill it for now and let the user correct the address
-						if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).indexOf(':') != -1)
+						if(KVI_OPTION_STRING(KviOption_stringIPv4ConnectionBindAddress).indexOf(':') != -1)
 						{
 							if(!_OUTPUT_MUTE)
 								m_pConsole->output(KVI_OUT_SYSTEMWARNING,
 									__tr2qs("The system-wide IPv4 bind address (%s) is not valid"),
-									KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).toUtf8().data());
-									KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress) = false;
+									KVI_OPTION_STRING(KviOption_stringIPv4ConnectionBindAddress).toUtf8().data());
+									KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress) = false;
 						} else {
 							// this is an interface address: might be down
 							if(!_OUTPUT_MUTE)
 								m_pConsole->output(KVI_OUT_SYSTEMWARNING,
 									__tr2qs("The system-wide IPv4 bind address (%s) is not valid (the interface it refers to might be down)"),
-									KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).toUtf8().data());
+									KVI_OPTION_STRING(KviOption_stringIPv4ConnectionBindAddress).toUtf8().data());
 						}
 					}
 				} else {
 					// empty address....kill it
-					KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress) = false;
+					KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress) = false;
 				}
 			}
 #ifdef COMPILE_IPV6_SUPPORT
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index ceffcddfd..ab8dcff2c 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -423,7 +423,7 @@ void KviIrcContext::connectToCurrentServer()
 					m_pAsynchronousConnectionData->szServer = m_pSavedAsynchronousConnectionData->szServer;
 					m_pAsynchronousConnectionData->uPort = m_pSavedAsynchronousConnectionData->uPort;
 					m_pAsynchronousConnectionData->bPortIsOk = true;
-					m_pAsynchronousConnectionData->bUseIpV6 = m_pSavedAsynchronousConnectionData->bUseIpV6;
+					m_pAsynchronousConnectionData->bUseIPv6 = m_pSavedAsynchronousConnectionData->bUseIPv6;
 					m_pAsynchronousConnectionData->bUseSSL = m_pSavedAsynchronousConnectionData->bUseSSL;
 					m_pAsynchronousConnectionData->m_pReconnectInfo = m_pSavedAsynchronousConnectionData->m_pReconnectInfo;
 					// and the other info, only if not overridden by the user
@@ -452,7 +452,7 @@ void KviIrcContext::connectToCurrentServer()
 			d.szServer = m_pAsynchronousConnectionData->szServer;
 			d.bPortIsValid = m_pAsynchronousConnectionData->bPortIsOk;
 			d.uPort = m_pAsynchronousConnectionData->uPort;
-			d.bIpV6 = m_pAsynchronousConnectionData->bUseIpV6;
+			d.bIPv6 = m_pAsynchronousConnectionData->bUseIPv6;
 			d.bSSL = m_pAsynchronousConnectionData->bUseSSL;
 			d.szLinkFilter = m_pAsynchronousConnectionData->szLinkFilter;
 			d.szPass = m_pAsynchronousConnectionData->szPass;
@@ -564,7 +564,7 @@ void KviIrcContext::connectToCurrentServer()
 	m_pSavedAsynchronousConnectionData->szServer = srv->m_szHostname;
 	m_pSavedAsynchronousConnectionData->uPort = srv->port();
 	m_pSavedAsynchronousConnectionData->bPortIsOk = true;
-	m_pSavedAsynchronousConnectionData->bUseIpV6 = srv->isIpV6();
+	m_pSavedAsynchronousConnectionData->bUseIPv6 = srv->isIPv6();
 	m_pSavedAsynchronousConnectionData->bUseSSL = srv->useSSL();
 	m_pSavedAsynchronousConnectionData->szPass = srv->password();
 	m_pSavedAsynchronousConnectionData->szInitUMode = srv->m_szInitUMode;
@@ -616,7 +616,7 @@ void KviIrcContext::connectionFailed(int iError)
 			d->szServer = oldServer.m_szHostname;
 			d->uPort = oldServer.port();
 			d->bPortIsOk = true;
-			d->bUseIpV6 = oldServer.isIpV6();
+			d->bUseIPv6 = oldServer.isIPv6();
 			d->bUseSSL = oldServer.useSSL();
 			d->szPass = oldServer.password();
 			d->szNick = oldNickname;
@@ -793,7 +793,7 @@ void KviIrcContext::connectionTerminated()
 		d->szServer = oldServer.m_szHostname;
 		d->uPort = oldServer.port();
 		d->bPortIsOk = true;
-		d->bUseIpV6 = oldServer.isIpV6();
+		d->bUseIPv6 = oldServer.isIPv6();
 		d->bUseSSL = oldServer.useSSL();
 		d->szPass = oldServer.password();
 		d->szInitUMode = oldServer.m_szInitUMode;
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index a5279e996..038281ed9 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -259,7 +259,7 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 	// Copy the server
 	m_pIrcServer = new KviServer(*srv);
 
-	bool bTargetIpV6 = false;
+	bool bTargetIPv6 = false;
 	bool bNeedServerIp = !prx;
 	if(prx) bNeedServerIp = (
 		prx->protocol() != KviProxy::Http && prx->protocol() != KviProxy::Socks5
@@ -273,19 +273,19 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 		// Yeah...here comes the proxy
 		m_pProxy = new KviProxy(*prx);
 		// check the proxy IP address
-		if(m_pProxy->isIpV6())
+		if(m_pProxy->isIPv6())
 		{
-			// IpV6 proxy :) (STILL QUITE UNTESTED ?)
+			// IPv6 proxy :) (STILL QUITE UNTESTED ?)
 #ifdef COMPILE_IPV6_SUPPORT
-			bTargetIpV6 = true;
+			bTargetIPv6 = true;
 			if(!kvi_isValidStringIp_V6(m_pProxy->ip()))return KviError_invalidProxyAddress;
-			// SOCKSV4 does not support IPV6 addresses
-			if(m_pProxy->protocol() == KviProxy::Socks4)return KviError_socksV4LacksIpV6Support;
+			// SOCKSv4 does not support IPV6 addresses
+			if(m_pProxy->protocol() == KviProxy::Socks4)return KviError_socksV4LacksIPv6Support;
 #else
-			return KviError_noIpV6Support;
+			return KviError_noIPv6Support;
 #endif
 		} else {
-			// IpV4 proxy
+			// IPv4 proxy
 			if(!kvi_isValidStringIp(m_pProxy->ip()))return KviError_invalidProxyAddress;
 		}
 	}
@@ -294,27 +294,27 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 	{
 		// check the irc host ip
 #ifdef COMPILE_IPV6_SUPPORT
-		if(m_pIrcServer->isIpV6())
+		if(m_pIrcServer->isIPv6())
 		{
-			// We have an IpV6 server host (Interesting if proxy is IpV4)
+			// We have an IPv6 server host (Interesting if proxy is IPv4)
 			if( !KviNetUtils::isValidStringIp_V6(m_pIrcServer->ip()) )return KviError_invalidIpAddress;
-			if(!m_pProxy)bTargetIpV6 = true; // otherwise the proxy rules
+			if(!m_pProxy)bTargetIPv6 = true; // otherwise the proxy rules
 		} else {
 #endif
-			// We have an IpV4 server host
+			// We have an IPv4 server host
 			if(!KviNetUtils::isValidStringIp(m_pIrcServer->ip())) return KviError_invalidIpAddress;
 #ifdef COMPILE_IPV6_SUPPORT
 		}
 #endif
 	}
 
-	KviSockaddr sa(prx ? m_pProxy->ip() : m_pIrcServer->ip().toUtf8().data(),prx ? m_pProxy->port() : m_pIrcServer->port(),bTargetIpV6);
+	KviSockaddr sa(prx ? m_pProxy->ip() : m_pIrcServer->ip().toUtf8().data(),prx ? m_pProxy->port() : m_pIrcServer->port(),bTargetIPv6);
 
 	if(!sa.socketAddress())return KviError_invalidIpAddress;
 
 	// create the socket
 #ifdef COMPILE_IPV6_SUPPORT
-	m_sock = kvi_socket_create(bTargetIpV6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
+	m_sock = kvi_socket_create(bTargetIPv6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #else
 	m_sock = kvi_socket_create(KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #endif
@@ -324,7 +324,7 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 	if(bindAddress)
 	{
 		// we have to bind the socket to a local address
-		KviSockaddr localSa(bindAddress,0,bTargetIpV6);
+		KviSockaddr localSa(bindAddress,0,bTargetIPv6);
 		bool bBindOk = localSa.socketAddress();
 
 		if(bBindOk)
@@ -657,7 +657,7 @@ void KviIrcSocket::proxyLoginHttp()
 
 void KviIrcSocket::proxyLoginV4()
 {
-	// SOCKSV4 protocol
+	// SOCKSv4 protocol
 	//
 	// 1) CONNECT
 	//
@@ -684,7 +684,7 @@ void KviIrcSocket::proxyLoginV4()
 	// or when the request is rejected or the operation fails. 
 	//
 	if(_OUTPUT_VERBOSE)
-		outputProxyMessage(__tr2qs("Using SOCKSV4 protocol."));
+		outputProxyMessage(__tr2qs("Using SOCKSv4 protocol."));
 
 	m_pProxy->normalizeUserAndPass();
 	// the protocol does not specify the "userid" format...
@@ -720,7 +720,7 @@ void KviIrcSocket::proxyLoginV4()
 
 void KviIrcSocket::proxyLoginV5()
 {
-	// SOCKSV5 protocol.
+	// SOCKSv5 protocol.
 	//
 	// When a TCP-based client wishes to establish a connection to an object
 	// that is reachable only via a firewall (such determination is left up
@@ -892,7 +892,7 @@ void KviIrcSocket::proxySendTargetDataV5()
 		&& m_pIrcServer->cacheIp()
 		);
 	int bufLen = bRemoteDns ? 4 + 1 + m_pIrcServer->hostName().toUtf8().length() + 2
-		: (m_pIrcServer->isIpV6() ? 22 : 10);
+		: (m_pIrcServer->isIPv6() ? 22 : 10);
 	char * bufToSend = (char *)kvi_malloc(sizeof(char) * bufLen);
 	bufToSend[0]=(unsigned char)5;           //Proto 5
 	bufToSend[1]=(unsigned char)1;           //CONNECT
@@ -904,7 +904,7 @@ void KviIrcSocket::proxySendTargetDataV5()
 		bufToSend[3]=3;
 		bufToSend[4]=m_pIrcServer->hostName().toUtf8().length();		
 	} else {
-		bufToSend[3]=(unsigned char)m_pIrcServer->isIpV6() ? 4 : 1; // IPV6 : IPV4
+		bufToSend[3]=(unsigned char)m_pIrcServer->isIPv6() ? 4 : 1; // IPV6 : IPV4
 	}
 
 	if(bRemoteDns)
@@ -914,7 +914,7 @@ void KviIrcSocket::proxySendTargetDataV5()
 			m_pIrcServer->hostName().toUtf8().length());
 		quint16 port = (quint16)htons(m_pIrcServer->port());
 		kvi_memmove((void *)(bufToSend + 4 + 1 + m_pIrcServer->hostName().toUtf8().length()),(void *)&port,2);
-	} else if(m_pIrcServer->isIpV6()) {
+	} else if(m_pIrcServer->isIPv6()) {
 #ifdef COMPILE_IPV6_SUPPORT
 		struct in6_addr ircInAddr;
 
@@ -1804,11 +1804,11 @@ handle_system_error:
 	//flushed completely ...
 }
 
-bool KviIrcSocket::getLocalHostIp(QString &szIp,bool bIpV6)
+bool KviIrcSocket::getLocalHostIp(QString &szIp,bool bIPv6)
 {
 	if(m_state != Connected)return false;
 
-	if(bIpV6)
+	if(bIPv6)
 	{
 #ifdef COMPILE_IPV6_SUPPORT
 		struct sockaddr_in6 name;
diff --git a/src/kvirc/kernel/kvi_ircsocket.h b/src/kvirc/kernel/kvi_ircsocket.h
index b3584a5d3..3378ef1f8 100644
--- a/src/kvirc/kernel/kvi_ircsocket.h
+++ b/src/kvirc/kernel/kvi_ircsocket.h
@@ -123,7 +123,7 @@ public:
 	//bool sendFmtData(const char *fmt,...) KVI_DEPRECATED;
 	bool sendPacket(KviDataBuffer * pData);
 	void abort();
-	bool getLocalHostIp(QString &szIp,bool bIpV6);
+	bool getLocalHostIp(QString &szIp,bool bIPv6);
 protected slots:
 	void connectionTimedOut();
 	void writeNotifierFired(int);
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
index 99c5b60a7..1892dbcb1 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/kvi_ircurl.cpp
@@ -45,7 +45,7 @@ bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec)
 	KviStr szUrl = url;
 	//szUrl.replaceAll("$","\\$");
 	//szUrl.replaceAll(";","\\;");
-	bool bIpV6 = false;
+	bool bIPv6 = false;
 	bool bSSL = false;
 	KviStr szServer;
 	kvi_u32_t uPort = 0;
@@ -55,7 +55,7 @@ bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec)
 		szUrl.cutLeft(6);
 	} else if(kvi_strEqualCIN(szUrl.ptr(),"irc6://",7))
 	{
-		bIpV6 = true;
+		bIPv6 = true;
 		szUrl.cutLeft(7);
 	} else if(kvi_strEqualCIN(szUrl.ptr(),"ircs://",7))
 	{
@@ -63,7 +63,7 @@ bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec)
 		szUrl.cutLeft(7);
 	} else if(kvi_strEqualCIN(szUrl.ptr(),"ircs6://",8))
 	{
-		bIpV6 = true;
+		bIPv6 = true;
 		bSSL = true;
 		szUrl.cutLeft(8);
 	} else return false;
@@ -106,7 +106,7 @@ bool KviIrcUrl::parse(const char * url,KviStr &cmdBuffer,int contextSpec)
 			cmdBuffer.append("-n ");
 			break;
 	}
-	if(bIpV6)cmdBuffer.append(" -i ");
+	if(bIPv6)cmdBuffer.append(" -i ");
 	if(bSSL)cmdBuffer.append(" -s ");
 
 	if(szUrl.hasData())
@@ -147,7 +147,7 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result)
 
 	//defaults
 	result.bSsl=false;
-	result.bIpV6=false;
+	result.bIPv6=false;
 	result.iPort = 6667;
 	result.iError=0;
 
@@ -161,7 +161,7 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result)
 				url = url.right(url.length()-1);
 			}
 			if(KviQString::equalCIN(url,"6",1)) {
-				result.bIpV6=true;
+				result.bIPv6=true;
 				url = url.right(url.length()-1);
 			}
 			if(!KviQString::equalCIN(url,"://",3)) {
@@ -217,7 +217,7 @@ void KviIrcUrl::join(QString &uri, KviServer* server)
 		uri="irc";
 		
 		if(server->useSSL()) uri.append("s");
-		if(server->isIpV6()) uri.append("6");
+		if(server->isIPv6()) uri.append("6");
 
 		uri.append("://");
 		uri.append(server->hostName());
@@ -303,7 +303,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole)
 		makeJoinCmd(parts.chanList,szJoinCommand);
 		QString szCommand("server ");
 		if(parts.bSsl) szCommand.append("-s ");
-		if(parts.bIpV6) szCommand.append("-i ");
+		if(parts.bIPv6) szCommand.append("-i ");
 		if(!szJoinCommand.isEmpty()){
 			szCommand.append("-c=\"");
 			szCommand.append(szJoinCommand);
@@ -317,7 +317,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole)
 				( server->hostName() != parts.szHost ) ||
 				( server->port() != parts.iPort ) ||
 				( server->useSSL() != parts.bSsl ) ||
-				( server->isIpV6() != parts.bIpV6) )
+				( server->isIPv6() != parts.bIPv6) )
 			{ // New server, try to reconnect
 				KviKvsScript::run(szCommand,(contextSpec & TryCurrentContext) ? g_pFrame->createNewConsole() : pConsole);
 				return parts.iError;
diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/kvi_ircurl.h
index 09cbb63e2..9515a94ad 100644
--- a/src/kvirc/kernel/kvi_ircurl.h
+++ b/src/kvirc/kernel/kvi_ircurl.h
@@ -42,7 +42,7 @@ class KviConsole;
 typedef  struct _KviIrcUrlParts {
 		QString szHost;
 		kvi_u32_t iPort;
-		bool bIpV6;
+		bool bIPv6;
 		bool bSsl;
 		QStringList chanList;
 		int iError;
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index ba1941a96..a82d7493a 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -153,8 +153,8 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("UseIntelligentNotifyListManager",true,KviOption_sectFlagConnection | KviOption_resetRestartNotifyList),
 	BOOL_OPTION("UseWatchListIfAvailable",true,KviOption_sectFlagConnection),
 	BOOL_OPTION("UseTreeWindowListTaskBar",true,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar | KviOption_groupTheme),
-	BOOL_OPTION("BindIrcIpV4ConnectionsToSpecifiedAddress",false,KviOption_sectFlagConnection),
-	BOOL_OPTION("BindIrcIpV6ConnectionsToSpecifiedAddress",false,KviOption_sectFlagConnection),
+	BOOL_OPTION("BindIrcIPv4ConnectionsToSpecifiedAddress",false,KviOption_sectFlagConnection),
+	BOOL_OPTION("BindIrcIPv6ConnectionsToSpecifiedAddress",false,KviOption_sectFlagConnection),
 	BOOL_OPTION("UseAntiSpamOnNotice",false,KviOption_sectFlagAntiSpam),
 	BOOL_OPTION("SetLastAvatarAsDefaultForRegisteredUsers",true,KviOption_sectFlagAvatar),
 	BOOL_OPTION("CantAcceptIncomingDccConnections",false,KviOption_sectFlagDcc),
@@ -174,11 +174,11 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("UseIdentService",false,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
 #endif
 	BOOL_OPTION("ShowTipAtStartup",false,KviOption_sectFlagFrame),
-	BOOL_OPTION("IdentdEnableIpV6",false,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
+	BOOL_OPTION("IdentdEnableIPv6",false,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	BOOL_OPTION("IdentdIpV6ContainsIpV4",false,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
+	BOOL_OPTION("IdentdIPv6ContainsIPv4",false,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
 #else
-	BOOL_OPTION("IdentdIpV6ContainsIpV4",true,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
+	BOOL_OPTION("IdentdIPv6ContainsIPv4",true,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
 #endif
 	BOOL_OPTION("ScaleAvatars",true,KviOption_sectFlagAvatar | KviOption_resetUpdateGui | KviOption_groupTheme),
 	BOOL_OPTION("ColorNicks",false,KviOption_sectFlagIrcView | KviOption_groupTheme),
@@ -352,8 +352,8 @@ KviStringOption g_stringOptionsTable[KVI_NUM_STRING_OPTIONS]=
 	STRING_OPTION("UrlFileCommand","play $0",KviOption_sectFlagUrl),
 	STRING_OPTION("NickCompletionPostfix",": ",KviOption_sectFlagInput),
 	STRING_OPTION("UrlUnknownCommand",RUN_THE_BROWSER,KviOption_sectFlagUrl),
-	STRING_OPTION("IpV4ConnectionBindAddress","",KviOption_sectFlagConnection),
-	STRING_OPTION("IpV6ConnectionBindAddress","",KviOption_sectFlagConnection),
+	STRING_OPTION("IPv4ConnectionBindAddress","",KviOption_sectFlagConnection),
+	STRING_OPTION("IPv6ConnectionBindAddress","",KviOption_sectFlagConnection),
 	STRING_OPTION("DccVoiceSoundDevice", "/dev/dsp",KviOption_sectFlagDcc),
 	STRING_OPTION("DccVoiceMixerDevice", "/dev/mixer",KviOption_sectFlagDcc),
 	STRING_OPTION("AwayMessage",KVI_DEFAULT_AWAY_MESSAGE,KviOption_sectFlagConnection),
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 8071fe163..467e5ce5f 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -168,8 +168,8 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_boolUseIntelligentNotifyListManager 74             /* ircengine::notifylist */
 #define KviOption_boolUseWatchListIfAvailable 75                     /* ircengine::notifylist */
 #define KviOption_boolUseTreeWindowListTaskBar 76                    /* interface::features::global */
-#define KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress 77    /* connection::transport */
-#define KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress 78    /* connection::transport */
+#define KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress 77    /* connection::transport */
+#define KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress 78    /* connection::transport */
 #define KviOption_boolUseAntiSpamOnNotice 79                         /* ircengine::antispam */
 #define KviOption_boolSetLastAvatarAsDefaultForRegisteredUsers 80    /* irc::ctcp::avatar */
 #define KviOption_boolCantAcceptIncomingDccConnections 81            /* dcc::general */
@@ -185,8 +185,8 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted 91     /* dcc::voice */
 #define KviOption_boolUseIdentService 92                             /* connection::ident */
 #define KviOption_boolShowTipAtStartup 93                            /* internal */
-#define KviOption_boolIdentdEnableIpV6 94                            /* connection::ident */
-#define KviOption_boolIdentdIpV6ContainsIpV4 95                      /* connection::ident */
+#define KviOption_boolIdentdEnableIPv6 94                            /* connection::ident */
+#define KviOption_boolIdentdIPv6ContainsIPv4 95                      /* connection::ident */
 #define KviOption_boolScaleAvatars 96                                /* ctcp::avatar */
 #define KviOption_boolColorNicks 97                                  /* interface::features::components::ircview */
 #define KviOption_boolBoldedNicks 98                                 /* interface::features::components::ircview */	
@@ -346,8 +346,8 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_stringUrlFileCommand 20                            /* urlhandlers */
 #define KviOption_stringNickCompletionPostfix 21
 #define KviOption_stringUrlUnknownCommand 22                         /* urlhandlers */
-#define KviOption_stringIpV4ConnectionBindAddress 23                 /* connection::transport */
-#define KviOption_stringIpV6ConnectionBindAddress 24                 /* connection::transport */
+#define KviOption_stringIPv4ConnectionBindAddress 23                 /* connection::transport */
+#define KviOption_stringIPv6ConnectionBindAddress 24                 /* connection::transport */
 #define KviOption_stringDccVoiceSoundDevice	25                       /* dcc::voice */
 #define KviOption_stringDccVoiceMixerDevice	26                       /* dcc::voice */
 #define KviOption_stringAwayMessage 27                               /* irc::away */
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index a82cd78c7..21b48d6a7 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -69,9 +69,9 @@ namespace KviKvsCoreCallbackCommands
 			Starts a DNS lookup for the <dnsquery> and reports the
 			results by calling the callback routine.
 			The -i switch causes the command to execute
-			in IpV6 mode (and lookup ONLY IpV6 hosts!).[br]
+			in IPv6 mode (and lookup ONLY IPv6 hosts!).[br]
 			The -a switch causes the command to run in "unspecified" mode
-			and return any available address: IpV4 or Ipv6.[br]
+			and return any available address: IPv4 or Ipv6.[br]
 			This command also performs reverse lookups (if you pass an IP address as <hostname>).[br]
 			The callback command gets passed five parameters:[br]
 			$0 contains the query string (<dnsquery> in fact)[br]
@@ -88,10 +88,10 @@ namespace KviKvsCoreCallbackCommands
 			reason then your callback MAY be called even before ahost() returns.[br]
 		@switches:
 			!sw: -i
-			Causes the command to execute in IpV6 mode (and lookup ONLY IpV6 hosts!).
+			Causes the command to execute in IPv6 mode (and lookup ONLY IPv6 hosts!).
 			!sw: -a
 			The -a switch causes the command to run in "unspecified" mode
-			and return any available address: IpV4 or Ipv6.
+			and return any available address: IPv4 or Ipv6.
 		@examples:
 			[example]
 			ahost("localhost")
@@ -143,8 +143,8 @@ namespace KviKvsCoreCallbackCommands
 			KVSCCC_PARAMETER("magic",KVS_PT_VARIANT,KVS_PF_OPTIONAL,pMagicPtr)
 		KVSCCC_PARAMETERS_END
 
-		KviDns::QueryType queryType = KviDns::IpV4;
-		if(KVSCCC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6;
+		KviDns::QueryType queryType = KviDns::IPv4;
+		if(KVSCCC_pSwitches->find('i',"ipv6"))queryType = KviDns::IPv6;
 		if(KVSCCC_pSwitches->find('a',"any"))queryType = KviDns::Any;
 
 		KviKvsVariant * pMagic = pMagicPtr ? new KviKvsVariant(*pMagicPtr) : new KviKvsVariant();
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 01160ea11..2ccd532a7 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -259,9 +259,9 @@ try_again:
 			Starts a DNS lookup for the <dnsquery> (hostname) and prints
 			the results in the current window.[br]
 			The -i switch causes the command to execute
-			in IpV6 mode (and lookup ONLY IpV6 hosts!).[br]
+			in IPv6 mode (and lookup ONLY IPv6 hosts!).[br]
 			The -a switch causes the command to run in "unspecified" mode
-			and return any available address: IpV4 or Ipv6.[br]
+			and return any available address: IPv4 or Ipv6.[br]
 			This command also performs reverse lookups (if you pass an IP address as <hostname>).[br]
 		@examples:
 			[example]
@@ -284,8 +284,8 @@ try_again:
 			KVSCSC_PARAMETER("dnsquery",KVS_PT_NONEMPTYSTRING,0,szQuery)
 		KVSCSC_PARAMETERS_END
 
-		KviDns::QueryType queryType = KviDns::IpV4;
-		if(KVSCSC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6;
+		KviDns::QueryType queryType = KviDns::IPv4;
+		if(KVSCSC_pSwitches->find('i',"ipv6"))queryType = KviDns::IPv6;
 		if(KVSCSC_pSwitches->find('a',"any"))queryType = KviDns::Any;
 
 		KviKvsAsyncDnsOperation * op = new KviKvsAsyncDnsOperation(
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
index 492cec98f..cc4bb3c03 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
@@ -278,9 +278,9 @@ namespace KviKvsCoreSimpleCommands
 			d->szLinkFilter = szSocketFilter;
 			d->bPortIsOk = (uPort > 0);
 #ifdef COMPILE_IPV6_SUPPORT
-			d->bUseIpV6 = (KVSCSC_pSwitches->find('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer);
+			d->bUseIPv6 = (KVSCSC_pSwitches->find('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer);
 #else
-			d->bUseIpV6 = false;
+			d->bUseIPv6 = false;
 #endif
 			d->szCommandToExecAfterConnect = szCmd;
 			d->szBindAddress = szBindAddress;
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index cae307e2c..3d19e28eb 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1701,7 +1701,7 @@ void KviServerParser::parseCtcpRequestDcc(KviCtcpMessage *msg)
 	msg->pData    = extractCtcpParameter(msg->pData,p.szParam4);
 	msg->pData    = extractCtcpParameter(msg->pData,p.szParam5);
 	p.ctcpMsg     = msg;
-	p.bIpV6       = msg->msg->console()->isIpV6Connection();
+	p.bIPv6       = msg->msg->console()->isIPv6Connection();
 	p.pConsole    = msg->msg->console();
 
 	KviRegisteredUser * u = msg->msg->connection()->userDataBase()->registeredUser(msg->pSource->nick(),msg->pSource->user(),msg->pSource->host());
diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/kvi_sparser.h
index 1fb551bf3..6fdb4e885 100644
--- a/src/kvirc/sparser/kvi_sparser.h
+++ b/src/kvirc/sparser/kvi_sparser.h
@@ -82,7 +82,7 @@ typedef struct _KviDccRequest
 	KviStr           szParam3;
 	KviStr           szParam4;
 	KviStr           szParam5;
-	bool             bIpV6;
+	bool             bIPv6;
 	KviCtcpMessage * ctcpMsg;
 	KviConsole     * pConsole;
 } KviDccRequest;
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 14977d2fe..ae27a8195 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -537,10 +537,10 @@ void KviConsole::connectionDetached()
 	m_pNotifyListView->setUserDataBase(0); // this is rather for crash tests
 }
 
-bool KviConsole::isIpV6Connection()
+bool KviConsole::isIPv6Connection()
 {
 	__range_valid(connection());
-	return connection()->server()->isIpV6();
+	return connection()->server()->isIPv6();
 }
 
 void KviConsole::closeEvent(QCloseEvent *e)
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index d7d9aca19..b303c7f62 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -135,7 +135,7 @@ public:
 	
 	// these should disappear!
 	bool isConnected(){ return context()->isConnected(); };
-	bool isIpV6Connection();
+	bool isIPv6Connection();
 	bool isNotConnected();
 	bool connectionInProgress();
 	//
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index dda43d2d6..8db64f314 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -72,7 +72,7 @@ void KviIpEditor::setEnabled(bool bEnabled)
 
 void KviIpEditor::setAddressType(AddressType addrType)
 {
-	if((addrType != IpV4) && (addrType != IpV6))m_addrType = IpV4;
+	if((addrType != IPv4) && (addrType != IPv6))m_addrType = IPv4;
 	else m_addrType = addrType;
 	recreateChildren();
 }
@@ -98,7 +98,7 @@ bool KviIpEditor::hasEmptyFields() const
 void KviIpEditor::clear()
 {
 	if(!m_pEdit[0])return;
-	int maxW = (m_addrType == IpV4) ? 4 : 8;
+	int maxW = (m_addrType == IPv4) ? 4 : 8;
 	for(int i=0;i< maxW ;i++)
 	{
 		m_pEdit[i]->setText("");
@@ -111,14 +111,14 @@ bool KviIpEditor::setAddress(const QString &ipAddr)
 	//       is valid before effectively setting the fields
 	clear();
 
-	KviQCString ip = ipAddr.toAscii(); // ip addresses are digits & latin letters abcdef (IpV6)
+	KviQCString ip = ipAddr.toAscii(); // ip addresses are digits & latin letters abcdef (IPv6)
 
 	ip = ip.trimmed();
 	const char * c = ip.data();
 
 	if(!c)return false; // huh ?....(should never happen at this point)
 
-	if(m_addrType == IpV4)
+	if(m_addrType == IPv4)
 	{
 		for(int i=0;i<4;i++)
 		{
@@ -158,7 +158,7 @@ QString KviIpEditor::address() const
 {
 	QString ret;
 
-	if(m_addrType == IpV6)
+	if(m_addrType == IPv6)
 	{
 		for(int i=0;i<8;i++)
 		{
@@ -183,10 +183,10 @@ QString KviIpEditor::address() const
 void KviIpEditor::recreateChildren()
 {
 	// A bit slow , but compact
-	bool bIpV4 = (m_addrType == IpV4);
-	int max = bIpV4 ? 4 : 8;
+	bool bIPv4 = (m_addrType == IPv4);
+	int max = bIPv4 ? 4 : 8;
 	QFontMetrics fm(font());
-	//int minWidth = fm.width(bIpV4 ? "000" : "AAAA") + 4;
+	//int minWidth = fm.width(bIPv4 ? "000" : "AAAA") + 4;
 	for(int i=0;i<max;i++)
 	{
 		if(!m_pEdit[i]){
@@ -196,19 +196,19 @@ void KviIpEditor::recreateChildren()
 			m_pEdit[i]->setAlignment(Qt::AlignCenter);
 		}
 		//m_pEdit[i]->setMinimumWidth(minWidth);
-		m_pEdit[i]->setMaxLength(bIpV4 ? 3 : 4);
+		m_pEdit[i]->setMaxLength(bIPv4 ? 3 : 4);
 		m_pEdit[i]->show();
 		if(i < (max - 1))
 		{
 			if(!m_pLabel[i])m_pLabel[i] = new QLabel(this);
-			m_pLabel[i]->setText(bIpV4 ? "." : ":");
+			m_pLabel[i]->setText(bIPv4 ? "." : ":");
 			m_pLabel[i]->show();
 			// Is this the right way ? setBackgroundMode seems to not work well
 			m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background);
 		}
 	}
 	// Kill the unused widgets , if any
-	if(bIpV4)
+	if(bIPv4)
 	{
 		for(int i=4;i<8;i++)
 		{
@@ -247,7 +247,7 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e)
 				}
 			}
 			if(edIdx == -1)return QFrame::eventFilter(o,e); // user added QLineEdit child ?
-			int edMax = (m_addrType == IpV4) ? 3 : 7;
+			int edMax = (m_addrType == IPv4) ? 3 : 7;
 			int cursorPos = ((QLineEdit *)o)->cursorPosition();
 			switch(((QKeyEvent *)e)->key())
 			{
@@ -286,7 +286,7 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e)
 				default:
 					// a normal key (this part substitutes a QValidator)
 					const char c = tolower(((QKeyEvent *)e)->text().toAscii().at(0));
-					if(m_addrType == IpV4)
+					if(m_addrType == IPv4)
 					{
 						if((c >= '0') && (c <= '9'))
 						{
@@ -375,7 +375,7 @@ void KviIpEditor::resizeEvent(QResizeEvent *e)
 {
 	if(m_pEdit[0])
 	{
-		int maxW = (m_addrType == IpV4) ? 4 : 8;
+		int maxW = (m_addrType == IPv4) ? 4 : 8;
 		int labHint = m_pLabel[0]->sizeHint().width();
 		int hghHint = height() - 4;
 		int ediWdth = ((width() - 4) - ((maxW - 1) * labHint)) / maxW;
@@ -401,7 +401,7 @@ QSize KviIpEditor::sizeHint()
 		int labHint = m_pLabel[0]->sizeHint().width();
 		int hghHint = m_pEdit[0]->sizeHint().height();
 		int ediHint = m_pEdit[0]->sizeHint().width();
-		if(m_addrType == IpV4)return QSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4);
+		if(m_addrType == IPv4)return QSize((labHint * 3) + (ediHint * 4) + 4,hghHint + 4);
 		else return QSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4);
 	} else return QFrame::sizeHint();
 }
diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h
index 9042ded7a..189158905 100644
--- a/src/kvirc/ui/kvi_ipeditor.h
+++ b/src/kvirc/ui/kvi_ipeditor.h
@@ -36,8 +36,8 @@ class KVIRC_API KviIpEditor : public QFrame
 {
 	Q_OBJECT
 public:
-	enum AddressType { IpV4 , IpV6 };
-	KviIpEditor(QWidget * parent,AddressType = IpV4,const QString &ipAddr = QString::null,const char *name = 0);
+	enum AddressType { IPv4 , IPv6 };
+	KviIpEditor(QWidget * parent,AddressType = IPv4,const QString &ipAddr = QString::null,const char *name = 0);
 	~KviIpEditor();
 private:
 	QLabel      * m_pLabel[7];
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 92c8cc453..85fafc2f9 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -46,12 +46,12 @@ SUBDIRS(
 	# perl, perlcore
 
 	# forgotten ?
-	# offer
+	# offer, proxydb, serverdb
 )
-

-# this is currently broken on MINGW because of some virtual functions

-# messing up linker's brain

-

-IF(NOT MINGW)

-        ADD_SUBDIRECTORY( rijndael )
+
+# this is currently broken on MINGW because of some virtual functions
+# messing up linker's brain
+
+IF(NOT MINGW)
+	ADD_SUBDIRECTORY(rijndael)
 ENDIF()
\ No newline at end of file
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index 6f3851c38..81af9f75f 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -185,7 +185,7 @@ STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 
 STANDARD_IRC_CONNECTION_TARGET_PARAMETER(
 		context_kvs_fnc_serverIsIPV6,
-		c->returnValue()->setBoolean(pConnection->target()->server()->isIpV6())
+		c->returnValue()->setBoolean(pConnection->target()->server()->isIPv6())
 	)
 
 /*
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 70f3358a4..f362f2f94 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -1255,7 +1255,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 	} else {
 		if(d->console()->isConnected())
 		{
-			d->console()->socket()->getLocalHostIp(d->szListenIp,d->console()->isIpV6Connection());
+			d->console()->socket()->getLocalHostIp(d->szListenIp,d->console()->isIPv6Connection());
 		} else d->szListenIp = "127.0.0.1"; // huh ? :)
 	}
 
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index b970f6334..5f6aa6b3b 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -41,7 +41,7 @@ KviDccMarshal::KviDccMarshal(KviDccMarshalOutputContext * ctx)
 	m_pSn                   = 0;
 	m_fd                    = KVI_INVALID_SOCKET;
 	m_pTimeoutTimer         = 0;
-	m_bIpV6                 = false;
+	m_bIPv6                 = false;
 	m_pOutputContext        = ctx;
 #ifdef COMPILE_SSL_SUPPORT
 	m_pSSL                  = 0;
@@ -99,7 +99,7 @@ void KviDccMarshal::reset()
 		delete m_pTimeoutTimer;
 		m_pTimeoutTimer = 0;
 	}
-	m_bIpV6 = false;
+	m_bIPv6 = false;
 }
 
 int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTimeout,bool bUseSSL)
@@ -145,7 +145,7 @@ void KviDccMarshal::doListen()
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
-		} else m_bIpV6 = true;
+		} else m_bIPv6 = true;
 #else
 		emit error(KviError_invalidIpAddress);
 		return;
@@ -161,16 +161,16 @@ void KviDccMarshal::doListen()
 	}
 
 #ifndef COMPILE_IPV6_SUPPORT
-	if(m_bIpV6)
+	if(m_bIPv6)
 	{
-		emit error(KviError_noIpV6Support);
+		emit error(KviError_noIPv6Support);
 		return;
 	}
 #endif
 
 
 #ifdef COMPILE_IPV6_SUPPORT
-	m_fd = kvi_socket_create(m_bIpV6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
+	m_fd = kvi_socket_create(m_bIPv6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
 								KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #else
 	m_fd = kvi_socket_create(KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
@@ -185,7 +185,7 @@ void KviDccMarshal::doListen()
 	if((!KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)) || (m_uPort != 0))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
+		KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIPv6);
 #else
 		KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
 #endif
@@ -210,7 +210,7 @@ void KviDccMarshal::doListen()
 		bool bBindSuccess;
 		do {
 #ifdef COMPILE_IPV6_SUPPORT
-			KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
+			KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIPv6);
 #else
 			KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
 #endif
@@ -256,7 +256,7 @@ void KviDccMarshal::doListen()
 	// Reread the port in case we're binding to a random one (0)
 
 #ifdef COMPILE_IPV6_SUPPORT
-	KviSockaddr sareal(0,m_bIpV6);
+	KviSockaddr sareal(0,m_bIPv6);
 #else
 	KviSockaddr sareal(0,false);
 #endif
@@ -336,7 +336,7 @@ void KviDccMarshal::doConnect()
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
-		} else m_bIpV6 = true;
+		} else m_bIPv6 = true;
 #else
 		emit error(KviError_invalidIpAddress);
 		return;
@@ -354,7 +354,7 @@ void KviDccMarshal::doConnect()
 
 	// create the socket
 #ifdef COMPILE_IPV6_SUPPORT
-	m_fd = kvi_socket_create(m_bIpV6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
+	m_fd = kvi_socket_create(m_bIPv6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
 					KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #else
 	m_fd = kvi_socket_create(KVI_SOCKET_PF_INET,
@@ -378,7 +378,7 @@ void KviDccMarshal::doConnect()
 	// fill the sockaddr structure
 
 #ifdef COMPILE_IPV6_SUPPORT
-	KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
+	KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIPv6);
 #else
 	KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
 #endif
@@ -453,7 +453,7 @@ void KviDccMarshal::snActivated(int)
 	struct sockaddr * addr = (struct sockaddr *)&hostSockAddr;
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(m_bIpV6)
+	if(m_bIPv6)
 	{
 		addr = (struct sockaddr *)&hostSockAddr6;
 		size = sizeof(hostSockAddr6);
@@ -486,7 +486,7 @@ void KviDccMarshal::snActivated(int)
 			m_szSecondaryPort = __tr2qs_ctx("unknown","dcc");
 		} else {
 #ifdef COMPILE_IPV6_SUPPORT
-			if(m_bIpV6)
+			if(m_bIPv6)
 			{
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in6 *)addr)->sin6_port));
 				if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
@@ -509,7 +509,7 @@ void KviDccMarshal::snActivated(int)
 			delete m_pSn;
 			m_pSn = 0;
 #ifdef COMPILE_IPV6_SUPPORT
-			if(m_bIpV6)
+			if(m_bIPv6)
 			{
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in6 *)addr)->sin6_port));
 				if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
diff --git a/src/modules/dcc/marshal.h b/src/modules/dcc/marshal.h
index b7d19e7fe..9470a7862 100644
--- a/src/modules/dcc/marshal.h
+++ b/src/modules/dcc/marshal.h
@@ -60,7 +60,7 @@ protected:
 	QString                      m_szIp;                    // Dcc initiator ip address (the one that listens)
 	QString                      m_szPort;                  // Dcc initiator port (the one that listens)
 	// other info
-	bool                         m_bIpV6;                   // Dcc mode
+	bool                         m_bIPv6;                   // Dcc mode
 	kvi_u32_t                    m_uPort;                   // Dcc initiator port
 	bool                         m_bOutgoing;               // true if WE have connected to the remote host (so m_szIp is the remote host ip)
 	QString                      m_szSecondaryIp;           // Ip of the client that has connected to the remote host
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 308b084df..5828a7dd9 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -185,7 +185,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 			struct in6_addr addr6;
 			if(kvi_stringIpToBinaryIp_V6(ipaddr,&addr6))
 			{
-				dcc->bIpV6 = true;
+				dcc->bIPv6 = true;
 				return true; // IPV6 address.
 			}
 #endif
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index 9f8e10735..f6e0bf721 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -47,7 +47,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
 			{
 				if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0"))
 				{
-					// Try to find the first available IpV4 interface
+					// Try to find the first available IPv4 interface
 					if(!kvi_getLocalHostAddress(szListenIp))
 					{
 						if(c)c->warning(__tr2qs_ctx("Can't retrieve a suitable local IPV4 address","dcc"),
@@ -87,7 +87,7 @@ bool dcc_module_get_listen_ip_address(KviCommand *c,KviConsole * pConsole,QStrin
 		if(pConsole->isConnected())
 		{
 			//#warning "The IPV6 choice is not OK here.... and maybe allow to bind to specified ports"
-			pConsole->socket()->getLocalHostIp(szListenIp,pConsole->isIpV6Connection());
+			pConsole->socket()->getLocalHostIp(szListenIp,pConsole->isIPv6Connection());
 		} else {
 			szListenIp = "0.0.0.0"; // huh ? :)
 		}
@@ -115,7 +115,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 			{
 				if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0"))
 				{
-					// Try to find the first available IpV4 interface
+					// Try to find the first available IPv4 interface
 					if(!kvi_getLocalHostAddress(szListenIp))
 					{
 						if(c)c->warning(__tr2qs_ctx("Can't retrieve a suitable local IPV4 address","dcc"),
@@ -155,7 +155,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 		if(pConsole->isConnected())
 		{
 			//#warning "The IPV6 choice is not OK here.... and maybe allow to bind to specified ports"
-			pConsole->socket()->getLocalHostIp(szListenIp,pConsole->isIpV6Connection());
+			pConsole->socket()->getLocalHostIp(szListenIp,pConsole->isIPv6Connection());
 		} else {
 			szListenIp = "0.0.0.0"; // huh ? :)
 		}
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 7fff2cb42..b3c69af91 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -151,11 +151,11 @@ KviIdentDaemon::KviIdentDaemon()
 	if(m_szUser.isEmpty())m_szUser = "kvirc";
 	m_uPort = KVI_OPTION_UINT(KviOption_uintIdentdPort);
 #ifdef COMPILE_IPV6_SUPPORT
-	m_bEnableIpV6 = KVI_OPTION_BOOL(KviOption_boolIdentdEnableIpV6);
+	m_bEnableIPv6 = KVI_OPTION_BOOL(KviOption_boolIdentdEnableIPv6);
 #else
-	m_bEnableIpV6 = false;
+	m_bEnableIPv6 = false;
 #endif
-	m_bIpV6ContainsIpV4 = KVI_OPTION_BOOL(KviOption_boolIdentdIpV6ContainsIpV4);
+	m_bIPv6ContainsIPv4 = KVI_OPTION_BOOL(KviOption_boolIdentdIPv6ContainsIPv4);
 //	debug("Thread constructor done");
 }
 
@@ -204,7 +204,7 @@ void KviIdentDaemon::run()
 #ifdef COMPILE_IPV6_SUPPORT
 	// If we have enabled ipv6 and we have to use a single socket: this one is IPV6
 	// otherwise this one is IPV4
-	KviSockaddr sa(m_uPort,m_bEnableIpV6 && m_bIpV6ContainsIpV4);
+	KviSockaddr sa(m_uPort,m_bEnableIPv6 && m_bIPv6ContainsIPv4);
 #else
 	KviSockaddr sa(m_uPort,false);
 #endif
@@ -212,7 +212,7 @@ void KviIdentDaemon::run()
 	KviIdentRequest * r;
 
 #ifdef COMPILE_IPV6_SUPPORT
-	m_sock = kvi_socket_create((m_bEnableIpV6 && m_bIpV6ContainsIpV4) ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
+	m_sock = kvi_socket_create((m_bEnableIPv6 && m_bIPv6ContainsIPv4) ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #else
 	m_sock = kvi_socket_create(KVI_SOCKET_PF_INET,KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #endif
@@ -249,7 +249,7 @@ void KviIdentDaemon::run()
 
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(m_bEnableIpV6 && (!m_bIpV6ContainsIpV4))
+	if(m_bEnableIPv6 && (!m_bIPv6ContainsIPv4))
 	{
 		// Need to start the IPV6 socket too
 		KviSockaddr sa6(m_uPort,true);
@@ -257,13 +257,13 @@ void KviIdentDaemon::run()
 
 		if(m_sock6 == KVI_INVALID_SOCKET)
 		{
-			postMessage(__tr("Can't start the ident service on IpV6 : socket() failed"),0);
+			postMessage(__tr("Can't start the ident service on IPv6 : socket() failed"),0);
 			goto ipv6_failure;
 		}
 
 		if(!kvi_socket_setNonBlocking(m_sock6))
 		{
-			postMessage(__tr("Can't start the ident service on IpV6 : async setting failed"),0);
+			postMessage(__tr("Can't start the ident service on IPv6 : async setting failed"),0);
 			kvi_socket_close(m_sock6);
 			m_sock6 = KVI_INVALID_SOCKET;
 			goto ipv6_failure;
@@ -271,7 +271,7 @@ void KviIdentDaemon::run()
 
 		if(!sa6.socketAddress())
 		{
-			postMessage(__tr("Can't enable the ident service on IpV6 : can't setup the listen address"),0);
+			postMessage(__tr("Can't enable the ident service on IPv6 : can't setup the listen address"),0);
 			kvi_socket_close(m_sock6);
 			m_sock6 = KVI_INVALID_SOCKET;
 			goto ipv6_failure;
@@ -279,7 +279,7 @@ void KviIdentDaemon::run()
 	
 		if(!kvi_socket_bind(m_sock6,sa6.socketAddress(),((int)(sa6.addressLength()))))
 		{
-			postMessage(__tr("Can't start the ident service on IpV6 : bind() failed"),0);
+			postMessage(__tr("Can't start the ident service on IPv6 : bind() failed"),0);
 			kvi_socket_close(m_sock6);
 			m_sock6 = KVI_INVALID_SOCKET;
 			goto ipv6_failure;
@@ -288,7 +288,7 @@ void KviIdentDaemon::run()
 	
 		if(!kvi_socket_listen(m_sock6,128))
 		{
-			postMessage(__tr("Can't start the ident service on IpV6 : listen() failed"),0);
+			postMessage(__tr("Can't start the ident service on IPv6 : listen() failed"),0);
 			kvi_socket_close(m_sock6);
 			m_sock6 = KVI_INVALID_SOCKET;
 			goto ipv6_failure;
@@ -300,23 +300,23 @@ void KviIdentDaemon::run()
 ipv6_failure:
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(m_bEnableIpV6)
+	if(m_bEnableIPv6)
 	{
 		if(m_sock6 != KVI_INVALID_SOCKET) {
 			if(_OUTPUT_PARANOIC)
-				postMessage(__tr("Starting identd service (IpV4/V6 on separate namespaces)"),0);
+				postMessage(__tr("Starting identd service (IPv4/V6 on separate namespaces)"),0);
 		} else {
 			if(_OUTPUT_PARANOIC)
-				postMessage(__tr("Starting identd service (IpV4/V6 in IpV6 namespace)"),0);
+				postMessage(__tr("Starting identd service (IPv4/V6 in IPv6 namespace)"),0);
 		}
 
 	} else {
 		if(_OUTPUT_PARANOIC)
-			postMessage(__tr("Starting identd service (IpV4)"),0);
+			postMessage(__tr("Starting identd service (IPv4)"),0);
 	}
 #else //!COMPILE_IPV6_SUPPORT
 	if(_OUTPUT_PARANOIC)
-		postMessage(__tr("Service startup (IpV4)"),0);
+		postMessage(__tr("Service startup (IPv4)"),0);
 #endif //!COMPILE_IPV6_SUPPORT
 
 
@@ -372,7 +372,7 @@ ipv6_failure:
 				if(FD_ISSET(m_sock,&rs))
 				{
 #ifdef COMPILE_IPV6_SUPPORT
-					KviSockaddr satmp(0,m_bEnableIpV6 && m_bIpV6ContainsIpV4);
+					KviSockaddr satmp(0,m_bEnableIPv6 && m_bIPv6ContainsIPv4);
 #else
 					KviSockaddr satmp(0,false);
 #endif
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index 422a9e517..64725fe87 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -71,8 +71,8 @@ public:
 private:
 	KviStr                    m_szUser;
 	kvi_u32_t        m_uPort;
-	bool                      m_bEnableIpV6;
-	bool                      m_bIpV6ContainsIpV4;
+	bool                      m_bEnableIPv6;
+	bool                      m_bIPv6ContainsIPv4;
 	kvi_socket_t              m_sock;
 	kvi_socket_t              m_sock6;
 	KviPointerList<KviIdentRequest> *  m_pRequestList;
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index 5109c62d3..adfeb713f 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -288,7 +288,7 @@ static bool my_kvs_fnc_serverIsIPV6(KviKvsModuleFunctionCall * c)
 	if(wnd)
 	{
 		if(wnd->connection())
-			c->returnValue()->setBoolean(wnd->connection()->server()->isIpV6());
+			c->returnValue()->setBoolean(wnd->connection()->server()->isIPv6());
 	}
 	return true;
 }
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 3996091c8..aabfdbcda 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -69,7 +69,7 @@ KviScriptSocketObject::KviScriptSocketObject(KviScriptObjectClass * cla,KviScrip
 	m_uInDataLen = 0;
 	m_pOutBuffer = new KviDataBuffer();
 	m_pFlushTimer = new QTimer();
-	m_bIpV6 = false;
+	m_bIPv6 = false;
 	m_uLocalPort = 0;
 	m_secondarySock = KVI_INVALID_SOCKET;
 	connect(m_pFlushTimer,SIGNAL(timeout()),this,SLOT(tryFlush()));
@@ -133,7 +133,7 @@ void KviScriptSocketObject::reset()
 	m_szRemoteIp.clear();
 	m_uLocalPort = 0;
 	m_szLocalIp.clear();
-	m_bIpV6 = false;
+	m_bIPv6 = false;
 }
 
 /*
@@ -410,7 +410,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject)
 	m_uInDataLen = 0;
 	m_pOutBuffer = new KviDataBuffer();
 	m_pFlushTimer = new QTimer();
-	m_bIpV6 = false;
+	m_bIPv6 = false;
 	m_uLocalPort = 0;
 	m_secondarySock = KVI_INVALID_SOCKET;
 	connect(m_pFlushTimer,SIGNAL(timeout()),this,SLOT(tryFlush()));
@@ -634,16 +634,16 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 	}
 	kvs_uint_t uLocalPort;
 	QString m_szLocalIp;
-	bool m_bIpV6;
+	bool m_bIPv6;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("local_port",KVS_PT_UNSIGNEDINTEGER,0,uLocalPort)
 		KVSO_PARAMETER("local_ip",KVS_PT_STRING,KVS_PF_OPTIONAL,m_szLocalIp)
-		KVSO_PARAMETER("bool_ipV6",KVS_PT_BOOLEAN,KVS_PF_OPTIONAL,m_bIpV6)
+		KVSO_PARAMETER("bool_ipV6",KVS_PT_BOOLEAN,KVS_PF_OPTIONAL,m_bIPv6)
 	KVSO_PARAMETERS_END(c)
 	m_uLocalPort=uLocalPort;
 
 #ifndef COMPILE_IPV6_SUPPORT
-	if(m_bIpV6)
+	if(m_bIPv6)
 	{
 		c->warning(__tr2qs("No IPV6 support in this executable"));
 		c->returnValue()->setBoolean(false);
@@ -664,7 +664,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 			if(kvi_isValidStringIp_V6(m_szLocalIp.toUtf8().data()))
 			{
 				bGotIp = true;
-				m_bIpV6 = true;
+				m_bIPv6 = true;
 			} else {
 #else
 				c->warning(__tr2qs("Invalid IP address specified ('%Q')"),&m_szLocalIp);
@@ -680,7 +680,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 
 
 #ifdef COMPILE_IPV6_SUPPORT
-	m_sock = kvi_socket_create(m_bIpV6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
+	m_sock = kvi_socket_create(m_bIPv6 ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,
 								m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #else
 	m_sock = kvi_socket_create(KVI_SOCKET_PF_INET,m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
@@ -697,7 +697,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 	if(!m_szLocalIp.isEmpty())
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		KviSockaddr sa(m_szLocalIp.toUtf8().data(),m_uLocalPort,m_bIpV6,m_bUdp);
+		KviSockaddr sa(m_szLocalIp.toUtf8().data(),m_uLocalPort,m_bIPv6,m_bUdp);
 #else
 		KviSockaddr sa(m_szLocalIp.toUtf8().data(),m_uLocalPort,false,m_bUdp);
 #endif
@@ -718,7 +718,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 		}
 	} else {
 #ifdef COMPILE_IPV6_SUPPORT
-		KviSockaddr sa(m_uLocalPort,m_bIpV6,m_bUdp);
+		KviSockaddr sa(m_uLocalPort,m_bIPv6,m_bUdp);
 #else
 		KviSockaddr sa(m_uLocalPort,false,m_bUdp);
 #endif
@@ -752,7 +752,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 	// Reread the port in case we're binding to a random one (0)
 
 #ifdef COMPILE_IPV6_SUPPORT
-	KviSockaddr sareal(0,m_bIpV6,m_bUdp);
+	KviSockaddr sareal(0,m_bIPv6,m_bUdp);
 #else
 	KviSockaddr sareal(0,false,m_bUdp);
 #endif
@@ -787,7 +787,7 @@ void KviKvsObject_socket::incomingConnection(int)
 	struct sockaddr * addr = (struct sockaddr *)&hostSockAddr;
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(m_bIpV6)
+	if(m_bIPv6)
 	{
 		addr = (struct sockaddr *)&hostSockAddr6;
 		size = sizeof(hostSockAddr6);
@@ -800,7 +800,7 @@ void KviKvsObject_socket::incomingConnection(int)
 	{
 		// Connected
 #ifdef COMPILE_IPV6_SUPPORT
-		if(m_bIpV6)
+		if(m_bIPv6)
 		{
 			m_uSecondaryPort = ntohs(((struct sockaddr_in6 *)addr)->sin6_port);
 			if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
@@ -833,7 +833,7 @@ void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const
 	m_uRemotePort = uPort;
 	m_szRemoteIp = szIp;
 #ifdef COMPILE_IPV6_SUPPORT
-	KviSockaddr sareal(0,m_bIpV6,m_bUdp);
+	KviSockaddr sareal(0,m_bIPv6,m_bUdp);
 #else
 	KviSockaddr sareal(0,false,m_bUdp);
 #endif
@@ -892,10 +892,10 @@ debug ("Socket created");
 
 	// create the socket
 #ifdef COMPILE_IPV6_SUPPORT
-	m_bIpV6 = sa.isIpV6();
-	m_sock = kvi_socket_create(sa.isIpV6() ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
+	m_bIPv6 = sa.isIPv6();
+	m_sock = kvi_socket_create(sa.isIPv6() ? KVI_SOCKET_PF_INET6 : KVI_SOCKET_PF_INET,m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #else
-	m_bIpV6 = false;
+	m_bIPv6 = false;
 	m_sock = kvi_socket_create(KVI_SOCKET_PF_INET,m_bUdp ? KVI_SOCKET_TYPE_DGRAM : KVI_SOCKET_TYPE_STREAM,KVI_SOCKET_PROTO_TCP);
 #endif
 
@@ -1056,7 +1056,7 @@ void KviKvsObject_socket::writeNotifierFired(int)
 		m_pSn->setEnabled(true);
 
 #ifdef COMPILE_IPV6_SUPPORT
-		KviSockaddr sareal(0,m_bIpV6,m_bUdp);
+		KviSockaddr sareal(0,m_bIPv6,m_bUdp);
 #else
 		KviSockaddr sareal(0,false,m_bUdp);
 #endif
@@ -1261,7 +1261,7 @@ void KviKvsObject_socket::reset()
 	m_szRemoteIp="";
 	m_uLocalPort = 0;
 	m_szLocalIp="";
-	m_bIpV6 = false;
+	m_bIPv6 = false;
 }
 unsigned int KviKvsObject_socket::readGetLength(KviKvsObjectFunctionCall *c)
 {
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index 28e078613..6a18bf51c 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -58,7 +58,7 @@ protected:
 	char             * m_pInBuffer;
 	unsigned int       m_uInBufferLen;
 	unsigned int       m_uInDataLen;
-	bool               m_bIpV6;
+	bool               m_bIPv6;
 	unsigned int       m_uConnectionId;
 
 	KviDataBuffer    * m_pOutBuffer;
@@ -132,7 +132,7 @@ protected:
 	char             * m_pInBuffer;
 	unsigned int       m_uInBufferLen;
 	unsigned int       m_uInDataLen;
-	bool               m_bIpV6;
+	bool               m_bIPv6;
 	unsigned int       m_uConnectionId;
 	kvs_uint_t m_uRemotePort;
 	KviDataBuffer    * m_pOutBuffer;
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 22cea828d..5063d3795 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -152,12 +152,12 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
 
 	g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Network Interfaces","options"));
 	
-	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress);
-	KviStringSelector * s = addStringSelector(g,"",KviOption_stringIpV4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress));
+	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress);
+	KviStringSelector * s = addStringSelector(g,"",KviOption_stringIPv4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress));
 	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
 #ifdef COMPILE_IPV6_SUPPORT
-	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv6 connections to:","options"),KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress);
-	s = addStringSelector(g,"",KviOption_stringIpV6ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress));
+	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv6 connections to:","options"),KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress);
+	s = addStringSelector(g,"",KviOption_stringIPv6ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress));
 	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
 #endif //!COMPILE_IPV6_SUPPORT
 
@@ -222,7 +222,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 
 	gbox = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"),
-		KviOption_boolIdentdEnableIpV6,
+		KviOption_boolIdentdEnableIPv6,
 		KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 #ifdef COMPILE_IPV6_SUPPORT
 	connect(m_pEnableIdent,SIGNAL(toggled(bool)),m_pEnableIpv6,SLOT(setEnabled(bool)));
@@ -231,8 +231,8 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 	m_pEnableIpv6->setEnabled(false);
 #endif
 	m_pIpv4InIpv6 = addBoolSelector(gbox,__tr2qs_ctx("IP stack treats IPv4 as part of IPv6 namespace","options"),
-		KviOption_boolIdentdIpV6ContainsIpV4,
-		KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIpV6));
+		KviOption_boolIdentdIPv6ContainsIPv4,
+		KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIPv6));
 	connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool)));
 
 	addLabel(0,4,0,4,
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 209ac489a..5edabb8d7 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -110,7 +110,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	m_pPortLabel = new QLabel(__tr2qs_ctx("Port:","options"),gbox);
 	m_pPortEdit = new QLineEdit(gbox);
 	m_pIpLabel = new QLabel(__tr2qs_ctx("IP address:","options"),gbox);
-	m_pIpEditor = new KviIpEditor(gbox,KviIpEditor::IpV4);
+	m_pIpEditor = new KviIpEditor(gbox,KviIpEditor::IPv4);
 	m_pUserLabel = new QLabel(__tr2qs_ctx("Username:","options"),gbox);
 	m_pUserEdit = new QLineEdit(gbox);
 	m_pPassLabel = new QLabel(__tr2qs_ctx("Password:","options"),gbox);
@@ -123,10 +123,10 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 
 	m_pProtocolBox->addItems(l);
 
-	m_pIpV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
-	connect(m_pIpV6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool)));
+	m_pIPv6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
+	connect(m_pIPv6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool)));
 #ifndef COMPILE_IPV6_SUPPORT
-	m_pIpV6Check->setEnabled(false);
+	m_pIPv6Check->setEnabled(false);
 #endif
 
 	m_pLastEditedItem = 0;
@@ -145,7 +145,7 @@ KviProxyOptionsWidget::~KviProxyOptionsWidget()
 
 void KviProxyOptionsWidget::ipV6CheckToggled(bool bEnabled)
 {
-	m_pIpEditor->setAddressType(bEnabled ? KviIpEditor::IpV6 : KviIpEditor::IpV4);
+	m_pIpEditor->setAddressType(bEnabled ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
 }
 
 void KviProxyOptionsWidget::fillProxyList()
@@ -185,9 +185,9 @@ void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTr
 	m_pPortEdit->setEnabled(m_pLastEditedItem);
 
 #ifdef COMPILE_IPV6_SUPPORT
-		m_pIpV6Check->setEnabled(m_pLastEditedItem);
+		m_pIPv6Check->setEnabled(m_pLastEditedItem);
 #else
-		m_pIpV6Check->setEnabled(false);
+		m_pIPv6Check->setEnabled(false);
 #endif
 	if(m_pLastEditedItem)
 	{
@@ -204,18 +204,18 @@ void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTr
 		}
 
 #ifdef COMPILE_IPV6_SUPPORT
-		m_pIpV6Check->setChecked(m_pLastEditedItem->m_pProxyData->isIpV6());
-		m_pIpEditor->setAddressType(m_pLastEditedItem->m_pProxyData->isIpV6() ? KviIpEditor::IpV6 : KviIpEditor::IpV4);
+		m_pIPv6Check->setChecked(m_pLastEditedItem->m_pProxyData->isIPv6());
+		m_pIpEditor->setAddressType(m_pLastEditedItem->m_pProxyData->isIPv6() ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
 #else
-		m_pIpV6Check->setChecked(false);
-		m_pIpEditor->setAddressType(KviIpEditor::IpV4);
+		m_pIPv6Check->setChecked(false);
+		m_pIpEditor->setAddressType(KviIpEditor::IPv4);
 #endif
 
 
 		if(!m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->m_szIp.ptr()))
 		{
 #ifdef COMPILE_IPV6_SUPPORT
-			m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->isIpV6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
+			m_pIpEditor->setAddress(m_pLastEditedItem->m_pProxyData->isIPv6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
 #else
 			m_pIpEditor->setAddress("0.0.0.0");
 #endif
@@ -231,7 +231,7 @@ void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTr
 		m_pPassEdit->setText("");
 		m_pPortEdit->setText("");
 		m_pIpEditor->setAddress("0.0.0.0");
-		m_pIpV6Check->setEnabled(false);
+		m_pIPv6Check->setEnabled(false);
 	}
 }
 
@@ -244,9 +244,9 @@ void KviProxyOptionsWidget::saveLastItem()
 		m_pLastEditedItem->setText(0,tmp.ptr());
 		m_pLastEditedItem->m_pProxyData->m_szHostname = tmp;
 #ifdef COMPILE_IPV6_SUPPORT
-		m_pLastEditedItem->m_pProxyData->m_bIsIpV6 = m_pIpV6Check->isChecked();
+		m_pLastEditedItem->m_pProxyData->m_bIsIPv6 = m_pIPv6Check->isChecked();
 #else
-		m_pLastEditedItem->m_pProxyData->m_bIsIpV6 = false;
+		m_pLastEditedItem->m_pProxyData->m_bIsIPv6 = false;
 #endif
 		m_pLastEditedItem->m_pProxyData->m_szIp = "";
 		KviStr tmpAddr = m_pIpEditor->address();
@@ -254,7 +254,7 @@ void KviProxyOptionsWidget::saveLastItem()
 		if(!m_pIpEditor->hasEmptyFields())
 		{
 #ifdef COMPILE_IPV6_SUPPORT
-			if(m_pIpV6Check->isChecked())
+			if(m_pIPv6Check->isChecked())
 			{
 				if((!kvi_strEqualCI(tmpAddr.ptr(),"0:0:0:0:0:0:0:0")) &&
 					kvi_isValidStringIp_V6(tmpAddr.ptr()))
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index f94e09673..54bc0eeb7 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -75,7 +75,7 @@ protected:
 	QLabel       * m_pProtocolLabel;
 	QComboBox    * m_pProtocolBox;
 	KviTalPopupMenu   * m_pContextPopup;
-	QCheckBox    * m_pIpV6Check;
+	QCheckBox    * m_pIPv6Check;
 	KviProxyOptionsTreeWidgetItem * m_pLastEditedItem;
 private:
 
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 9c2662ad0..8afb894f4 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -544,22 +544,22 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
 
 	l = new QLabel(__tr2qs_ctx("IP address:","options"),tab);
 	gl->addWidget(l,1,0);
-	m_pIpEditor = new KviIpEditor(tab,KviIpEditor::IpV4);
+	m_pIpEditor = new KviIpEditor(tab,KviIpEditor::IPv4);
 	gl->addWidget(m_pIpEditor,1,1);
 	KviTalToolTip::add(m_pIpEditor,__tr2qs_ctx("<center>This is the <b>IP address</b> of this server, it is here for caching purposes.<br>" \
 			"If you leave this field empty, KVIrc will fill it in the first time it connects to the server. " \
 			"If you enable the \"cache IP address\" option below, KVIrc will use it as a \"cached result\" " \
 			"and avoid looking it up again.</center>","options"));
 #ifdef COMPILE_IPV6_SUPPORT
-	m_pIpEditor->setAddressType(s->isIpV6() ? KviIpEditor::IpV6 : KviIpEditor::IpV4);
+	m_pIpEditor->setAddressType(s->isIPv6() ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
 #else
-	m_pIpEditor->setAddressType(KviIpEditor::IpV4);
+	m_pIpEditor->setAddressType(KviIpEditor::IPv4);
 #endif
 
 	if(!m_pIpEditor->setAddress(s->m_szIp))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		m_pIpEditor->setAddress(s->isIpV6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
+		m_pIpEditor->setAddress(s->isIPv6() ? "0:0:0:0:0:0:0:0" : "0.0.0.0");
 #else
 		m_pIpEditor->setAddress("0.0.0.0");
 #endif
@@ -581,7 +581,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
 	gl->addWidget(m_pUseIPV6Check,3,0,1,2);
 //	gl->addMultiCellWidget(m_pUseIPV6Check,3,3,0,1);
 #ifdef COMPILE_IPV6_SUPPORT
-	m_pUseIPV6Check->setChecked(s->isIpV6());
+	m_pUseIPV6Check->setChecked(s->isIPv6());
 #else
 	m_pUseIPV6Check->setEnabled(false);
 #endif
@@ -791,9 +791,9 @@ KviServerDetailsWidget::~KviServerDetailsWidget()
 void KviServerDetailsWidget::useIPV6CheckToggled(bool)
 {
 #ifdef COMPILE_IPV6_SUPPORT
-	m_pIpEditor->setAddressType(m_pUseIPV6Check->isChecked() ? KviIpEditor::IpV6 : KviIpEditor::IpV4);
+	m_pIpEditor->setAddressType(m_pUseIPV6Check->isChecked() ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
 #else
-	m_pIpEditor->setAddressType(KviIpEditor::IpV4);
+	m_pIpEditor->setAddressType(KviIpEditor::IPv4);
 #endif
 	setHeaderLabelText();
 }
@@ -878,7 +878,7 @@ void KviServerDetailsWidget::fillData(KviServer * s)
 		if(!m_pIpEditor->hasEmptyFields())
 		{
 #ifdef COMPILE_IPV6_SUPPORT
-			if(s->isIpV6())
+			if(s->isIPv6())
 			{
 				if((!kvi_strEqualCI(tmpAddr.ptr(),"0:0:0:0:0:0:0:0")) && kvi_isValidStringIp_V6(tmpAddr.ptr()))
 				{
@@ -1082,13 +1082,13 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	KviTalToolTip::add(m_pSrvNetEdit,__tr2qs_ctx("<center>This is the name of the currently selected server or network</center>","options"));
 
 /*
-	m_pIpV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
+	m_pIPv6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox);
 
 #ifndef COMPILE_IPV6_SUPPORT
-	m_pIpV6Check->setEnabled(false);
+	m_pIPv6Check->setEnabled(false);
 #endif
 
-	KviTalToolTip::add(m_pIpV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
+	KviTalToolTip::add(m_pIPv6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \
 						"(thus your OS <b>must</b> have a working IPv6 stack and you <b>must</b> have an IPv6 connection).</center>","options"));
 
 	m_pPortLabel = new QLabel(__tr2qs_ctx("Port:","options"),gbox);
@@ -1483,7 +1483,7 @@ void KviServerOptionsWidget::importServer(const KviServer &s,const QString &netw
 		srv=(KviServerOptionsTreeWidgetItem *) net->child(i);
 		if((srv)->m_pServerData->useSSL() == s.useSSL())
 		{
-			if(srv->m_pServerData->isIpV6() == s.isIpV6())
+			if(srv->m_pServerData->isIPv6() == s.isIPv6())
 			{
 				if(KviQString::equalCI(srv->m_pServerData->hostName(),s.hostName()))
 				{
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 5de91f72a..a64e992f5 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -167,7 +167,7 @@ protected:
 	KviTalPopupMenu                   * m_pContextPopup;
 	KviTalPopupMenu                   * m_pImportPopup;
 	KviServer                 * m_pClipboard;
-	//QCheckBox                    * m_pIpV6Check;
+	//QCheckBox                    * m_pIPv6Check;
 	QPushButton                  * m_pConnectCurrent;
 	QPushButton                  * m_pConnectNew;
 	KviServerOptionsTreeWidgetItem * m_pLastEditedItem;