aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Noldor2008-05-22 18:10:54 +0000
committerGravatar Noldor2008-05-22 18:10:54 +0000
commit45c12d47ff4cf24d105cca319ef912394c27732e (patch)
tree5a69d5baf7e48e26c3db6e60e8629799d12995d8 /src
parentquick fix (diff)
downloadKVIrc-45c12d47ff4cf24d105cca319ef912394c27732e.tar.gz
KVIrc-45c12d47ff4cf24d105cca319ef912394c27732e.tar.bz2
KVIrc-45c12d47ff4cf24d105cca319ef912394c27732e.zip
more qt4 port
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1839 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kernel/kvi_app.cpp2
-rw-r--r--src/kvirc/kernel/kvi_iconmanager.cpp6
-rw-r--r--src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp8
-rw-r--r--src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp4
-rw-r--r--src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp2
-rw-r--r--src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp6
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp2
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp2
-rw-r--r--src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp4
-rw-r--r--src/kvirc/kvs/kvi_kvs_kernel.cpp4
-rw-r--r--src/kvirc/kvs/kvi_kvs_object.cpp12
-rw-r--r--src/kvirc/kvs/kvi_kvs_object_controller.cpp6
-rw-r--r--src/kvirc/kvs/kvi_kvs_parser_lside.cpp2
-rw-r--r--src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp8
-rw-r--r--src/kvirc/kvs/kvi_kvs_treenode_operation.cpp6
-rw-r--r--src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp2
-rw-r--r--src/kvirc/sparser/kvi_sp_ctcp.cpp2
-rw-r--r--src/kvirc/sparser/kvi_sp_literal.cpp4
-rw-r--r--src/kvirc/sparser/kvi_sp_numeric.cpp6
-rw-r--r--src/kvirc/ui/kvi_console.cpp6
-rw-r--r--src/kvirc/ui/kvi_frame.cpp2
-rw-r--r--src/kvirc/ui/kvi_input.cpp14
-rw-r--r--src/kvirc/ui/kvi_ircview.cpp12
-rw-r--r--src/kvirc/ui/kvi_userlistview.cpp2
-rw-r--r--src/kvirc/ui/kvi_window.cpp2
25 files changed, 66 insertions, 60 deletions
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index f933955f5..000ab37a2 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -1804,7 +1804,7 @@ static void merge_to_stringlist_option(const QString &item,int iOption,int iMaxE
it != KVI_OPTION_STRINGLIST(iOption).end(); ++it)
{
// Do a case-insensitive search (for nicknames, servers, and channels)
- if(!QString::compare(item.lower(),(*it).lower()))
+ if(!QString::compare(item.toLower(),(*it).toLower()))
{
// In the recent list, remove and put as first so more recent items
// are always first
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index 8de06bd8f..d53aab453 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -432,7 +432,7 @@ bool KviIconWidget::eventFilter(QObject * o,QEvent *e)
}
} else if(e->type() == QEvent::DragEnter)
{
- ((QDragEnterEvent *)e)->accept(true);
+ ((QDragEnterEvent *)e)->setAccepted(true);
return true;
}
return QWidget::eventFilter(o,e);
@@ -730,7 +730,9 @@ QPixmap * KviIconManager::getBigIcon(const QString &szName)
{
QImage tmpi = p->toImage();
QImage tmp2 = tmpi.scaled(32,32,Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
- KviCachedPixmap * cp = new KviCachedPixmap(new QPixmap(tmp2),QString::null);
+ QPixmap *pix=new QPixmap();
+ pix->fromImage(tmp2);
+ KviCachedPixmap * cp = new KviCachedPixmap(pix,QString::null);
addToCache(tmpName,cp);
return cp->pixmap();
}
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index 8f91d2ee6..8a406bc6a 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -488,8 +488,8 @@ void KviIrcConnectionTargetResolver::haveServerIp()
if(!validateLocalAddress(m_pTarget->bindAddress(),bindAddress))
{
QString szBindAddress = m_pTarget->bindAddress();
- if((szBindAddress.find('.') != -1) ||
- (szBindAddress.find(':') != -1))
+ if((szBindAddress.indexOf('.') != -1) ||
+ (szBindAddress.indexOf(':') != -1))
{
if(!_OUTPUT_MUTE)
m_pConsole->output(KVI_OUT_SYSTEMWARNING,
@@ -514,7 +514,7 @@ void KviIrcConnectionTargetResolver::haveServerIp()
if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress),bindAddress))
{
// if it is not an interface name , kill it for now and let the user correct the address
- if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).find(':') != -1)
+ if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).indexOf(':') != -1)
{
if(!_OUTPUT_MUTE)
m_pConsole->output(KVI_OUT_SYSTEMWARNING,
@@ -543,7 +543,7 @@ void KviIrcConnectionTargetResolver::haveServerIp()
if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress),bindAddress))
{
// if it is not an interface name , kill it for now and let the user correct the address
- if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).find(':') != -1)
+ if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).indexOf(':') != -1)
{
if(!_OUTPUT_MUTE)
m_pConsole->output(KVI_OUT_SYSTEMWARNING,
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index 0375f7344..11053e81a 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -258,13 +258,13 @@ namespace KviKvsCoreCallbackCommands
// make sure that we have only doubled "::" and not ":" or ":::..."
QString tmp = szName;
tmp.replace("::","@"); // @ is not allowed by the rule above
- if(tmp.find(":") != -1)
+ if(tmp.indexOf(":") != -1)
{
KVSCCC_pContext->error(__tr2qs("Stray ':' character in alias name: did you mean ...<namespace>::<name> ?"));
return false;
}
- if(tmp.find("@@") != -1)
+ if(tmp.indexOf("@@") != -1)
{
KVSCCC_pContext->error(__tr2qs("Found an empty namespace in alias name"));
return false;
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
index 3ec8d2d8a..bd14c761c 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
@@ -808,7 +808,7 @@ namespace KviKvsCoreFunctions
{
//Check for right Characters
#ifdef COMPILE_ON_WINDOWS
- if (szAllowedCharacters.find((char)(c->unicode()),0,true) >= 0) tmpFormat += '%';
+ if (szAllowedCharacters.indexOf((char)(c->unicode()),0,Qt::CaseSensitive) >= 0) tmpFormat += '%';
#else
if (c->isLetter()) tmpFormat += '%';
#endif
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
index 7805687b0..201b8cc58 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
@@ -1032,9 +1032,9 @@ namespace KviKvsCoreFunctions
if(szType.isEmpty())
KVSCF_pRetBuffer->setString(KVI_VERSION);
else {
- if(szType.find('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME);
- else if(szType.find('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE);
- else if(szType.find('b') != -1)KVSCF_pRetBuffer->setString(KviBuildInfo::buildDate());
+ if(szType.indexOf('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME);
+ else if(szType.indexOf('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE);
+ else if(szType.indexOf('b') != -1)KVSCF_pRetBuffer->setString(KviBuildInfo::buildDate());
else KVSCF_pRetBuffer->setString(KVI_VERSION);
}
return true;
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 2f0dce5a9..00f14c3b5 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -213,7 +213,7 @@ try_again:
if(!bFound && !bLowCaseTried)
{
// try again with lowercase
- szTopic = szTopic.lower();
+ szTopic = szTopic.toLower();
bLowCaseTried = true;
goto try_again;
}
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index f3572d3cc..e06d457bc 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -881,7 +881,7 @@ namespace KviKvsCoreSimpleCommands
QString szCoords;
pCoords->asString(szCoords);
- int idx = szCoords.find(',');
+ int idx = szCoords.indexOf(',');
bool bCoordsOk = true;
if(idx == -1)bCoordsOk = false;
else {
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
index 332414ca4..492cec98f 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
@@ -514,6 +514,10 @@ namespace KviKvsCoreSimpleCommands
KVSCSC(srand)
{
+ QString tmp;
+
+ for (int i=0;i<10;i++)
+ tmp.append(QChar((::rand() % 30)+65));
kvs_int_t iSeed;
KVSCSC_PARAMETERS_BEGIN
KVSCSC_PARAMETER("seed",KVS_PT_INT,KVS_PF_OPTIONAL,iSeed)
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp
index 4584ec26c..3f0775088 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.cpp
+++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp
@@ -114,7 +114,7 @@ void KviKvsKernel::done()
void KviKvsKernel::completeCommand(const QString &szCommandBegin,KviPointerList<QString> * pMatches)
{
- int idx = szCommandBegin.find(QChar('.'));
+ int idx = szCommandBegin.indexOf(QChar('.'));
if(idx == -1)
{
// no module name inside
@@ -157,7 +157,7 @@ void KviKvsKernel::completeModuleCommand(const QString &szModuleName,const QStri
void KviKvsKernel::completeFunction(const QString &szFunctionBegin,KviPointerList<QString> * pMatches)
{
- int idx = szFunctionBegin.find(QChar('.'));
+ int idx = szFunctionBegin.indexOf(QChar('.'));
if(idx == -1)
{
// no module name inside
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 58946ba17..499f2ecb1 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -1256,12 +1256,12 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c)
QFont fnt;
fnt.setFamily(szFf);
fnt.setPointSize(iPs);
- if(szFl.find('b') != -1)fnt.setBold(true);
- if(szFl.find('i') != -1)fnt.setItalic(true);
- if(szFl.find('u') != -1)fnt.setUnderline(true);
- if(szFl.find('o') != -1)fnt.setOverline(true);
- if(szFl.find('f') != -1)fnt.setFixedPitch(true);
- if(szFl.find('s') != -1)fnt.setStrikeOut(true);
+ if(szFl.indexOf('b',Qt::CaseInsensitive) != -1)fnt.setBold(true);
+ if(szFl.indexOf('i',Qt::CaseInsensitive) != -1)fnt.setItalic(true);
+ if(szFl.indexOf('u',Qt::CaseInsensitive) != -1)fnt.setUnderline(true);
+ if(szFl.indexOf('o',Qt::CaseInsensitive) != -1)fnt.setOverline(true);
+ if(szFl.indexOf('f',Qt::CaseInsensitive) != -1)fnt.setFixedPitch(true);
+ if(szFl.indexOf('s',Qt::CaseInsensitive) != -1)fnt.setStrikeOut(true);
m_pObject->setProperty(szName.toUtf8().data(),QVariant(fnt));
}
break;
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 237d3972b..58f4dd5be 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -164,7 +164,7 @@ void KviKvsObjectController::flushUserClasses()
if(c->isDirty())
{
QString szPath;
- QString szFileName = c->name().lower();
+ QString szFileName = c->name().toLower();
szFileName += ".kvs";
szFileName.replace("::","--");
g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
@@ -195,7 +195,7 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,b
if(bBuiltinOnly)return 0;
// maybe we need to load it from permanent storage...
QString szPath;
- QString szFileName = szClass.lower();
+ QString szFileName = szClass.toLower();
szFileName += ".kvs";
szFileName.replace("::","--");
g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
@@ -219,7 +219,7 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const QString &szClass,b
void KviKvsObjectController::deleteClass(KviKvsObjectClass * pClass)
{
QString szPath;
- QString szFileName = pClass->name().lower();
+ QString szFileName = pClass->name().toLower();
szFileName += ".kvs";
szFileName.replace("::","--");
g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
index cf08aa607..523044ce4 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
@@ -818,7 +818,7 @@ KviKvsTreeNodeOperation * KviKvsParser::parseBindingOperation()
while(KVSP_curCharIsLetter)KVSP_skipChar;
- QString szOp = QString(pBegin,KVSP_curCharPointer - pBegin).lower();
+ QString szOp = QString(pBegin,KVSP_curCharPointer - pBegin).toLower();
skipSpaces();
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index 3291b3593..a80cc5e71 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -447,7 +447,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
unsigned int uHandlerFlags = 0;
- if(szLabel.lower() == "internal")
+ if(szLabel.toLower() == "internal")
{
uHandlerFlags |= KviKvsObjectFunctionHandler::Internal;
skipSpaces();
@@ -475,7 +475,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
}
- if(szLabel.lower() == "function")
+ if(szLabel.toLower() == "function")
{
skipSpaces();
if(KVSP_curCharUnicode != '(')
@@ -1420,7 +1420,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
}
QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
- QString szLabelLow = szLabel.lower();
+ QString szLabelLow = szLabel.toLower();
bool bNeedParam = true;
@@ -1567,7 +1567,7 @@ KviKvsTreeNodeSpecialCommandDefpopupLabelPopup * KviKvsParser::parseSpecialComma
}
QString szLabel(pLabelBegin,KVSP_curCharPointer - pLabelBegin);
- QString szLabelLow = szLabel.lower();
+ QString szLabelLow = szLabel.toLower();
KviPointerList<QString> * pParameters = 0;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
index bbbd21cc6..a8c87719a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
@@ -1220,10 +1220,10 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c
QString str;
target->result()->asString(str);
- bool bGlobal = szF.find('g',false) != -1;
+ bool bGlobal = szF.indexOf('g',Qt::CaseInsensitive) != -1;
- QRegExp re(szL,szF.find('i',false) == -1,szF.find('w',false) != -1);
- re.setMinimal(szF.find('m',false) != -1); // greedy or minimal ?
+ QRegExp re(szL,szF.find('i',Qt::CaseInsensitive) == -1,szF.find('w',Qt::CaseInsensitive) != -1);
+ re.setMinimal(szF.find('m',Qt::CaseInsensitive) != -1); // greedy or minimal ?
int idx = 0;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
index 55a8db22b..6a35ff2d1 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
@@ -118,7 +118,7 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelCase::execute(KviKvsRunTimeContext *
QString val;
pRealParameter->asString(val);
- if(reg.lower() != val.lower())return true;
+ if(reg.toLower() != val.toLower())return true;
}
if(m_pInstruction)
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index a32caf7f4..0a25bf1ca 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1789,7 +1789,7 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg)
KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->find(msg->pSource->nick());
if(e)
{
- int pos = decoded.find("Gender=",0,false);
+ int pos = decoded.indexOf("Gender=",0,Qt::CaseInsensitive);
if(pos>=0)
{
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index 3dfce2f9f..61ec70cf4 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -1049,7 +1049,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
{
if(szUser == "*")
{
- if(szNick.find('.') != -1)
+ if(szNick.indexOf('.') != -1)
{
// server notice
// FIXME: "Dedicated window for server notices ?"
@@ -1682,7 +1682,7 @@ void KviServerParser::parseChannelMode(const QString &szNick,const QString &szUs
KviQString::sprintf(nickBuffer,"\r!n\r%Q\r",&szNick);
KviQString::sprintf(hostBuffer,"\r!h\r%Q\r",&szHost);
} else {
- if(nickBuffer.find('.') != -1)
+ if(nickBuffer.indexOf('.') != -1)
{
// This looks a lot like a server!
KviQString::sprintf(nickBuffer,"\r!s\r%Q\r",&szNick);
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 4afc88135..466204ec5 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -60,8 +60,8 @@
#include <QRegExp>
// #define IS_CHANNEL_TYPE_FLAG(_str) ((*(_str) == '#') || (*(_str) == '&') || (*(_str) == '!'))
-#define IS_CHANNEL_TYPE_FLAG(_qchar) (msg->connection()->serverInfo()->supportedChannelTypes().find(_qchar) != -1)
-#define IS_USER_MODE_PREFIX(_qchar) (msg->connection()->serverInfo()->supportedModePrefixes().find(_qchar) != -1)
+#define IS_CHANNEL_TYPE_FLAG(_qchar) (msg->connection()->serverInfo()->supportedChannelTypes().indexOf(_qchar) != -1)
+#define IS_USER_MODE_PREFIX(_qchar) (msg->connection()->serverInfo()->supportedModePrefixes().indexOf(_qchar) != -1)
// Numeric message handlers
@@ -681,7 +681,7 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg)
QString szServ = msg->connection()->decodeText(msg->safeParam(4));
QString szNick = msg->connection()->decodeText(msg->safeParam(5));
QString szFlag = msg->connection()->decodeText(msg->safeParam(6));
- bool bAway = szFlag.find('G') != -1;
+ bool bAway = szFlag.indexOf('G') != -1;
KviStr trailing = msg->safeTrailing();
KviStr hops = trailing.getToken(' ');
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 6b3a6d6c2..5f1bf13f8 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -621,7 +621,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co
{
while(aux->unicode())
{
- if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 )
+ if( KVI_OPTION_STRING(KviOption_stringWordSplitters).indexOf(*aux,Qt::CaseInsensitive) > -1 )
szSource.append(' ');
else
szSource.append(*aux);
@@ -634,7 +634,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co
szSource.prepend(' ');
if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection())
{
- if(szSource.find(QString(" %1 ").arg(connection()->userInfo()->nickName()),0,false) > -1)
+ if(szSource.indexOf(QString(" %1 ").arg(connection()->userInfo()->nickName()),0,Qt::CaseInsensitive) > -1)
return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName());
}
@@ -646,7 +646,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const QString &nick,co
if((*it).isEmpty())
continue;
// FIXME : This is SLOOOOOOOOW (QString -> ascii translation!!) !!!!
- if(szSource.find(QString(" %1 ").arg(*it),0,false) > -1)
+ if(szSource.indexOf(QString(" %1 ").arg(*it),0,Qt::CaseInsensitive) > -1)
{
return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it);
}
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 980301908..ea5d1fb91 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -233,7 +233,7 @@ void KviFrame::restoreModuleExtensionToolBars()
for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it)
{
QString szEntry = *it;
- int idx = szEntry.find(':');
+ int idx = szEntry.indexOf(':');
if(idx != -1)
{
QString szMod = szEntry.left(idx);
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index ae5b05d54..e2ddefebb 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -939,7 +939,7 @@ void KviInputEditor::insertText(const QString &text)
removeSelected();
m_bUpdatesEnabled = true;
- if(szText.find('\n') == -1)
+ if(szText.indexOf('\n') == -1)
{
m_szTextBuffer.insert(m_iCursorPosition,szText);
m_szTextBuffer.truncate(m_iMaxBufferSize);
@@ -949,7 +949,7 @@ void KviInputEditor::insertText(const QString &text)
QString szBlock;
while(!szText.isEmpty())
{
- int idx = szText.find('\n');
+ int idx = szText.indexOf('\n');
if(idx != -1)
{
szBlock = szText.left(idx);
@@ -1713,10 +1713,10 @@ void KviInputEditor::getWordBeforeCursor(QString &buffer,bool * bIsFirstWordInLi
buffer = m_szTextBuffer.left(m_iCursorPosition);
- int idx = buffer.findRev(' ');
- int idx2 = buffer.findRev(','); // This is for comma separated lists...
- int idx3 = buffer.findRev('(');
- int idx4 = buffer.findRev('"');
+ int idx = buffer.lastIndexOf(' ');
+ int idx2 = buffer.lastIndexOf(','); // This is for comma separated lists...
+ int idx3 = buffer.lastIndexOf('(');
+ int idx4 = buffer.lastIndexOf('"');
if(idx2 > idx)idx = idx2;
if(idx3 > idx)idx = idx3;
if(idx4 > idx)idx = idx4;
@@ -1861,7 +1861,7 @@ void KviInputEditor::completion(bool bShift)
if(!match.isEmpty())
{
- //if(!bIsDir && !bIsNick)match = match.lower(); <-- why? It is nice to have
+ //if(!bIsDir && !bIsNick)match = match.toLower(); <-- why? It is nice to have
// $module.someFunctionName instad
// of unreadable $module.somefunctionfame
replaceWordBeforeCursor(word,match,false);
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index fd5f68e8c..4f1173f42 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -1286,11 +1286,11 @@ void KviIrcView::getLinkEscapeCommand(QString &buffer,const QString &szPayload,c
{
if(szPayload.isEmpty())return;
- int idx = szPayload.find(escape_label);
+ int idx = szPayload.indexOf(escape_label,Qt::CaseInsensitive);
if(idx == -1)return;
idx += escape_label.length();
- int idx2 = szPayload.find("[!",idx);
+ int idx2 = szPayload.indexOf("[!",idx,Qt::CaseInsensitive);
int len = idx2 == -1 ? szPayload.length() - idx : idx2 - idx;
buffer = szPayload.mid(idx,len);
@@ -4014,7 +4014,7 @@ void KviIrcView::findNext(const QString& szText,bool bCaseS,bool bRegExp,bool bE
idx = re.search(l->szText,0);
} else {
QString tmp = l->szText;
- idx = tmp.find(szText,0,bCaseS);
+ idx = tmp.indexOf(szText,0,bCaseS?Qt::CaseSensitive:Qt::CaseInsensitive);
}
if(idx != -1)
@@ -4067,7 +4067,7 @@ void KviIrcView::findPrev(const QString& szText,bool bCaseS,bool bRegExp,bool bE
idx = re.search(l->szText,0);
} else {
QString tmp = l->szText;
- idx = tmp.find(szText,0,bCaseS);;
+ idx = tmp.indexOf(szText,0,bCaseS?Qt::CaseSensitive:Qt::CaseInsensitive);
}
if(idx != -1)
@@ -4880,7 +4880,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
tip+="</nowrap></font></u></td></tr><tr><td>";
QMimeSourceFactory::defaultFactory()->setPixmap("host_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)));
- if(linkText.find('*') != -1)
+ if(linkText.indexOf('*') != -1)
{
if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be masked");
else tip += __tr2qs("Unable to look it up hostname: Unknown host");
@@ -4906,7 +4906,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
}
tip+="</nowrap></font></u></td></tr><tr><td>";
- if(linkText.find('*') != -1)
+ if(linkText.indexOf('*') != -1)
{
if(linkText.length() > 1)tip += __tr2qs("Server appears to be a network hub<br>");
else tip += __tr2qs("Unknown server<br>"); // might happen...
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index 22a410ca2..2f118bc4a 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -1799,7 +1799,7 @@ void KviUserListViewArea::keyPressEvent( QKeyEvent * e )
while(aux)
{
//debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().toUtf8().data(),aux->nick().find(szKey,0,0));
- if(aux->nick().find(szKey,0,0)==0)
+ if(aux->nick().indexOf(szKey,0,Qt::CaseInsensitive)==0)
{
nick=aux;
break;
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index cb991bb53..8613bc4f7 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -545,7 +545,7 @@ void KviWindow::getDefaultLogFileName(QString &buffer)
getBaseLogFileName(base);
kvi_encodeFileName(base);
base.replace("%%2e","%2e");
- base=base.lower();
+ base=base.toLower();
QString tmp;
if(KVI_OPTION_BOOL(KviOption_boolGzipLogs))
KviQString::sprintf(tmp,"%s_%s_%s.log.gz",typeString(),base.toUtf8().data(),date.toUtf8().data());