Compilation fixes by KByte. Also added SolidIRC network to the default server db.

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

5 files changed, 16 insertions, 7 deletions

diff --git a/data/config/serverdb.kvc b/data/config/serverdb.kvc
index 866cb7d04..40b672926 100644
--- a/data/config/serverdb.kvc
+++ b/data/config/serverdb.kvc
@@ -1604,3 +1604,12 @@ NServers=1
 3_SSL=true
 3_Port=6670
 NServers=4
+[SolidIRC]
+0_Hostname=irc.solidirc.com
+0_Description=SolidIRC:%20Random%20server
+1_Hostname=irc.solidirc.com
+1_Description=SolidIRC:%20Random%20server SSL
+1_SSL=true
+1_Port=6601
+NServers=2
+
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index 95ba70554..0e02b6b17 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -273,7 +273,7 @@ void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDns *)
 				__tr2qs("Proxy hostname resolved to %Q"),&szFirstIpAddress);
 
 		m_pTarget->proxy()->m_szIp = m_pProxyDns->firstIpAddress();
-		g_pProxyDataBase->updateProxyIp(m_pTarget->proxy()->m_szIp,szFirstIpAddress.toUtf8().data());
+		g_pProxyDataBase->updateProxyIp(m_pTarget->proxy()->m_szIp.toUtf8().data(),szFirstIpAddress.toUtf8().data());
 
 		if(m_pProxyDns->hostnameCount() > 1)
 		{
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index b7429646c..e5d8d7086 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -307,7 +307,7 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 #endif
 	}
 
-	KviSockaddr sa(prx ? m_pProxy->ip() : m_pIrcServer->ip(),prx ? m_pProxy->port() : m_pIrcServer->port(),bTargetIPv6);
+	KviSockaddr sa(prx ? m_pProxy->ip().toUtf8().data() : m_pIrcServer->ip().toUtf8().data(), prx ? m_pProxy->port() : m_pIrcServer->port(),bTargetIPv6);
 
 	if(!sa.socketAddress())return KviError_invalidIpAddress;
 
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 58f0815ae..23f18d21e 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -158,7 +158,7 @@ bool KviDccVoiceThread::checkSoundcard()
 
 	if(ioctl(m_soundFd,SNDCTL_DSP_GETCAPS,&caps) < 0)
 	{
-		postMessageEvent(__tr2qs_ctx("WARNING: failed to check the soundcard duplex capabilities: if this is a half-duplex soundcard , use the DCC VOICE option to force half-duplex algorithm","dcc"));
+		postMessageEvent(__tr2qs_ctx("WARNING: failed to check the soundcard duplex capabilities: if this is a half-duplex soundcard , use the DCC VOICE option to force half-duplex algorithm","dcc").toUtf8().data());
 		if(bOpened)closeSoundcard();
 		return false;
 	}
@@ -166,7 +166,7 @@ bool KviDccVoiceThread::checkSoundcard()
 	if(!(caps & DSP_CAP_DUPLEX))
 	{
 		m_pOpt->bForceHalfDuplex = true; // the device is half duplex...use it in that way
-		postMessageEvent(__tr2qs_ctx("Half duplex soundcard detected, you will not be able to talk and listen at the same time","dcc"));
+		postMessageEvent(__tr2qs_ctx("Half duplex soundcard detected, you will not be able to talk and listen at the same time","dcc").toUtf8().data());
 	}
 
 	if(bOpened)closeSoundcard();
@@ -207,7 +207,7 @@ bool KviDccVoiceThread::openSoundcard(int mode)
 	if(ioctl(m_soundFd,SNDCTL_DSP_SPEED,&speed)<0)goto exit_false;
 	if(speed != m_pOpt->iSampleRate)
 	{
-		KviStr tmp(KviStr::Format,__tr2qs_ctx("WARNING: failed to set the requested sample rate (%d): the device used closest match (%d)","dcc"),
+		KviStr tmp(KviStr::Format,__tr2qs_ctx("WARNING: failed to set the requested sample rate (%d): the device used closest match (%d)","dcc").toUtf8().data(),
 						m_pOpt->iSampleRate,speed);
 		postMessageEvent(tmp.ptr());
 	}
@@ -265,7 +265,7 @@ bool KviDccVoiceThread::openSoundcardWithDuplexOption(int openMode,int failMode)
 					if(!openSoundcard(openMode))return false;
 					if(!checkSoundcard())
 					{
-						postMessageEvent(__tr2qs_ctx("Ops...failed to test the soundcard capabilities...expect problems...","dcc"));
+						postMessageEvent(__tr2qs_ctx("Ops...failed to test the soundcard capabilities...expect problems...","dcc").toUtf8().data());
 					}
 				} // else the test has been done and it is a full duplex card that is just busy
 			}
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 2b0f376ab..2d9df06f9 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -196,7 +196,7 @@ void KviProxyOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalTr
 		for(int i=0;i<m_pProtocolBox->count();i++)
 		{
 			KviStr txt = m_pProtocolBox->itemText(i);
-			if(kvi_strEqualCI(m_pLastEditedItem->m_pProxyData->protocolName(),txt.ptr()))
+			if(kvi_strEqualCI(m_pLastEditedItem->m_pProxyData->protocolName().toUtf8().data(),txt.ptr()))
 			{
 				m_pProtocolBox->setCurrentIndex(i);
 				break;