aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-07-20 11:58:28 +0100
committerGravatar Sadie Powell2020-07-20 11:58:28 +0100
commitef4e61cd241a7e8cd41ac49621a81952267c3dfb (patch)
treeae91a834393a7b87cbc92a4f42f5c69a190e69e8 /src/modules
parentOnly upgrade Homebrew packages that we actually use. (diff)
downloadinspircd++-ef4e61cd241a7e8cd41ac49621a81952267c3dfb.tar.gz
inspircd++-ef4e61cd241a7e8cd41ac49621a81952267c3dfb.tar.bz2
inspircd++-ef4e61cd241a7e8cd41ac49621a81952267c3dfb.zip
Pascalize ExtensionItem::{get,set,unset}_raw.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/extra/m_geo_maxmind.cpp6
-rw-r--r--src/modules/m_callerid.cpp8
-rw-r--r--src/modules/m_monitor.cpp6
-rw-r--r--src/modules/m_sslinfo.cpp6
-rw-r--r--src/modules/m_topiclock.cpp12
5 files changed, 19 insertions, 19 deletions
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp
index 2ccd4d80c..006ec656d 100644
--- a/src/modules/extra/m_geo_maxmind.cpp
+++ b/src/modules/extra/m_geo_maxmind.cpp
@@ -52,18 +52,18 @@ class GeolocationExtItem : public ExtensionItem
Geolocation::Location* get(const Extensible* item) const
{
- return static_cast<Geolocation::Location*>(get_raw(item));
+ return static_cast<Geolocation::Location*>(GetRaw(item));
}
void set(Extensible* item, Geolocation::Location* value)
{
value->refcount_inc();
- Delete(item, set_raw(item, value));
+ Delete(item, SetRaw(item, value));
}
void unset(Extensible* container)
{
- Delete(container, unset_raw(container));
+ Delete(container, UnsetRaw(container));
}
};
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 3a7d56ab7..2b954a0e3 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -94,11 +94,11 @@ struct CallerIDExtInfo : public ExtensionItem
void FromInternal(Extensible* container, const std::string& value) override
{
- void* old = get_raw(container);
+ void* old = GetRaw(container);
if (old)
this->Delete(NULL, old);
callerid_data* dat = new callerid_data;
- set_raw(container, dat);
+ SetRaw(container, dat);
irc::commasepstream s(value);
std::string tok;
@@ -121,11 +121,11 @@ struct CallerIDExtInfo : public ExtensionItem
callerid_data* get(User* user, bool create)
{
- callerid_data* dat = static_cast<callerid_data*>(get_raw(user));
+ callerid_data* dat = static_cast<callerid_data*>(GetRaw(user));
if (create && !dat)
{
dat = new callerid_data;
- set_raw(user, dat);
+ SetRaw(user, dat);
}
return dat;
}
diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index a06e0c3d2..2fec3fd28 100644
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -71,18 +71,18 @@ class IRCv3::Monitor::Manager
ExtData* get(Extensible* container, bool create = false)
{
- ExtData* extdata = static_cast<ExtData*>(get_raw(container));
+ ExtData* extdata = static_cast<ExtData*>(GetRaw(container));
if ((!extdata) && (create))
{
extdata = new ExtData;
- set_raw(container, extdata);
+ SetRaw(container, extdata);
}
return extdata;
}
void unset(Extensible* container)
{
- Delete(container, unset_raw(container));
+ Delete(container, UnsetRaw(container));
}
std::string ToInternal(const Extensible* container, void* item) const override
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 3c259dcee..735342c7b 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -51,20 +51,20 @@ class SSLCertExt : public ExtensionItem
ssl_cert* get(const Extensible* item) const
{
- return static_cast<ssl_cert*>(get_raw(item));
+ return static_cast<ssl_cert*>(GetRaw(item));
}
void set(Extensible* item, ssl_cert* value)
{
value->refcount_inc();
- ssl_cert* old = static_cast<ssl_cert*>(set_raw(item, value));
+ ssl_cert* old = static_cast<ssl_cert*>(SetRaw(item, value));
if (old && old->refcount_dec())
delete old;
}
void unset(Extensible* container)
{
- Delete(container, unset_raw(container));
+ Delete(container, UnsetRaw(container));
}
std::string ToNetwork(const Extensible* container, void* item) const override
diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp
index e0d48dec2..ac27b1529 100644
--- a/src/modules/m_topiclock.cpp
+++ b/src/modules/m_topiclock.cpp
@@ -85,7 +85,7 @@ class FlagExtItem : public ExtensionItem
bool get(const Extensible* container) const
{
- return (get_raw(container) != NULL);
+ return (GetRaw(container) != NULL);
}
std::string ToHuman(const Extensible* container, void* item) const override
@@ -102,22 +102,22 @@ class FlagExtItem : public ExtensionItem
void FromNetwork(Extensible* container, const std::string& value) override
{
if (value == "1")
- set_raw(container, this);
+ SetRaw(container, this);
else
- unset_raw(container);
+ UnsetRaw(container);
}
void set(Extensible* container, bool value)
{
if (value)
- set_raw(container, this);
+ SetRaw(container, this);
else
- unset_raw(container);
+ UnsetRaw(container);
}
void unset(Extensible* container)
{
- unset_raw(container);
+ UnsetRaw(container);
}
void Delete(Extensible* container, void* item) override