From 59ee026b3bfd78a67f3141bd362a2f11e9e2c311 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 17 Mar 2021 05:58:47 +0000 Subject: Pascalize Get in extension item classes. --- include/extensible.h | 4 ++-- include/listmode.h | 2 +- include/modules/cap.h | 6 +++--- include/parammode.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/extensible.h b/include/extensible.h index 50ffad3c3..e19e31eb0 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -202,7 +202,7 @@ class SimpleExtItem : public ExtensionItem /** Destroys an instance of the SimpleExtItem class. */ virtual ~SimpleExtItem() = default; - inline T* get(const Extensible* container) const + inline T* Get(const Extensible* container) const { return static_cast(GetRaw(container)); } @@ -291,7 +291,7 @@ class CoreExport IntExtItem : public ExtensionItem * @param container The container that the IntExtItem is set on. * @return Either the value of this IntExtItem or NULL if it is not set. */ - intptr_t get(const Extensible* container) const; + intptr_t Get(const Extensible* container) const; /** @copydoc ExtensionItem::FromInternal */ void FromInternal(Extensible* container, const std::string& value) override; diff --git a/include/listmode.h b/include/listmode.h index 0a8a0f88b..66123c723 100644 --- a/include/listmode.h +++ b/include/listmode.h @@ -219,7 +219,7 @@ class CoreExport ListModeBase : public ModeHandler inline ListModeBase::ModeList* ListModeBase::GetList(Channel* channel) { - ChanData* cd = extItem.get(channel); + ChanData* cd = extItem.Get(channel); if (!cd) return NULL; diff --git a/include/modules/cap.h b/include/modules/cap.h index 371bff19f..a4ebc0ce7 100644 --- a/include/modules/cap.h +++ b/include/modules/cap.h @@ -197,7 +197,7 @@ namespace Cap { if (!IsRegistered()) return false; - Ext caps = extitem->get(user); + Ext caps = extitem->Get(user); return ((caps & GetMask()) != 0); } @@ -209,7 +209,7 @@ namespace Cap { if (!IsRegistered()) return; - Ext curr = extitem->get(user); + Ext curr = extitem->Get(user); extitem->set(user, (val ? AddToMask(curr) : DelFromMask(curr))); } @@ -254,7 +254,7 @@ namespace Cap */ Protocol GetProtocol(LocalUser* user) const { - return ((IsRegistered() && (extitem->get(user) & CAP_302_BIT)) ? CAP_302 : CAP_LEGACY); + return ((IsRegistered() && (extitem->Get(user) & CAP_302_BIT)) ? CAP_302 : CAP_LEGACY); } /** Called when a user requests to turn this capability on or off. diff --git a/include/parammode.h b/include/parammode.h index 395048241..98b34269f 100644 --- a/include/parammode.h +++ b/include/parammode.h @@ -71,6 +71,6 @@ class ParamMode : public ParamModeBase void GetParameter(Channel* chan, std::string& out) override { T* mh = static_cast(this); - mh->SerializeParam(chan, ext.get(chan), out); + mh->SerializeParam(chan, ext.Get(chan), out); } }; -- cgit v1.3.1-10-gc9f91