Fix conversion of TQString to const char* (modules)feat/more-fixes-for-cmake

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 30 insertions, 30 deletions

diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index de818ce4..d9ae6567 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -1143,7 +1143,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 		TQString szCodec;
 		pCodec->asString(szCodec);
 
-		if(!kvi_dcc_voice_is_valid_codec(szCodec))
+		if(!kvi_dcc_voice_is_valid_codec(szCodec.utf8().data()))
 		{
 			c->warning(__tr2qs_ctx("Invalid codec specified, defaulting to 'adpcm'","dcc"));
 			d->szCodec = "adpcm";
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 92b12080..856c927b 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -138,10 +138,10 @@ void KviDccMarshal::doListen()
 	}
 
 	// Check the address type
-	if(!kvi_isValidStringIp(m_szIp))
+	if(!kvi_isValidStringIp(m_szIp.utf8().data()))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!kvi_isValidStringIp_V6(m_szIp))
+		if(!kvi_isValidStringIp_V6(m_szIp.utf8().data()))
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
@@ -186,9 +186,9 @@ void KviDccMarshal::doListen()
 	if((!KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)) || (m_uPort != 0))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		KviSockaddr sa(m_szIp,m_uPort,m_bIpV6);
+		KviSockaddr sa(m_szIp.utf8().data(),m_uPort,m_bIpV6);
 #else
-		KviSockaddr sa(m_szIp,m_uPort,false);
+		KviSockaddr sa(m_szIp.utf8().data(),m_uPort,false);
 #endif
 
 		if(!sa.socketAddress())
@@ -211,9 +211,9 @@ void KviDccMarshal::doListen()
 		bool bBindSuccess;
 		do {
 #ifdef COMPILE_IPV6_SUPPORT
-			KviSockaddr sa(m_szIp,m_uPort,m_bIpV6);
+			KviSockaddr sa(m_szIp.utf8().data(),m_uPort,m_bIpV6);
 #else
-			KviSockaddr sa(m_szIp,m_uPort,false);
+			KviSockaddr sa(m_szIp.utf8().data(),m_uPort,false);
 #endif
 			if(!sa.socketAddress())
 			{
@@ -327,10 +327,10 @@ void KviDccMarshal::doConnect()
 	}
 
 	// Check the address type
-	if(!kvi_isValidStringIp(m_szIp))
+	if(!kvi_isValidStringIp(m_szIp.utf8().data()))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!kvi_isValidStringIp_V6(m_szIp))
+		if(!kvi_isValidStringIp_V6(m_szIp.utf8().data()))
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
@@ -376,9 +376,9 @@ void KviDccMarshal::doConnect()
 	// fill the sockaddr structure
 
 #ifdef COMPILE_IPV6_SUPPORT
-	KviSockaddr sa(m_szIp,m_uPort,m_bIpV6);
+	KviSockaddr sa(m_szIp.utf8().data(),m_uPort,m_bIpV6);
 #else
-	KviSockaddr sa(m_szIp,m_uPort,false);
+	KviSockaddr sa(m_szIp.utf8().data(),m_uPort,false);
 #endif
 
 	if(!sa.socketAddress())
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 1d5b284b..a3ab1945 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -92,7 +92,7 @@ static bool dcc_module_check_concurrent_transfers_limit(KviDccRequest * dcc)
 		unsigned int uTransfers = KviDccFileTransfer::runningTransfersCount();
 		if(uTransfers >= KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers))
 		{
-			KviStr szError(KviStr::Format,__tr2qs_ctx("Concurrent transfer limit reached (%u of %u transfers running)","dcc"),
+			KviStr szError(KviStr::Format,__tr2qs_ctx("Concurrent transfer limit reached (%u of %u transfers running)","dcc").utf8().data(),
 				uTransfers,KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers));
 			dcc_module_request_error(dcc,szError.ptr());
 			return false;
@@ -108,7 +108,7 @@ static bool dcc_module_check_limits(KviDccRequest * dcc)
 		unsigned int uWindows = g_pDccBroker->dccWindowsCount();
 		if(uWindows >= KVI_OPTION_UINT(KviOption_uintMaxDccSlots))
 		{
-			KviStr szError(KviStr::Format,__tr2qs_ctx("Slot limit reached (%u slots of %u)","dcc"),
+			KviStr szError(KviStr::Format,__tr2qs_ctx("Slot limit reached (%u slots of %u)","dcc").utf8().data(),
 				uWindows,KVI_OPTION_UINT(KviOption_uintMaxDccSlots));
 			dcc_module_request_error(dcc,szError.ptr());
 			return false;
@@ -153,7 +153,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 	{
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
-			KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid port number %s","dcc"),port.ptr());
+			KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid port number %s","dcc").utf8().data(),port.ptr());
 			dcc_module_request_error(dcc,szError.ptr());
 		}
 		return false;
@@ -169,7 +169,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 		{
 			if(!dcc->ctcpMsg->msg->haltOutput())
 			{
-				KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid IP address in old format %s","dcc"),ipaddr.ptr());
+				KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid IP address in old format %s","dcc").utf8().data(),ipaddr.ptr());
 				dcc_module_request_error(dcc,szError.ptr());
 			}
 			return false;
@@ -188,7 +188,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 #endif
 			if(!dcc->ctcpMsg->msg->haltOutput())
 			{
-				KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid IP address %s","dcc"),ipaddr.ptr());
+				KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid IP address %s","dcc").utf8().data(),ipaddr.ptr());
 				dcc_module_request_error(dcc,szError.ptr());
 			}
 			return false;
@@ -525,7 +525,7 @@ static void dccModuleParseDccAccept(KviDccRequest *dcc)
 //#warning "IF KviOption_boolReplyCtcpErrmsgOnInvalidAccept..."
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
-			KviStr szError(KviStr::Format,__tr2qs_ctx("Can't proceed with DCC RECV: Transfer not initiated for file %s on port %s","dcc"),dcc->szParam1.ptr(),dcc->szParam2.ptr());
+			KviStr szError(KviStr::Format,__tr2qs_ctx("Can't proceed with DCC RECV: Transfer not initiated for file %s on port %s","dcc").utf8().data(),dcc->szParam1.ptr(),dcc->szParam2.ptr());
 			dcc_module_request_error(dcc,szError.ptr());
 		}
 	}
@@ -550,7 +550,7 @@ static void dccModuleParseDccResume(KviDccRequest *dcc)
 	{
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
-			KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid resume position argument '%s'","dcc"),dcc->szParam3.ptr());
+			KviStr szError(KviStr::Format,__tr2qs_ctx("Invalid resume position argument '%s'","dcc").utf8().data(),dcc->szParam3.ptr());
 			dcc_module_request_error(dcc,szError.ptr());
 		}
 		return;
@@ -562,7 +562,7 @@ static void dccModuleParseDccResume(KviDccRequest *dcc)
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
 			KviStr szError(KviStr::Format,
-					__tr2qs_ctx("Can't proceed with DCC SEND: Transfer not initiated for file %s on port %s, or invalid resume size","dcc"),
+					__tr2qs_ctx("Can't proceed with DCC SEND: Transfer not initiated for file %s on port %s, or invalid resume size","dcc").utf8().data(),
 					dcc->szParam1.ptr(),dcc->szParam2.ptr());
 			dcc_module_request_error(dcc,szError.ptr());
 		}
@@ -626,7 +626,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 		{
 			// senseless request
 			KviStr szError(KviStr::Format,
-					__tr2qs_ctx("Invalid RECV request: Position %u is is larger than file size","dcc"),uResumeSize);
+					__tr2qs_ctx("Invalid RECV request: Position %u is is larger than file size","dcc").utf8().data(),uResumeSize);
 			dcc_module_request_error(dcc,szError.ptr());
 			return;
 		}
@@ -843,7 +843,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
 			KviStr szError(KviStr::Format,
-					__tr2qs_ctx("No file offer named '%s' (with size %s) available for %Q [%Q@%Q]","dcc"),
+					__tr2qs_ctx("No file offer named '%s' (with size %s) available for %Q [%Q@%Q]","dcc").utf8().data(),
 					dcc->szParam1.ptr(),uSize > 0 ? dcc->szParam2.ptr() : __tr_ctx("\"any\"","dcc"),
 					&(dcc->ctcpMsg->pSource->nick()),
 					&(dcc->ctcpMsg->pSource->username()),
@@ -1148,7 +1148,7 @@ extern "C" KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest *
 	if(!dcc->ctcpMsg->msg->haltOutput())
 	{
 		KviStr szError(KviStr::Format,
-				__tr2qs_ctx("Unknown DCC type '%s'","dcc"),dcc->szType.ptr());
+				__tr2qs_ctx("Unknown DCC type '%s'","dcc").utf8().data(),dcc->szType.ptr());
 		dcc_module_request_error(dcc,szError.ptr());
 	}
 }
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index ee7e96c6..d8522b97 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -257,8 +257,8 @@ void KviDccRecvThread::run()
 						// Readed something useful...write back
 						if((m_pOpt->iTotalFileSize > -1) && ((readLen + (int)m_pFile->at()) > m_pOpt->iTotalFileSize))
 						{
-							postMessageEvent(__tr2qs_ctx("WARNING: The peer is sending garbage data past the end of the file","dcc"));
-							postMessageEvent(__tr2qs_ctx("WARNING: Ignoring data past the declared end of file and closing the connection","dcc"));
+							postMessageEvent(__tr2qs_ctx("WARNING: The peer is sending garbage data past the end of the file","dcc").utf8().data());
+							postMessageEvent(__tr2qs_ctx("WARNING: Ignoring data past the declared end of file and closing the connection","dcc").utf8().data());
 
 							readLen = m_pOpt->iTotalFileSize - m_pFile->at();
 							if(readLen > 0)
@@ -359,14 +359,14 @@ void KviDccRecvThread::run()
 					{
 						iProbableTerminationTime = (int)kvi_unixTime();
 						m_pFile->flush();
-						postMessageEvent(__tr2qs_ctx("Data transfer terminated, waiting 30 seconds for the peer to close the connection...","dcc"));
+						postMessageEvent(__tr2qs_ctx("Data transfer terminated, waiting 30 seconds for the peer to close the connection...","dcc").utf8().data());
 						// FIXME: Close the file ?
 					} else {
 						int iDiff = (((int)kvi_unixTime()) - iProbableTerminationTime);
 						if(iDiff > 30)
 						{
 							// success if we got the whole file or if we don't know the file size (we trust the peer)
-							postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc"));
+							postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc").utf8().data());
 							KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
 							postEvent(parent(),e);
 							break;
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index ed0a9026..6a98313f 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -161,7 +161,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").utf8().data());
 		if(bOpened)closeSoundcard();
 		return false;
 	}
@@ -169,7 +169,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").utf8().data());
 	}
 
 	if(bOpened)closeSoundcard();
@@ -210,7 +210,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").utf8().data(),
 						m_pOpt->iSampleRate,speed);
 		postMessageEvent(tmp.ptr());
 	}
@@ -268,7 +268,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").utf8().data());
 					}
 				} // else the test has been done and it is a full duplex card that is just busy
 			}