aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/dcc/libkvidcc.cpp2
-rw-r--r--src/modules/dcc/marshal.cpp20
-rw-r--r--src/modules/dcc/requests.cpp55
-rw-r--r--src/modules/dcc/send.cpp8
-rw-r--r--src/modules/options/optw_connection.cpp4
-rw-r--r--src/modules/trayicon/libkvitrayicon.cpp6
-rw-r--r--src/modules/window/libkviwindow.cpp10
7 files changed, 59 insertions, 46 deletions
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 1efb2a6ec..7909a53cd 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)
QString szCodec;
pCodec->asString(szCodec);
- if(!kvi_dcc_voice_is_valid_codec(szCodec))
+ if(!kvi_dcc_voice_is_valid_codec(szCodec.toUtf8().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 c67d3d010..06a947583 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -135,10 +135,10 @@ void KviDccMarshal::doListen()
}
// Check the address type
- if(!kvi_isValidStringIp(m_szIp))
+ if(!kvi_isValidStringIp(m_szIp.toUtf8().data()))
{
#ifdef COMPILE_IPV6_SUPPORT
- if(!kvi_isValidStringIp_V6(m_szIp))
+ if(!kvi_isValidStringIp_V6(m_szIp.toUtf8().data()))
{
emit error(KviError_invalidIpAddress);
return;
@@ -182,9 +182,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.toUtf8().data(),m_uPort,m_bIpV6);
#else
- KviSockaddr sa(m_szIp,m_uPort,false);
+ KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
#endif
if(!sa.socketAddress())
@@ -207,9 +207,9 @@ void KviDccMarshal::doListen()
bool bBindSuccess;
do {
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sa(m_szIp,m_uPort,m_bIpV6);
+ KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
#else
- KviSockaddr sa(m_szIp,m_uPort,false);
+ KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
#endif
if(!sa.socketAddress())
{
@@ -323,10 +323,10 @@ void KviDccMarshal::doConnect()
}
// Check the address type
- if(!kvi_isValidStringIp(m_szIp))
+ if(!kvi_isValidStringIp(m_szIp.toUtf8().data()))
{
#ifdef COMPILE_IPV6_SUPPORT
- if(!kvi_isValidStringIp_V6(m_szIp))
+ if(!kvi_isValidStringIp_V6(m_szIp.toUtf8().data()))
{
emit error(KviError_invalidIpAddress);
return;
@@ -372,9 +372,9 @@ void KviDccMarshal::doConnect()
// fill the sockaddr structure
#ifdef COMPILE_IPV6_SUPPORT
- KviSockaddr sa(m_szIp,m_uPort,m_bIpV6);
+ KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,m_bIpV6);
#else
- KviSockaddr sa(m_szIp,m_uPort,false);
+ KviSockaddr sa(m_szIp.toUtf8().data(),m_uPort,false);
#endif
if(!sa.socketAddress())
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index f72dfab39..308b084df 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -92,9 +92,10 @@ 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"),
+ QString szError;
+ KviQString::sprintf(szError,__tr2qs_ctx("Concurrent transfer limit reached (%u of %u transfers running)","dcc"),
uTransfers,KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers));
- dcc_module_request_error(dcc,szError.ptr());
+ dcc_module_request_error(dcc,szError);
return false;
}
}
@@ -108,9 +109,10 @@ 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"),
+ QString szError;
+ KviQString::sprintf(szError,__tr2qs_ctx("Slot limit reached (%u slots of %u)","dcc"),
uWindows,KVI_OPTION_UINT(KviOption_uintMaxDccSlots));
- dcc_module_request_error(dcc,szError.ptr());
+ dcc_module_request_error(dcc,szError);
return false;
}
}
@@ -152,8 +154,9 @@ 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());
- dcc_module_request_error(dcc,szError.ptr());
+ QString szError;
+ KviQString::sprintf(szError,__tr2qs_ctx("Invalid port number %s","dcc"),port.ptr());
+ dcc_module_request_error(dcc,szError);
}
return false;
}
@@ -168,8 +171,9 @@ 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());
- dcc_module_request_error(dcc,szError.ptr());
+ QString szError;
+ KviQString::sprintf(szError,__tr2qs_ctx("Invalid IP address in old format %s","dcc"),ipaddr.ptr());
+ dcc_module_request_error(dcc,szError);
}
return false;
}
@@ -187,8 +191,9 @@ 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());
- dcc_module_request_error(dcc,szError.ptr());
+ QString szError;
+ KviQString::sprintf(szError,__tr2qs_ctx("Invalid IP address %s","dcc"),ipaddr.ptr());
+ dcc_module_request_error(dcc,szError);
}
return false;
}
@@ -524,8 +529,9 @@ 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());
- dcc_module_request_error(dcc,szError.ptr());
+ QString szError;
+ KviQString::sprintf(szError,__tr2qs_ctx("Can't proceed with DCC RECV: Transfer not initiated for file %s on port %s","dcc"),dcc->szParam1.ptr(),dcc->szParam2.ptr());
+ dcc_module_request_error(dcc,szError);
}
}
}
@@ -549,8 +555,9 @@ 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());
- dcc_module_request_error(dcc,szError.ptr());
+ QString szError;
+ KviQString::sprintf(szError,__tr2qs_ctx("Invalid resume position argument '%s'","dcc"),dcc->szParam3.ptr());
+ dcc_module_request_error(dcc,szError);
}
return;
}
@@ -560,10 +567,11 @@ static void dccModuleParseDccResume(KviDccRequest *dcc)
//#warning "IF KviOption_boolReplyCtcpErrmsgOnInvalidResume..."
if(!dcc->ctcpMsg->msg->haltOutput())
{
- KviStr szError(KviStr::Format,
+ QString szError;
+ KviQString::sprintf(szError,
__tr2qs_ctx("Can't proceed with DCC SEND: Transfer not initiated for file %s on port %s, or invalid resume size","dcc"),
dcc->szParam1.ptr(),dcc->szParam2.ptr());
- dcc_module_request_error(dcc,szError.ptr());
+ dcc_module_request_error(dcc,szError);
}
}
}
@@ -624,9 +632,10 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
if(uResumeSize >= o->fileSize())
{
// senseless request
- KviStr szError(KviStr::Format,
+ QString szError;
+ KviQString::sprintf(szError,
__tr2qs_ctx("Invalid RECV request: Position %u is is larger than file size","dcc"),uResumeSize);
- dcc_module_request_error(dcc,szError.ptr());
+ dcc_module_request_error(dcc,szError);
return;
}
@@ -841,13 +850,14 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
{
if(!dcc->ctcpMsg->msg->haltOutput())
{
- KviStr szError(KviStr::Format,
+ QString szError;
+ KviQString::sprintf(szError,
__tr2qs_ctx("No file offer named '%s' (with size %s) available for %Q [%Q@%Q]","dcc"),
dcc->szParam1.ptr(),uSize > 0 ? dcc->szParam2.ptr() : __tr_ctx("\"any\"","dcc"),
&(dcc->ctcpMsg->pSource->nick()),
&(dcc->ctcpMsg->pSource->username()),
&(dcc->ctcpMsg->pSource->host()));
- dcc_module_request_error(dcc,szError.ptr());
+ dcc_module_request_error(dcc,szError);
}
return;
}
@@ -1143,8 +1153,9 @@ KVIMODULEEXPORTFUNC void dccModuleCtcpDccParseRoutine(KviDccRequest *dcc)
// ops...we don't know this dcc type
if(!dcc->ctcpMsg->msg->haltOutput())
{
- KviStr szError(KviStr::Format,
+ QString szError;
+ KviQString::sprintf(szError,
__tr2qs_ctx("Unknown DCC type '%s'","dcc"),dcc->szType.ptr());
- dcc_module_request_error(dcc,szError.ptr());
+ dcc_module_request_error(dcc,szError);
}
}
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 115f5b026..ec91460bc 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(__tr_no_lookup_ctx("WARNING: The peer is sending garbage data past the end of the file","dcc"));
+ postMessageEvent(__tr_no_lookup_ctx("WARNING: Ignoring data past the declared end of file and closing the connection","dcc"));
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(__tr_no_lookup_ctx("Data transfer terminated, waiting 30 seconds for the peer to close the connection...","dcc"));
// 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(__tr_no_lookup_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc"));
KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
postEvent(parent(),e);
break;
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 26922549f..66ae40d71 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -161,7 +161,9 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
#endif //!COMPILE_IPV6_SUPPORT
- addRowSpacer(0,4,0,4);
+ addBoolSelector(0,4,0,4,__tr2qs_ctx("Pick Random IP Address for Round-Robin Servers","options"),KviOption_boolPickRandomIpAddressForRoundRobinServers);
+
+ addRowSpacer(0,5,0,5);
}
KviTransportOptionsWidget::~KviTransportOptionsWidget()
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index aa3e8edae..a33e2ce06 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -56,7 +56,7 @@
#define ICON_SIZE 22
#endif
-extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict;
+extern KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
static KviPointerList<KviTrayIcon> * g_pTrayIconList = 0;
static QPixmap * g_pDock1 = 0;
@@ -212,7 +212,7 @@ void KviTrayIcon::doAway(int id)
{
if(id<0)
{
- KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
+ KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
while(KviWindow * wnd = it.current())
{
if(wnd->type()==KVI_WINDOW_TYPE_CONSOLE)
@@ -257,7 +257,7 @@ void KviTrayIcon::fillContextPopup()
int iSeparator=m_pAwayPopup->insertSeparator();
- KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
+ KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
bool bAllAway=1;
bool bAllUnaway=1;
int iNetCount=0;
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 05d987d34..9e1e7ab2e 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -53,7 +53,7 @@
// kvi_app.cpp
-extern KVIRC_API KviPointerHashTable<const char *,KviWindow> * g_pGlobalWindowDict;
+extern KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
KviPointerList<KviUserWindow> * g_pUserWindowList = 0;
// $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type
@@ -857,7 +857,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
{
// all contexts but no "no_context" windows
bool bAllWindows = KviQString::equalCI(szType,"all");
- KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
+ KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
while(KviWindow * wnd = it.current())
{
@@ -881,7 +881,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
{
// all contexts and also "no_context" windows
bool bAllWindows = KviQString::equalCI(szType.lower(),"all");
- KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
+ KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
while(KviWindow * wnd = it.current())
{
@@ -902,7 +902,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
{
// only "no_context" windows
bool bAllWindows = KviQString::equalCI(szType.lower(),"all");
- KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
+ KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
while(KviWindow * wnd = it.current())
{
@@ -947,7 +947,7 @@ static bool window_kvs_fnc_list(KviKvsModuleFunctionCall * c)
}
bool bAllWindows = KviQString::equalCI(szType.lower(),"all");
- KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
+ KviPointerHashTableIterator<QString,KviWindow> it(*g_pGlobalWindowDict);
while(KviWindow * wnd = it.current())
{
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 04:55:40 +0000