some cleaning on kvichannel + maybe compilation fix

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4923 17fca916-40b9-46aa-a4ea-0a15b648b75c

6 files changed, 16 insertions, 66 deletions

diff --git a/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp b/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp
index 4c9bdab2e..8c50410e9 100644
--- a/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionrequestqueue.cpp
@@ -87,7 +87,7 @@ void KviRequestQueue::timerSlot()
 		switch(m_curType)
 		{
 			case BanException:
-				if(pChan->serverInfo()->supportsModesIe() &&
+				if(pChan->serverInfo()->supportedListModes().contains('e') &&
 					!KVI_OPTION_BOOL(KviOption_boolDisableBanExceptionListRequestOnJoin) &&
 					!(	pChan->serverInfo()->getNeedsOpToListModeseI() &&
 						!pChan->isMeOp()
@@ -101,7 +101,7 @@ void KviRequestQueue::timerSlot()
 					break;
 				}
 			case Invite:
-				if(pChan->serverInfo()->supportsModesIe() &&
+				if(pChan->serverInfo()->supportedListModes().contains('I') &&
 					!KVI_OPTION_BOOL(KviOption_boolDisableInviteListRequestOnJoin) &&
 					!(	pChan->serverInfo()->getNeedsOpToListModeseI() &&
 						!pChan->isMeOp()
@@ -115,7 +115,7 @@ void KviRequestQueue::timerSlot()
 					break;
 				}
 			case QuietBan:
-				if(pChan->serverInfo()->supportsModeq() &&
+				if(pChan->serverInfo()->supportedListModes().contains('q') &&
 					!KVI_OPTION_BOOL(KviOption_boolDisableQuietBanListRequestOnJoin))
 				{
 					if(!pChan->connection()->sendFmtData("MODE %s q",encodedChan.data()))
diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h
index 00e6d417a..205dcefd5 100644
--- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h
+++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h
@@ -201,8 +201,6 @@ public:
 	const QString & supportedParameterModes() { return m_szParameterModes; };
 	const QString & supportedParameterWhenSetModes() { return m_szParameterWhenSetModes; };
 	const QString & supportedPlainModes() { return m_szPlainModes; };
-	bool supportsModesIe() { return (m_szListModes.contains('e') && m_szListModes.contains('I')); }
-	bool supportsModeq() { return m_szListModes.contains('q'); };
 	bool supportsCap() { return m_bSupportsCap; };
 	const QStringList & supportedCaps() { return m_lSupportedCaps; };
 	bool supportsWatchList() { return m_bSupportsWatchList; };
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index f13411c72..0ce0e2fd5 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -689,7 +689,7 @@ void KviServerParser::parseNumeric367(KviIrcMessage *msg)
 	KviChannel * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
-		if(msg->connection()->serverInfo()->supportsModeq() && chan->sentListRequest('q'))
+		if(msg->connection()->serverInfo()->supportedListModes().contains('q') && chan->sentListRequest('q'))
 		{
 			chan->setMask('q',banmask,true,bansetby,QString(msg->safeParam(4)).toUInt());
 			return;
@@ -715,7 +715,7 @@ void KviServerParser::parseNumeric368(KviIrcMessage *msg)
 	KviChannel * chan = msg->connection()->findChannel(szChan);
 	if(chan)
 	{
-		if(msg->connection()->serverInfo()->supportsModeq() && chan->sentListRequest('q'))
+		if(msg->connection()->serverInfo()->supportedListModes().contains('q') && chan->sentListRequest('q'))
 		{
 			chan->setListRequestDone('q');
 			return;
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index f90174c25..da67f162b 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -1799,7 +1799,7 @@ void KviChannel::unhighlight()
 	m_pWindowListItem->unhighlight();
 }
 
-inline KviIrcConnectionServerInfo * KviChannel::serverInfo()
+KviIrcConnectionServerInfo * KviChannel::serverInfo()
 {
 	if(!connection()) return 0;
 	return connection()->serverInfo();
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index 4d4aab3eb..1984d41b0 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -227,30 +227,6 @@ public:
 	inline KviPointerList<KviMaskEntry> * modeMasks(char cMode){ if(m_pModeLists.contains(cMode)) return m_pModeLists.value(cMode); return 0; };
 
 	/**
-	* \brief Returns the list of bans set
-	* \return KviPointerList<KviMaskEntry> *
-	*/
-	KviPointerList<KviMaskEntry> * banList(){ return modeMasks('b'); };
-
-	/**
-	* \brief Returns the list of ban exceptions set
-	* \return KviPointerList<KviMaskEntry> *
-	*/
-	KviPointerList<KviMaskEntry> * banExceptionList(){ return modeMasks('e'); };
-
-	/**
-	* \brief Returns the list of invite exceptions set
-	* \return KviPointerList<KviMaskEntry> *
-	*/
-	KviPointerList<KviMaskEntry> * inviteList(){ return modeMasks('I'); };
-
-	/**
-	* \brief Returns the list of quiet bans set
-	* \return KviPointerList<KviMaskEntry> *
-	*/
-	KviPointerList<KviMaskEntry> * quietBanList(){ return modeMasks('q'); };
-
-	/**
 	* \brief Returns the first selected nickname in the userlist
 	* \return QString *
 	*/
@@ -336,30 +312,6 @@ public:
 	unsigned int maskCount(char cMode){ if(m_pModeLists.contains(cMode)) return m_pModeLists.value(cMode)->count(); return 0; };
 
 	/**
-	* \brief Returns the number of ban masks
-	* \return unsigned int
-	*/
-	unsigned int banCount(){ if(m_pModeLists.contains('b')) return m_pModeLists.value('b')->count(); return 0; };
-
-	/**
-	* \brief Returns the number of ban exceptions masks list
-	* \return unsigned int
-	*/
-	unsigned int banExceptionCount(){ if(m_pModeLists.contains('e')) return m_pModeLists.value('e')->count(); return 0; };
-
-	/**
-	* \brief Returns the number of invite masks
-	* \return unsigned int
-	*/
-	unsigned int inviteCount(){ if(m_pModeLists.contains('I')) return m_pModeLists.value('I')->count(); return 0; };
-
-	/**
-	* \brief Returns the number of quiet ban masks
-	* \return unsigned int
-	*/
-	unsigned int quietBanCount(){ if(m_pModeLists.contains('q')) return m_pModeLists.value('q')->count(); return 0; };
-
-	/**
 	* \brief Called when someone sets a channel mode that is stored in a list; these modes require a parameter that is tipically a mask
 	*
 	* Examples:
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 41ab4e542..7d43b9a0c 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -498,7 +498,7 @@ static bool chan_kvs_fnc_bancount(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
 	KviChannel * ch = chan_kvs_find_channel(c,szId);
-	if (ch) c->returnValue()->setInteger(ch->banCount());
+	if (ch) c->returnValue()->setInteger(ch->maskCount('b'));
 	return true;
 }
 
@@ -529,7 +529,7 @@ static bool chan_kvs_fnc_banexceptioncount(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
 	KviChannel * ch = chan_kvs_find_channel(c,szId);
-	if (ch) c->returnValue()->setInteger(ch->banExceptionCount());
+	if (ch) c->returnValue()->setInteger(ch->maskCount('e'));
 	return true;
 }
 
@@ -560,7 +560,7 @@ static bool chan_kvs_fnc_invitecount(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szId)
 	KVSM_PARAMETERS_END(c)
 	KviChannel * ch = chan_kvs_find_channel(c,szId);
-	if (ch) c->returnValue()->setInteger(ch->inviteCount());
+	if (ch) c->returnValue()->setInteger(ch->maskCount('I'));
 	return true;
 }
 
@@ -1249,7 +1249,7 @@ static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
 
 	int idx = 0;
 
-	KviPointerList<KviMaskEntry> * l = ch->banList();
+	KviPointerList<KviMaskEntry> * l = ch->modeMasks('b');
 	if(!l) return true;
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
@@ -1296,7 +1296,7 @@ static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
 
 	int idx = 0;
 
-	KviPointerList<KviMaskEntry> * l = ch->banExceptionList();
+	KviPointerList<KviMaskEntry> * l = ch->modeMasks('e');
 	if(!l) return true;
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
@@ -1343,7 +1343,7 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 
 	int idx = 0;
 
-	KviPointerList<KviMaskEntry> * l = ch->inviteList();
+	KviPointerList<KviMaskEntry> * l = ch->modeMasks('I');
 	if(!l) return true;
 
 	for(KviMaskEntry * e = l->first();e;e = l->next())
@@ -1438,7 +1438,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	KviPointerList<KviMaskEntry> * l = ch->banList();
+	KviPointerList<KviMaskEntry> * l = ch->modeMasks('b');
 	if(!l)
 	{
 		c->returnValue()->setNothing();
@@ -1491,7 +1491,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	KviPointerList<KviMaskEntry> * l = ch->banExceptionList();
+	KviPointerList<KviMaskEntry> * l = ch->modeMasks('e');
 	if(!l)
 	{
 		c->returnValue()->setNothing();
@@ -1544,7 +1544,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	KviPointerList<KviMaskEntry> * l = ch->inviteList();
+	KviPointerList<KviMaskEntry> * l = ch->modeMasks('I');
 	if(!l)
 	{
 		c->returnValue()->setNothing();
@@ -1604,7 +1604,7 @@ static bool chan_kvs_fnc_matchqban(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	KviPointerList<KviMaskEntry> * l = ch->banList();
+	KviPointerList<KviMaskEntry> * l = ch->modeMasks('b');
 	if(!l)
 	{
 		c->returnValue()->setNothing();