File fix-incorrect-usage-of-QString_contains.patch of Package kvirc4
From a823bf743f258efbcdd257aa89762026c9f497a7 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Sun, 23 Dec 2012 11:41:15 +0000
Subject: [PATCH] fix incorrect usage of QString::contains()
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6305 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
src/kvirc/kernel/KviIrcConnectionUserInfo.cpp | 2 +-
src/kvirc/ui/KviInputEditor.cpp | 4 ++--
src/modules/dcc/libkvidcc.cpp | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp b/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp
index 64201db59..954059dc6 100644
--- a/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp
@@ -33,7 +33,7 @@ KviIrcConnectionUserInfo::KviIrcConnectionUserInfo()
bool KviIrcConnectionUserInfo::hasUserMode(const QChar &m)
{
- return m_szUserMode.contains(m) > 0;
+ return m_szUserMode.contains(m);
}
bool KviIrcConnectionUserInfo::addUserMode(const QChar &m)
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 6f5553b7f..13b13f880 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -1034,7 +1034,7 @@ void KviInputEditor::pasteClipboardWithConfirmation()
if(KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnInputBarPaste,m_pKviWindow,m_pKviWindow->id(),szText))
return;
- if(szText.contains(QChar('\n')) > 0)
+ if(szText.contains(QChar('\n')))
{
if(m_pInputParent->inherits("KviInput"))
((KviInput*)(m_pInputParent))->multiLinePaste(szText);
@@ -1052,7 +1052,7 @@ void KviInputEditor::pasteSelectionWithConfirmation()
if(KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnInputBarPaste,m_pKviWindow,m_pKviWindow->id(),szText))
return;
- if(szText.contains(QChar('\n')) > 0)
+ if(szText.contains(QChar('\n')))
{
if(m_pInputParent->inherits("KviInput"))
((KviInput*)(m_pInputParent))->multiLinePaste(szText);
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 970563d67..1bbfbb5da 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -2687,9 +2687,9 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
++it;
}
} else {
- bool bWantFileUploads = szFlags.indexOf('u',Qt::CaseInsensitive) != -1;
- bool bWantFileDownloads = szFlags.contains('d',Qt::CaseInsensitive) != -1;
- bool bWantChats = szFlags.contains('c',Qt::CaseInsensitive) != -1;
+ bool bWantFileUploads = szFlags.contains('u',Qt::CaseInsensitive);
+ bool bWantFileDownloads = szFlags.contains('d',Qt::CaseInsensitive);
+ bool bWantChats = szFlags.contains('c',Qt::CaseInsensitive);
while(DccDescriptor * dcc = it.current())
{