fixed protocols name

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

5 files changed, 22 insertions, 22 deletions

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 ? :)
 		}