diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_callerid.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_delayjoin.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_nicklock.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_operprefix.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_permchannels.cpp | 10 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 6 |
6 files changed, 14 insertions, 14 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 16b883f63..b84ee2c9c 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -32,7 +32,7 @@ class callerid_data : public classbase std::list<callerid_data *> wholistsme; callerid_data() : lastnotify(0) { } - callerid_data(const std::string& str, InspIRCd* ServerInstance) + callerid_data(const std::string& str) { irc::commasepstream s(str); std::string tok; @@ -85,7 +85,7 @@ struct CallerIDExtInfo : public ExtensionItem void unserialize(Module* requestor, Extensible* container, const std::string& value) { - callerid_data* dat = new callerid_data(value, requestor->ServerInstance); + callerid_data* dat = new callerid_data(value); set_raw(container, dat); } diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index ffaf1223b..a7a8575b4 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -169,7 +169,7 @@ void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std: /* Display the join to everyone else (the user who joined got it earlier) */ channel->WriteAllExceptSender(user, false, 0, "JOIN %s", channel->name.c_str()); - std::string n = this->ServerInstance->Modes->ModeString(user, channel); + std::string n = ServerInstance->Modes->ModeString(user, channel); if (n.length() > 0) channel->WriteAllExceptSender(user, false, 0, "MODE %s +%s", channel->name.c_str(), n.c_str()); } diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index ddfc47455..9a3eb3222 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -21,7 +21,7 @@ class CommandNicklock : public Command { public: LocalIntExt& locked; - CommandNicklock (Module* Creator, LocalIntExt& ext) : Command(Creator->ServerInstance, Creator,"NICKLOCK", "o", 2), + CommandNicklock (Module* Creator, LocalIntExt& ext) : Command(ServerInstance, Creator,"NICKLOCK", "o", 2), locked(ext) { syntax = "<oldnick> <newnick>"; @@ -89,7 +89,7 @@ class CommandNickunlock : public Command { public: LocalIntExt& locked; - CommandNickunlock (Module* Creator, LocalIntExt& ext) : Command(Creator->ServerInstance, Creator,"NICKUNLOCK", "o", 1), + CommandNickunlock (Module* Creator, LocalIntExt& ext) : Command(ServerInstance, Creator,"NICKUNLOCK", "o", 1), locked(ext) { syntax = "<locked-nick>"; diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index 47f19e90d..7bf3a3623 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -98,7 +98,7 @@ class ModuleOperPrefixMode : public Module modechange.push_back(channel->name); modechange.push_back(modeline); modechange.push_back(user->nick); - ServerInstance->SendMode(modechange,this->ServerInstance->FakeClient); + ServerInstance->SendMode(modechange,ServerInstance->FakeClient); } void OnPostJoin(Membership* memb) diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 41a5daf33..674a6dca5 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -17,7 +17,7 @@ // Not in a class due to circular dependancy hell. static std::string permchannelsconf; -static bool WriteDatabase(InspIRCd *ServerInstance) +static bool WriteDatabase() { FILE *f; @@ -100,7 +100,7 @@ class PermChannel : public ModeHandler channel->SetMode('P',true); // Save permchannels db if needed. - WriteDatabase(ServerInstance); + WriteDatabase(); return MODEACTION_ALLOW; } } @@ -134,7 +134,7 @@ class PermChannel : public ModeHandler channel->SetMode('P',false); // Save permchannels db if needed. - WriteDatabase(ServerInstance); + WriteDatabase(); return MODEACTION_ALLOW; } } @@ -253,7 +253,7 @@ public: virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt) { if (chan && chan->IsModeSet('P')) - WriteDatabase(ServerInstance); + WriteDatabase(); return MOD_RES_PASSTHRU; } @@ -261,7 +261,7 @@ public: virtual void OnPostTopicChange(User*, Channel *c, const std::string&) { if (c->IsModeSet('P')) - WriteDatabase(ServerInstance); + WriteDatabase(); } virtual Version GetVersion() diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 2549461f1..3877daf42 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -250,7 +250,7 @@ void ModuleSpanningTree::ConnectServer(Link* x) if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name))) { - this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself."); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself."); return; } @@ -282,7 +282,7 @@ void ModuleSpanningTree::ConnectServer(Link* x) } else { - this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); if (ServerInstance->SocketCull.find(newsocket) == ServerInstance->SocketCull.end()) ServerInstance->SocketCull[newsocket] = newsocket; Utils->DoFailOver(x); @@ -298,7 +298,7 @@ void ModuleSpanningTree::ConnectServer(Link* x) } catch (ModuleException& e) { - this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason()); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason()); Utils->DoFailOver(x); } } |