From 282b7c3cdbbe5a210f2d07cf01d1c493f77e9526 Mon Sep 17 00:00:00 2001
From: Elvio Basello
Date: Sat, 5 Dec 2009 17:34:44 +0000
Subject: reworked namespace KviQString; improved hungarian notation; added
 Doxygen comments; added TODO for hungarian notation: keep it updated!

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3666 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/chan/libkvichan.cpp          | 8 ++++----
 src/modules/logview/logviewmdiwindow.cpp | 4 ++--
 src/modules/regchan/libkviregchan.cpp    | 4 ++--
 src/modules/str/libkvistr.cpp            | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index ed51151ff..7f72a9459 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1343,7 +1343,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
-		if(KviQString::matchStringCI(e->szMask,szMask))
+		if(KviQString::matchString(e->szMask,szMask))
 		{
 			c->returnValue()->setString(e->szMask);
 			return true;
@@ -1392,7 +1392,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
-		if(KviQString::matchStringCI(e->szMask,szMask))
+		if(KviQString::matchString(e->szMask,szMask))
 		{
 			c->returnValue()->setString(e->szMask);
 			return true;
@@ -1441,7 +1441,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
-		if(KviQString::matchStringCI(e->szMask,szMask))
+		if(KviQString::matchString(e->szMask,szMask))
 		{
 			c->returnValue()->setString(e->szMask);
 			return true;
@@ -1494,7 +1494,7 @@ static bool chan_kvs_fnc_matchqban(KviKvsModuleFunctionCall * c)
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
-		if(KviQString::matchStringCI(e->szMask,szMask))
+		if(KviQString::matchString(e->szMask,szMask))
 		{
 			c->returnValue()->setString(e->szMask);
 			return true;
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 194743da2..9252730e5 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -273,13 +273,13 @@ void KviLogViewMDIWindow::setupItemList()
 				continue;
 
 		if(enableNameFilter)
-			if(!KviQString::matchStringCI(nameFilterText,pFile->name()))
+			if(!KviQString::matchString(nameFilterText,pFile->name()))
 				continue;
 
 		if(enableContentFilter)
 		{
 			pFile->getText(textBuffer,m_szLogDirectory);
-			if(!KviQString::matchStringCI(contentFilterText,textBuffer))
+			if(!KviQString::matchString(contentFilterText,textBuffer))
 				continue;
 		}
 
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index 2201fd1e5..356103582 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -264,8 +264,8 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	while(KviRegisteredChannelList * l = it.current())
 	{
 		for(KviRegisteredChannel * ch = l->first();ch;ch = l->next())
-		if(KviQString::matchWildExpressionsCI(ch->name().ptr(),szChan) &&
-			KviQString::matchWildExpressionsCI(ch->netMask().ptr(),szNetmask))
+		if(KviQString::matchWildExpressions(ch->name().ptr(),szChan) &&
+			KviQString::matchWildExpressions(ch->netMask().ptr(),szNetmask))
 		{
 //		FIXME: WE NEED TO RETURN AN ARRAY OF 2-ELEMENT ARRAYS (chan name, netmask)
 			pArray->set(aid,new KviKvsVariant(QString(ch->name()+"@"+ch->netMask())));
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index a735b1e1c..d23eb67c0 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -1309,7 +1309,7 @@ static bool str_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 	bool bRegExp = (szFlags.indexOf(QChar('r')) != -1) || (szFlags.indexOf(QChar('R')) != -1);
 	bool bExact = (szFlags.indexOf(QChar('e')) != -1) || (szFlags.indexOf(QChar('E')) != -1);
-	c->returnValue()->setBoolean(KviQString::matchStringCS(szWildcard,szString,bRegExp,bExact));
+	c->returnValue()->setBoolean(KviQString::matchString(szWildcard,szString,bRegExp,bExact,true));
 	return true;
 }
 
@@ -1355,7 +1355,7 @@ static bool str_kvs_fnc_matchnocase(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 	bool bRegExp = (szFlags.indexOf(QChar('r')) != -1) || (szFlags.indexOf(QChar('R')) != -1);
 	bool bExact = (szFlags.indexOf(QChar('e')) != -1) || (szFlags.indexOf(QChar('E')) != -1);
-	c->returnValue()->setBoolean(KviQString::matchStringCI(szWildcard,szString,bRegExp,bExact));
+	c->returnValue()->setBoolean(KviQString::matchString(szWildcard,szString,bRegExp,bExact));
 	return true;
 }
 
-- 
cgit v1.3.1-10-gc9f91