summaryrefslogtreecommitdiff
path: root/src/modes
diff options
context:
space:
mode:
Diffstat (limited to 'src/modes')
-rw-r--r--src/modes/cmode_b.cpp16
-rw-r--r--src/modes/cmode_h.cpp20
-rw-r--r--src/modes/cmode_i.cpp2
-rw-r--r--src/modes/cmode_k.cpp10
-rw-r--r--src/modes/cmode_l.cpp6
-rw-r--r--src/modes/cmode_m.cpp2
-rw-r--r--src/modes/cmode_n.cpp2
-rw-r--r--src/modes/cmode_o.cpp20
-rw-r--r--src/modes/cmode_p.cpp2
-rw-r--r--src/modes/cmode_s.cpp2
-rw-r--r--src/modes/cmode_t.cpp2
-rw-r--r--src/modes/cmode_v.cpp20
-rw-r--r--src/modes/umode_i.cpp2
-rw-r--r--src/modes/umode_n.cpp2
-rw-r--r--src/modes/umode_o.cpp4
-rw-r--r--src/modes/umode_s.cpp2
-rw-r--r--src/modes/umode_w.cpp2
17 files changed, 58 insertions, 58 deletions
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 1c6fe3fa5..4192a95ce 100644
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -29,7 +29,7 @@ ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b',
{
}
-ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelBan::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
int status = channel->GetStatus(source);
/* Call the correct method depending on wether we're adding or removing the mode */
@@ -49,7 +49,7 @@ ModeAction ModeChannelBan::OnModeChange(userrec* source, userrec* dest, chanrec*
return MODEACTION_ALLOW;
}
-void ModeChannelBan::RemoveMode(chanrec* channel)
+void ModeChannelBan::RemoveMode(Channel* channel)
{
BanList copy;
char moderemove[MAXBUF];
@@ -67,11 +67,11 @@ void ModeChannelBan::RemoveMode(chanrec* channel)
}
}
-void ModeChannelBan::RemoveMode(userrec* user)
+void ModeChannelBan::RemoveMode(User* user)
{
}
-void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
+void ModeChannelBan::DisplayList(User* user, Channel* channel)
{
/* Display the channel banlist */
for (BanList::reverse_iterator i = channel->bans.rbegin(); i != channel->bans.rend(); ++i)
@@ -82,12 +82,12 @@ void ModeChannelBan::DisplayList(userrec* user, chanrec* channel)
return;
}
-void ModeChannelBan::DisplayEmptyList(userrec* user, chanrec* channel)
+void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel)
{
user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name);
}
-std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *chan,int status)
+std::string& ModeChannelBan::AddBan(User *user,std::string &dest,Channel *chan,int status)
{
if ((!user) || (!chan))
{
@@ -142,7 +142,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha
return dest;
}
-ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelBan::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
{
for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
{
@@ -154,7 +154,7 @@ ModePair ModeChannelBan::ModeSet(userrec* source, userrec* dest, chanrec* channe
return std::make_pair(false, parameter);
}
-std::string& ModeChannelBan::DelBan(userrec *user,std::string& dest,chanrec *chan,int status)
+std::string& ModeChannelBan::DelBan(User *user,std::string& dest,Channel *chan,int status)
{
if ((!user) || (!chan))
{
diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index 831ec809c..98187b089 100644
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -28,9 +28,9 @@ unsigned int ModeChannelHalfOp::GetPrefixRank()
return HALFOP_VALUE;
}
-ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelHalfOp::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
{
- userrec* x = ServerInstance->FindNick(parameter);
+ User* x = ServerInstance->FindNick(parameter);
if (x)
{
if (channel->GetStatusFlags(x) & UCMODE_HOP)
@@ -45,7 +45,7 @@ ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* cha
return std::make_pair(false, parameter);
}
-void ModeChannelHalfOp::RemoveMode(chanrec* channel)
+void ModeChannelHalfOp::RemoveMode(Channel* channel)
{
CUList* list = channel->GetHalfoppedUsers();
CUList copy;
@@ -53,7 +53,7 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel)
for (CUList::iterator i = list->begin(); i != list->end(); i++)
{
- userrec* n = i->first;
+ User* n = i->first;
copy.insert(std::make_pair(n,n->nick));
}
@@ -66,11 +66,11 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel)
}
-void ModeChannelHalfOp::RemoveMode(userrec* user)
+void ModeChannelHalfOp::RemoveMode(User* user)
{
}
-ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelHalfOp::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
/* If halfops are not enabled in the conf, we don't execute
* anything in this class at all.
@@ -103,9 +103,9 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr
return MODEACTION_DENY;
}
-std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec *chan,int status)
+std::string ModeChannelHalfOp::AddHalfOp(User *user,const char* dest,Channel *chan,int status)
{
- userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+ User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
if (d)
{
@@ -131,9 +131,9 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec
return "";
}
-std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status)
+std::string ModeChannelHalfOp::DelHalfOp(User *user,const char *dest,Channel *chan,int status)
{
- userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+ User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
if (d)
{
diff --git a/src/modes/cmode_i.cpp b/src/modes/cmode_i.cpp
index 12bdb18b8..550ea24d1 100644
--- a/src/modes/cmode_i.cpp
+++ b/src/modes/cmode_i.cpp
@@ -21,7 +21,7 @@ ModeChannelInviteOnly::ModeChannelInviteOnly(InspIRCd* Instance) : ModeHandler(I
{
}
-ModeAction ModeChannelInviteOnly::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelInviteOnly::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (channel->modes[CM_INVITEONLY] != adding)
{
diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index f6a29af35..34d8a6452 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -21,7 +21,7 @@ ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k',
{
}
-ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelKey::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
{
if (channel->modes[CM_KEY])
{
@@ -33,7 +33,7 @@ ModePair ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channe
}
}
-void ModeChannelKey::RemoveMode(chanrec* channel)
+void ModeChannelKey::RemoveMode(Channel* channel)
{
/** +k needs a parameter when being removed,
* so we have a special-case RemoveMode here for it
@@ -48,17 +48,17 @@ void ModeChannelKey::RemoveMode(chanrec* channel)
}
}
-void ModeChannelKey::RemoveMode(userrec* user)
+void ModeChannelKey::RemoveMode(User* user)
{
}
-bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
{
/* When TS is equal, the alphabetically later channel key wins */
return (their_param < our_param);
}
-ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelKey::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
{
diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 1a57a440d..50ee28683 100644
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -21,7 +21,7 @@ ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, '
{
}
-ModePair ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelLimit::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
{
if (channel->limit)
{
@@ -33,13 +33,13 @@ ModePair ModeChannelLimit::ModeSet(userrec* source, userrec* dest, chanrec* chan
}
}
-bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
{
/* When TS is equal, the higher channel limit wins */
return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
}
-ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelLimit::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (adding)
{
diff --git a/src/modes/cmode_m.cpp b/src/modes/cmode_m.cpp
index 520248fda..ad17d5d30 100644
--- a/src/modes/cmode_m.cpp
+++ b/src/modes/cmode_m.cpp
@@ -21,7 +21,7 @@ ModeChannelModerated::ModeChannelModerated(InspIRCd* Instance) : ModeHandler(Ins
{
}
-ModeAction ModeChannelModerated::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelModerated::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (channel->modes[CM_MODERATED] != adding)
{
diff --git a/src/modes/cmode_n.cpp b/src/modes/cmode_n.cpp
index ddc2e1bbd..1bad2f92f 100644
--- a/src/modes/cmode_n.cpp
+++ b/src/modes/cmode_n.cpp
@@ -21,7 +21,7 @@ ModeChannelNoExternal::ModeChannelNoExternal(InspIRCd* Instance) : ModeHandler(I
{
}
-ModeAction ModeChannelNoExternal::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelNoExternal::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (channel->modes[CM_NOEXTERNAL] != adding)
{
diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 27bc62100..a43eaeac9 100644
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -28,9 +28,9 @@ unsigned int ModeChannelOp::GetPrefixRank()
return OP_VALUE;
}
-ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelOp::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
{
- userrec* x = ServerInstance->FindNick(parameter);
+ User* x = ServerInstance->FindNick(parameter);
if (x)
{
if (channel->GetStatusFlags(x) & UCMODE_OP)
@@ -46,7 +46,7 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel
}
-void ModeChannelOp::RemoveMode(chanrec* channel)
+void ModeChannelOp::RemoveMode(Channel* channel)
{
CUList* list = channel->GetOppedUsers();
CUList copy;
@@ -54,7 +54,7 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
for (CUList::iterator i = list->begin(); i != list->end(); i++)
{
- userrec* n = i->first;
+ User* n = i->first;
copy.insert(std::make_pair(n,n->nick));
}
@@ -66,11 +66,11 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
}
}
-void ModeChannelOp::RemoveMode(userrec* user)
+void ModeChannelOp::RemoveMode(User* user)
{
}
-ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelOp::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
int status = channel->GetStatus(source);
@@ -94,9 +94,9 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec*
return MODEACTION_DENY;
}
-std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
+std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int status)
{
- userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+ User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
if (d)
{
@@ -122,9 +122,9 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
return "";
}
-std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
+std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int status)
{
- userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+ User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
if (d)
{
diff --git a/src/modes/cmode_p.cpp b/src/modes/cmode_p.cpp
index 15c33222e..c9749dc38 100644
--- a/src/modes/cmode_p.cpp
+++ b/src/modes/cmode_p.cpp
@@ -21,7 +21,7 @@ ModeChannelPrivate::ModeChannelPrivate(InspIRCd* Instance) : ModeHandler(Instanc
{
}
-ModeAction ModeChannelPrivate::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelPrivate::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (channel->modes[CM_PRIVATE] != adding)
{
diff --git a/src/modes/cmode_s.cpp b/src/modes/cmode_s.cpp
index 135291592..47e66d139 100644
--- a/src/modes/cmode_s.cpp
+++ b/src/modes/cmode_s.cpp
@@ -21,7 +21,7 @@ ModeChannelSecret::ModeChannelSecret(InspIRCd* Instance) : ModeHandler(Instance,
{
}
-ModeAction ModeChannelSecret::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelSecret::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (channel->modes[CM_SECRET] != adding)
{
diff --git a/src/modes/cmode_t.cpp b/src/modes/cmode_t.cpp
index 2a6c06b42..7124ecec4 100644
--- a/src/modes/cmode_t.cpp
+++ b/src/modes/cmode_t.cpp
@@ -21,7 +21,7 @@ ModeChannelTopicOps::ModeChannelTopicOps(InspIRCd* Instance) : ModeHandler(Insta
{
}
-ModeAction ModeChannelTopicOps::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelTopicOps::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (channel->modes[CM_TOPICLOCK] != adding)
{
diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 0ea887073..b472cb1fc 100644
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -28,9 +28,9 @@ unsigned int ModeChannelVoice::GetPrefixRank()
return VOICE_VALUE;
}
-ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelVoice::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
{
- userrec* x = ServerInstance->FindNick(parameter);
+ User* x = ServerInstance->FindNick(parameter);
if (x)
{
if (channel->GetStatusFlags(x) & UCMODE_VOICE)
@@ -45,7 +45,7 @@ ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* chan
return std::make_pair(false, parameter);
}
-void ModeChannelVoice::RemoveMode(chanrec* channel)
+void ModeChannelVoice::RemoveMode(Channel* channel)
{
CUList* list = channel->GetVoicedUsers();
CUList copy;
@@ -53,7 +53,7 @@ void ModeChannelVoice::RemoveMode(chanrec* channel)
for (CUList::iterator i = list->begin(); i != list->end(); i++)
{
- userrec* n = i->first;
+ User* n = i->first;
copy.insert(std::make_pair(n,n->nick));
}
@@ -65,11 +65,11 @@ void ModeChannelVoice::RemoveMode(chanrec* channel)
}
}
-void ModeChannelVoice::RemoveMode(userrec* user)
+void ModeChannelVoice::RemoveMode(User* user)
{
}
-ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelVoice::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
int status = channel->GetStatus(source);
@@ -93,9 +93,9 @@ ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanre
return MODEACTION_DENY;
}
-std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *chan,int status)
+std::string ModeChannelVoice::AddVoice(User *user,const char* dest,Channel *chan,int status)
{
- userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+ User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
if (d)
{
@@ -121,9 +121,9 @@ std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *c
return "";
}
-std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *chan,int status)
+std::string ModeChannelVoice::DelVoice(User *user,const char *dest,Channel *chan,int status)
{
- userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+ User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
if (d)
{
diff --git a/src/modes/umode_i.cpp b/src/modes/umode_i.cpp
index a599f8f6f..e6a142459 100644
--- a/src/modes/umode_i.cpp
+++ b/src/modes/umode_i.cpp
@@ -21,7 +21,7 @@ ModeUserInvisible::ModeUserInvisible(InspIRCd* Instance) : ModeHandler(Instance,
{
}
-ModeAction ModeUserInvisible::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserInvisible::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))
diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp
index c9c9e312e..0ffffac10 100644
--- a/src/modes/umode_n.cpp
+++ b/src/modes/umode_n.cpp
@@ -21,7 +21,7 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan
{
}
-ModeAction ModeUserServerNoticeMask::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))
diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp
index 30ed089f6..2415a940a 100644
--- a/src/modes/umode_o.cpp
+++ b/src/modes/umode_o.cpp
@@ -21,7 +21,7 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, '
{
}
-ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
/* Only opers can execute this class at all */
if (!*source->oper)
@@ -35,7 +35,7 @@ ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanre
* Note that oper status is only given in cmd_oper.cpp
* NOT here. It is impossible to directly set +o without
* verifying as an oper and getting an opertype assigned
- * to your userrec!
+ * to your User!
*/
ServerInstance->SNO->WriteToSnoMask('o', "User %s de-opered (by %s)", dest->nick, source->nick);
dest->UnOper();
diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp
index faf6348de..01e57da5b 100644
--- a/src/modes/umode_s.cpp
+++ b/src/modes/umode_s.cpp
@@ -21,7 +21,7 @@ ModeUserServerNotice::ModeUserServerNotice(InspIRCd* Instance) : ModeHandler(Ins
{
}
-ModeAction ModeUserServerNotice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserServerNotice::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))
diff --git a/src/modes/umode_w.cpp b/src/modes/umode_w.cpp
index 3f1cd90c8..914327cbd 100644
--- a/src/modes/umode_w.cpp
+++ b/src/modes/umode_w.cpp
@@ -21,7 +21,7 @@ ModeUserWallops::ModeUserWallops(InspIRCd* Instance) : ModeHandler(Instance, 'w'
{
}
-ModeAction ModeUserWallops::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeUserWallops::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
/* Only opers can change other users modes */
if ((source != dest) && (!*source->oper))