aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/chan
diff options
context:
space:
mode:
authorGravatar Elvio Basello2011-01-04 22:20:53 +0000
committerGravatar Elvio Basello2011-01-04 22:20:53 +0000
commit60f9fb826e44b436832d2ec9441188addfaf9ad7 (patch)
tree3622d8b4badd02d3b1b9cb55f902a786e161abba /src/modules/chan
parentyet more splitting; killed some defines (diff)
downloadKVIrc-60f9fb826e44b436832d2ec9441188addfaf9ad7.tar.gz
KVIrc-60f9fb826e44b436832d2ec9441188addfaf9ad7.tar.bz2
KVIrc-60f9fb826e44b436832d2ec9441188addfaf9ad7.zip
yet more splitting;
added doxygen comments; improved hungarian notation; git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5297 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/chan')
-rw-r--r--src/modules/chan/libkvichan.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index fad936528..59187f8a7 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1155,34 +1155,41 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
{
if(bChanAdmins)
{
- if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_mask;
+ if(e->flags() & KviIrcUserEntry::ChanAdmin)
+ goto check_mask;
}
if(bOp)
{
- if(e->flags() & KVI_USERFLAG_OP)goto check_mask;
+ if(e->flags() & KviIrcUserEntry::Op)
+ goto check_mask;
}
if(bVoice)
{
- if(e->flags() & KVI_USERFLAG_VOICE)goto check_mask;
+ if(e->flags() & KviIrcUserEntry::Voice)
+ goto check_mask;
}
if(bHalfOp)
{
- if(e->flags() & KVI_USERFLAG_HALFOP)goto check_mask;
+ if(e->flags() & KviIrcUserEntry::HalfOp)
+ goto check_mask;
}
if(bUserOp)
{
- if(e->flags() & KVI_USERFLAG_USEROP)goto check_mask;
+ if(e->flags() & KviIrcUserEntry::UserOp)
+ goto check_mask;
}
if(bNone)
{
- if(!(e->flags() & KVI_USERFLAG_MODEMASK))goto check_mask;
+ if(!(e->flags() & KviIrcUserEntry::ModeMask))
+ goto check_mask;
}
goto next_item;
}
check_mask:
if(bCheckMask)
{
- if(mask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item;
+ if(mask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)
+ goto add_item;
goto next_item;
}
add_item: