From f9911dde529adf3dc03f4f14bbd70756ac2f665c Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 2 Mar 2025 14:51:02 +0000 Subject: Return references instead of pointers from the config system. We used to return NULL from these methods but now we return an empty block so this can never actually be null now. --- modules/global/gl_queue.cpp | 2 +- modules/global/global.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/global') diff --git a/modules/global/gl_queue.cpp b/modules/global/gl_queue.cpp index 583a46f6a..8a0f5c9f5 100644 --- a/modules/global/gl_queue.cpp +++ b/modules/global/gl_queue.cpp @@ -69,7 +69,7 @@ private: return; } - auto maxqueue = Config->GetModule(this->module)->Get("maxqueue", "10"); + auto maxqueue = Config->GetModule(this->module).Get("maxqueue", "10"); if (global->CountQueue(source.nc) >= maxqueue) { source.Reply(_("You can not queue any more messages.")); diff --git a/modules/global/global.cpp b/modules/global/global.cpp index 44b17326a..784088b97 100644 --- a/modules/global/global.cpp +++ b/modules/global/global.cpp @@ -61,9 +61,9 @@ public: return q->size(); } - void OnReload(Configuration::Conf *conf) override + void OnReload(Configuration::Conf &conf) override { - const auto glnick = conf->GetModule(this)->Get("client"); + const auto glnick = conf.GetModule(this).Get("client"); if (glnick.empty()) throw ConfigException(Module::name + ": must be defined"); @@ -76,21 +76,21 @@ public: void OnRestart() override { - const auto msg = Config->GetModule(this)->Get("globaloncycledown"); + const auto msg = Config->GetModule(this).Get("globaloncycledown"); if (!msg.empty()) this->SendSingle(msg, nullptr, nullptr, nullptr); } void OnShutdown() override { - const auto msg = Config->GetModule(this)->Get("globaloncycledown"); + const auto msg = Config->GetModule(this).Get("globaloncycledown"); if (!msg.empty()) this->SendSingle(msg, nullptr, nullptr, nullptr); } void OnNewServer(Server *s) override { - const auto msg = Config->GetModule(this)->Get("globaloncycleup"); + const auto msg = Config->GetModule(this).Get("globaloncycleup"); if (!msg.empty() && !Me->IsSynced()) s->Notice(global, msg); } @@ -138,7 +138,7 @@ public: return false; Anope::string line; - if (source && !Config->GetModule(this)->Get("anonymousglobal")) + if (source && !Config->GetModule(this).Get("anonymousglobal")) { // A source is available and they're not anonymous. line = Anope::printf("[%s] %s", source->GetNick().c_str(), message.c_str()); -- cgit