summaryrefslogtreecommitdiffstats
path: root/src/modules/options
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/options')
-rw-r--r--src/modules/options/dialog.cpp10
-rw-r--r--src/modules/options/libkvioptions.cpp4
-rw-r--r--src/modules/options/optw_identity.cpp10
-rw-r--r--src/modules/options/optw_nickserv.cpp2
-rw-r--r--src/modules/options/optw_servers.cpp6
-rw-r--r--src/modules/options/optw_textencoding.cpp4
-rw-r--r--src/modules/options/optw_urlhandlers.cpp48
7 files changed, 42 insertions, 42 deletions
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 10117d2..4f53ad1 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -356,9 +356,9 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
for(int j=0;j<lKeywords.count();j++)
{
#ifdef COMPILE_USE_QT4
- if(szText.tqfind(lKeywords.at(j),0,false) == -1)
+ if(szText.find(lKeywords.at(j),0,false) == -1)
#else
- if(szText.tqfind(*(lKeywords.at(j)),0,false) == -1)
+ if(szText.find(*(lKeywords.at(j)),0,false) == -1)
#endif
{
bOk = false;
@@ -398,7 +398,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
{
if(pParent->inherits("KviOptionsWidget"))
{
- bool * pExistingBool = lOptionWidgetsToMark.tqfind(pParent);
+ bool * pExistingBool = lOptionWidgetsToMark.find(pParent);
if(pExistingBool)
{
if(bOk)
@@ -432,8 +432,8 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
TQString szTxt = pTabWidgetToMark->tabLabel(pOptionsWidget);
if(KviTQString::equalCIN(szTxt,">>> ",4))
{
- szTxt.tqreplace(">>> ","");
- szTxt.tqreplace(" <<<","");
+ szTxt.replace(">>> ","");
+ szTxt.replace(" <<<","");
}
if(*pBool)
{
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 3859366..eeb2d8a 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -98,7 +98,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
KVSM_PARAMETERS_END(c)
if(szGroup.isEmpty())szGroup = "general";
- KviOptionsDialog * d = g_pOptionsDialogDict->tqfind(szGroup);
+ KviOptionsDialog * d = g_pOptionsDialogDict->find(szGroup);
if(d)
{
if(c->hasSwitch('t',"toplevel"))
@@ -264,7 +264,7 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
KVSM_PARAMETERS_END(c)
if(szGroup.isEmpty())szGroup = "general";
- c->returnValue()->setBoolean(g_pOptionsDialogDict->tqfind(szGroup));
+ c->returnValue()->setBoolean(g_pOptionsDialogDict->find(szGroup));
return true;
}
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 4c89210..0f702ae 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -620,13 +620,13 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
{
// local path, loaded
TQString tmp = szCurrent;
- int idx = tmp.tqfindRev("/");
+ int idx = tmp.findRev("/");
if(idx != -1)
{
szCurrent = tmp.right(tmp.length() - (idx + 1));
tmp = szCurrent;
}
- idx = tmp.tqfindRev("\\");
+ idx = tmp.findRev("\\");
if(idx != -1)
{
szCurrent = tmp.right(tmp.length() - (idx + 1));
@@ -672,9 +672,9 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * tq
m_pSSelector=0;
m_sModeStr = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
- m_bI = m_sModeStr.tqcontains('i');
- m_bW = m_sModeStr.tqcontains('w');
- m_bS = m_sModeStr.tqcontains('s');
+ m_bI = m_sModeStr.contains('i');
+ m_bW = m_sModeStr.contains('w');
+ m_bS = m_sModeStr.contains('s');
createLayout(2,1);
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 92d1703..c4afaca 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -170,7 +170,7 @@ bool KviNickServRuleEditor::validate()
return false;
}
- if(s.tqfind(TQChar(' ')) != -1)
+ if(s.find(TQChar(' ')) != -1)
{
TQMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't contain spaces!","options"),o);
return false;
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 9410d17..258601f 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -529,15 +529,15 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox);
m_pIMode->setEnabled(bHasUmode);
- m_pIMode->setChecked(bHasUmode ? s->initUMode().tqcontains('i',false) : szDefUMode.tqcontains('i',false));
+ m_pIMode->setChecked(bHasUmode ? s->initUMode().contains('i',false) : szDefUMode.contains('i',false));
m_pSMode = new KviStyledCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox);
m_pSMode->setEnabled(bHasUmode);
- m_pSMode->setChecked(bHasUmode ? s->initUMode().tqcontains('s',false) : szDefUMode.tqcontains('s',false));
+ m_pSMode->setChecked(bHasUmode ? s->initUMode().contains('s',false) : szDefUMode.contains('s',false));
m_pWMode = new KviStyledCheckBox(__tr2qs_ctx("Wallops (+w)","options"),gbox);
m_pWMode->setEnabled(bHasUmode);
- m_pWMode->setChecked(bHasUmode ? s->initUMode().tqcontains('w',false) : szDefUMode.tqcontains('w',false));
+ m_pWMode->setChecked(bHasUmode ? s->initUMode().contains('w',false) : szDefUMode.contains('w',false));
l = new TQLabel("",tab);
gl->addWidget(l,2,0);
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index 1b44f80..aad9f2f 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -89,8 +89,8 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * tqparent)
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
TQString szTmp=*it;
- szTmp.tqreplace("kvirc_","");
- szTmp.tqreplace(".mo","");
+ szTmp.replace("kvirc_","");
+ szTmp.replace(".mo","");
m_pForcedLocaleCombo->insertItem(szTmp);
if(KviTQString::equalCI(szTmp,m_szLanguage))
iMatch = i + 2;
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index efe0032..8695406 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -88,37 +88,37 @@ void KviUrlHandlersOptionsWidget::commit()
KviOptionsWidget::commit();
#ifdef COMPILE_ON_WINDOWS
- KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\\\","@MAGIC@","options");
- KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("@MAGIC@","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\","@MAGIC@","options");
+ KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("@MAGIC@","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\\\","@MAGIC@","options");
- KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("@MAGIC@","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\","@MAGIC@","options");
+ KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("@MAGIC@","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\\\","@MAGIC@","options");
- KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("@MAGIC@","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\\\","@MAGIC@","options");
+ KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("@MAGIC@","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\\\","@MAGIC@","options");
- KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("@MAGIC@","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\\\","@MAGIC@","options");
+ KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("@MAGIC@","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\\\","@MAGIC@","options");
- KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("@MAGIC@","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\\\","@MAGIC@","options");
+ KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("@MAGIC@","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\\\","@MAGIC@","options");
- KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\","\\\\","options");
- KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("@MAGIC@","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\","@MAGIC@","options");
+ KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\","\\\\","options");
+ KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("@MAGIC@","\\\\","options");
//Check for escaped " in url handler ( \" )
- KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\\\\"","\\\"","options");
- KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\\\\"","\\\"","options");
- KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\\\\"","\\\"","options");
- KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\\\\"","\\\"","options");
- KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\\\\"","\\\"","options");
- KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\\\\"","\\\"","options");
+ KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\\"","\\\"","options");
+ KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\\"","\\\"","options");
+ KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\\\\"","\\\"","options");
+ KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\\\\"","\\\"","options");
+ KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\\\\"","\\\"","options");
+ KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\\"","\\\"","options");
#endif
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 18:20:42 +0000