aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2010-08-17 03:24:18 +0000
committerGravatar Szymon Tomasz Stefanek2010-08-17 03:24:18 +0000
commite2cd27bef31dfeef4ca59152c947b873045bae4c (patch)
tree21b0ee797e66c2abf4338eaedc04ccd3fee18fcc
parentremoved compilation warning for win32 (diff)
downloadKVIrc-e2cd27bef31dfeef4ca59152c947b873045bae4c.tar.gz
KVIrc-e2cd27bef31dfeef4ca59152c947b873045bae4c.tar.bz2
KVIrc-e2cd27bef31dfeef4ca59152c947b873045bae4c.zip
Fix an undetected syntax error in tmphighlight.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4889 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--src/kvirc/kernel/kvi_options.cpp2
-rw-r--r--src/kvirc/ui/kvi_channel.cpp4
-rw-r--r--src/modules/tmphighlight/libkvitmphighlight.cpp12
3 files changed, 9 insertions, 9 deletions
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 95c880f94..7c70b976b 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -665,7 +665,7 @@ KviUIntOption g_uintOptionsTable[KVI_NUM_UINT_OPTIONS]=
UINT_OPTION("UserIrcViewOwnBackground",8,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
UINT_OPTION("NotifierPixmapAlign",0,KviOption_sectFlagNotifier | KviOption_groupTheme),
UINT_OPTION("OutputDatetimeFormat",0,KviOption_sectFlagIrcView),
- UINT_OPTION("OnJoinRequestsDelay",1,KviOption_sectFlagConnection),
+ UINT_OPTION("OnJoinRequestsDelay",1,KviOption_sectFlagConnection), // FIXME: Wouldn't this be nicer in msecs defaulting to 100-200 ?
};
#define FONT_OPTION(_name,_face,_size,_flags) \
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 2241fb3e2..757708bfc 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -654,8 +654,8 @@ void KviChannel::addHighlightedUser(const QString & szNick)
{
if(!m_pUserListView->findEntry(szNick) || m_pTmpHighLighted->contains(szNick,Qt::CaseInsensitive))
return;
- else
- m_pTmpHighLighted->append(szNick);
+
+ m_pTmpHighLighted->append(szNick);
}
void KviChannel::removeHighlightedUser(const QString & szNick)
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index 3c86498df..e61119f0b 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -57,7 +57,7 @@ static bool tmphighlight_kvs_cmd_addnick(KviKvsModuleCommandCall * c)
if( !c->window()->console() )return c->context()->errorNoIrcContext();
if( c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
- if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+ if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
{
c->warning(__tr2qs("Current window is not a channel"));
return false;
@@ -95,7 +95,7 @@ static bool tmphighlight_kvs_cmd_removenick(KviKvsModuleCommandCall * c)
if( !c->window()->console() )return c->context()->errorNoIrcContext();
if( c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
- if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+ if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
{
c->warning(__tr2qs("Current window is not a channel"));
return false;
@@ -148,7 +148,7 @@ static bool tmphighlight_kvs_cmd_addchannel(KviKvsModuleCommandCall * c)
if( !pWnd->console() )return c->context()->errorNoIrcContext();
if( pWnd->console()->isNotConnected() )return c->context()->errorNoIrcContext();
- if(!pWnd->type() == KVI_WINDOW_TYPE_CHANNEL)
+ if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
{
c->warning(__tr2qs("Current window is not a channel"));
return false;
@@ -200,7 +200,7 @@ static bool tmphighlight_kvs_cmd_removechannel(KviKvsModuleCommandCall * c)
if( !pWnd->console() )return c->context()->errorNoIrcContext();
if( pWnd->console()->isNotConnected() )return c->context()->errorNoIrcContext();
- if(!pWnd->type() == KVI_WINDOW_TYPE_CHANNEL)
+ if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
{
c->warning(__tr2qs("Current window is not a channel"));
return false;
@@ -238,7 +238,7 @@ static bool tmphighlight_kvs_fnc_isnickhighlighted(KviKvsModuleFunctionCall * c)
if( !c->window()->console() )return c->context()->errorNoIrcContext();
if( c->window()->console()->isNotConnected() )return c->context()->errorNoIrcContext();
- if(!c->window()->type() == KVI_WINDOW_TYPE_CHANNEL)
+ if(c->window()->type() != KVI_WINDOW_TYPE_CHANNEL)
{
c->warning(__tr2qs("Current window is not a channel"));
return false;
@@ -288,7 +288,7 @@ static bool tmphighlight_kvs_fnc_ischannelhighlighted(KviKvsModuleFunctionCall *
if( !pWnd->console() )return c->context()->errorNoIrcContext();
if( pWnd->console()->isNotConnected() )return c->context()->errorNoIrcContext();
- if(!pWnd->type() == KVI_WINDOW_TYPE_CHANNEL)
+ if(pWnd->type() != KVI_WINDOW_TYPE_CHANNEL)
{
c->warning(__tr2qs("Current window is not a channel"));
return false;