aboutsummaryrefslogtreecommitdiffstats
path: root/src
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
parentOnly upgrade Homebrew packages that we actually use. (diff)
Pascalize ExtensionItem::{get,set,unset}_raw.
Diffstat (limited to 'src')
-rw-r--r--src/base.cpp6
-rw-r--r--src/coremods/core_channel/invite.h6
-rw-r--r--src/extensible.cpp8
-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
8 files changed, 29 insertions, 29 deletions
diff --git a/src/base.cpp b/src/base.cpp
index c7765f1f5..c0e4880a5 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -109,7 +109,7 @@ ExtensionItem::ExtensionItem(Module* mod, const std::string& Key, ExtensibleType
{
}
-void* ExtensionItem::get_raw(const Extensible* container) const
+void* ExtensionItem::GetRaw(const Extensible* container) const
{
Extensible::ExtensibleStore::const_iterator i =
container->extensions.find(const_cast<ExtensionItem*>(this));
@@ -118,7 +118,7 @@ void* ExtensionItem::get_raw(const Extensible* container) const
return i->second;
}
-void* ExtensionItem::set_raw(Extensible* container, void* value)
+void* ExtensionItem::SetRaw(Extensible* container, void* value)
{
std::pair<Extensible::ExtensibleStore::iterator,bool> rv =
container->extensions.insert(std::make_pair(this, value));
@@ -134,7 +134,7 @@ void* ExtensionItem::set_raw(Extensible* container, void* value)
}
}
-void* ExtensionItem::unset_raw(Extensible* container)
+void* ExtensionItem::UnsetRaw(Extensible* container)
{
Extensible::ExtensibleStore::iterator i = container->extensions.find(this);
if (i == container->extensions.end())
diff --git a/src/coremods/core_channel/invite.h b/src/coremods/core_channel/invite.h
index 5cd347c51..7980a4cc8 100644
--- a/src/coremods/core_channel/invite.h
+++ b/src/coremods/core_channel/invite.h
@@ -69,18 +69,18 @@ class Invite::ExtItem : public ExtensionItem
Store<T>* get(Extensible* ext, bool create = false)
{
- Store<T>* store = static_cast<Store<T>*>(get_raw(ext));
+ Store<T>* store = static_cast<Store<T>*>(GetRaw(ext));
if ((create) && (!store))
{
store = new Store<T>;
- set_raw(ext, store);
+ SetRaw(ext, store);
}
return store;
}
void unset(Extensible* ext)
{
- void* store = unset_raw(ext);
+ void* store = UnsetRaw(ext);
if (store)
Delete(ext, store);
}
diff --git a/src/extensible.cpp b/src/extensible.cpp
index 59bbb78fd..229cbb2c6 100644
--- a/src/extensible.cpp
+++ b/src/extensible.cpp
@@ -43,15 +43,15 @@ void IntExtItem::FromNetwork(Extensible* container, const std::string& value)
intptr_t IntExtItem::get(const Extensible* container) const
{
- return reinterpret_cast<intptr_t>(get_raw(container));
+ return reinterpret_cast<intptr_t>(GetRaw(container));
}
void IntExtItem::set(Extensible* container, intptr_t value)
{
if (value)
- set_raw(container, reinterpret_cast<void*>(value));
+ SetRaw(container, reinterpret_cast<void*>(value));
else
- unset_raw(container);
+ UnsetRaw(container);
}
std::string IntExtItem::ToInternal(const Extensible* container, void* item) const
@@ -66,7 +66,7 @@ std::string IntExtItem::ToNetwork(const Extensible* container, void* item) const
void IntExtItem::unset(Extensible* container)
{
- unset_raw(container);
+ UnsetRaw(container);
}
StringExtItem::StringExtItem(Module* owner, const std::string& key, ExtensibleType exttype, bool sync)
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