fixed problems about compilation on qt 4.4

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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/kvilib/ext/kvi_proxydb.cpp b/src/kvilib/ext/kvi_proxydb.cpp
index 9da5de448..e7103ac60 100644
--- a/src/kvilib/ext/kvi_proxydb.cpp
+++ b/src/kvilib/ext/kvi_proxydb.cpp
@@ -51,9 +51,9 @@ KviProxy::~KviProxy()
 {
 }
 
-static const char * proxy_protocols_table[3]= { "SOCKSv4", "SOCKSv5", "HTTP" };
+static const QString proxy_protocols_table[3]= { "SOCKSv4", "SOCKSv5", "HTTP" };
 
-const char * KviProxy::protocolName() const
+const QString KviProxy::protocolName() const
 {
 	switch(m_protocol)
 	{
diff --git a/src/kvilib/ext/kvi_proxydb.h b/src/kvilib/ext/kvi_proxydb.h
index f0b1f43a7..bfe5d7af9 100644
--- a/src/kvilib/ext/kvi_proxydb.h
+++ b/src/kvilib/ext/kvi_proxydb.h
@@ -48,13 +48,13 @@ public:
 public:
 	bool isIPv6() const             { return m_bIsIPv6; };
 	Protocol protocol() const       { return m_protocol; };
-	const char * protocolName() const;
+	const QString protocolName() const;
 	void setNamedProtocol(const char * proto);
 	kvi_u32_t port() const { return m_uPort; };
-	const char * user() const       { return m_szUser; };
-	const char * pass() const       { return m_szPass; };
-	const char * ip() const         { return m_szIp; };
-	const char * hostname() const   { return m_szHostname; };
+	const QString & user() const       { return m_szUser; };
+	const QString & pass() const       { return m_szPass; };
+	const QString & ip() const         { return m_szIp; };
+	const QString & hostname() const   { return m_szHostname; };
 	void normalizeUserAndPass();
 	bool hasPass() const         { return !m_szPass.isEmpty(); };
 	bool hasUser() const         { return !m_szUser.isEmpty(); };
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index c42a6a9d3..1b0410d68 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -167,7 +167,7 @@ void KviIrcConnectionTargetResolver::asyncStartResolve()
 			__tr2qs("Attempting to 'bounce' on proxy %s on port %u (protocol %s)"),
 			m_pTarget->proxy()->m_szHostname.toUtf8().data(),
 			m_pTarget->proxy()->m_uPort,
-			m_pTarget->proxy()->protocolName());
+			m_pTarget->proxy()->protocolName().toUtf8().data());
 
 		lookupProxyHostname();
 	} else {
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index 038281ed9..40cb7a095 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -308,7 +308,7 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 #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(),prx ? m_pProxy->port() : m_pIrcServer->port(),bTargetIPv6);
 
 	if(!sa.socketAddress())return KviError_invalidIpAddress;
 
@@ -644,7 +644,7 @@ void KviIrcSocket::proxyLoginHttp()
 	KviStr tmp(KviStr::Format,"CONNECT %s:%u HTTP/1.0\r\n",m_pIrcServer->hostName().toUtf8().data(),(unsigned int)(m_pIrcServer->port()));
 	if(m_pProxy->hasUser())
 	{
-		KviStr auth(KviStr::Format,"%s:%s",m_pProxy->user(),m_pProxy->pass());
+		KviStr auth(KviStr::Format,"%s:%s",m_pProxy->user().toUtf8().data(),m_pProxy->pass().toUtf8().data());
 		KviStr encoded;
 		encoded.bufferToBase64(auth.ptr(),auth.len());
 		tmp.append(KviStr::Format,"Proxy-Authorization: Basic %s\r\n\r\n",encoded.ptr());
@@ -816,9 +816,9 @@ void KviIrcSocket::proxyAuthUserPassV5()
 	char *bufToSend=new char[iLen];
 	bufToSend[0]=(unsigned char)1;                           //version x'01'
 	bufToSend[1]=(unsigned char)lUser;                       //length of the username
-	kvi_memmove((void *)(bufToSend+2),(void *)m_pProxy->user(),lUser); //username
+	kvi_memmove((void *)(bufToSend+2),(void *)m_pProxy->user().toUtf8().data(),lUser); //username
 	bufToSend[2+lUser]=(unsigned char)lPass;             //length of the password
-	kvi_memmove((void *)(bufToSend+3+lUser),(void *)m_pProxy->pass(),lPass);
+	kvi_memmove((void *)(bufToSend+3+lUser),(void *)m_pProxy->pass().toUtf8().data(),lPass);
 	// spit out the buffer and wait
 	setState(ProxyUserPassV5);
 	sendRawData(bufToSend,iLen);