From a434baed9154d90ad0dfd31c71a463fb8300bfd8 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 1 Oct 2012 18:50:29 -0400 Subject: Allow modules to store data in their own databases. --- modules/commands/cs_entrymsg.cpp | 7 +------ modules/commands/cs_seen.cpp | 7 +------ modules/commands/cs_set_misc.cpp | 7 +------ modules/commands/cs_suspend.cpp | 7 +------ modules/commands/hs_request.cpp | 5 +---- modules/commands/ns_ajoin.cpp | 5 +---- modules/commands/ns_set_misc.cpp | 7 +------ modules/commands/ns_suspend.cpp | 7 +------ modules/commands/os_forbid.h | 2 +- modules/commands/os_ignore.h | 2 +- modules/commands/os_news.h | 2 +- modules/commands/os_oper.cpp | 7 +------ modules/commands/os_session.h | 2 +- modules/commands/os_stats.cpp | 5 +---- 14 files changed, 14 insertions(+), 58 deletions(-) (limited to 'modules/commands') diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp index e5b8d2221..1fce5fac0 100644 --- a/modules/commands/cs_entrymsg.cpp +++ b/modules/commands/cs_entrymsg.cpp @@ -20,7 +20,7 @@ struct EntryMsg : Serializable Anope::string message; time_t when; - EntryMsg(ChannelInfo *c, const Anope::string &cname, const Anope::string &cmessage, time_t ct = Anope::CurTime) + EntryMsg(ChannelInfo *c, const Anope::string &cname, const Anope::string &cmessage, time_t ct = Anope::CurTime) : Serializable("EntryMsg") { this->ci = c; this->creator = cname; @@ -28,11 +28,6 @@ struct EntryMsg : Serializable this->when = ct; } - const Anope::string serialize_name() const anope_override - { - return "EntryMsg"; - } - Serialize::Data serialize() const anope_override { Serialize::Data data; diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp index ce88efa44..8ae12ba7e 100644 --- a/modules/commands/cs_seen.cpp +++ b/modules/commands/cs_seen.cpp @@ -33,15 +33,10 @@ struct SeenInfo : Serializable Anope::string message; // for part/kick/quit time_t last; // the time when the user was last seen - SeenInfo() + SeenInfo() : Serializable("SeenInfo") { } - const Anope::string serialize_name() const anope_override - { - return "SeenInfo"; - } - Serialize::Data serialize() const anope_override { Serialize::Data data; diff --git a/modules/commands/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp index 9b8879bbd..251a2b480 100644 --- a/modules/commands/cs_set_misc.cpp +++ b/modules/commands/cs_set_misc.cpp @@ -18,15 +18,10 @@ struct CSMiscData : ExtensibleItem, Serializable Anope::string name; Anope::string data; - CSMiscData(ChannelInfo *c, const Anope::string &n, const Anope::string &d) : ci(c), name(n), data(d) + CSMiscData(ChannelInfo *c, const Anope::string &n, const Anope::string &d) : Serializable("CSMiscData"), ci(c), name(n), data(d) { } - const Anope::string serialize_name() const anope_override - { - return "CSMiscData"; - } - Serialize::Data serialize() const anope_override { Serialize::Data sdata; diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp index e7969c926..9cb829ad1 100644 --- a/modules/commands/cs_suspend.cpp +++ b/modules/commands/cs_suspend.cpp @@ -18,15 +18,10 @@ struct ChanSuspend : ExtensibleItem, Serializable Anope::string chan; time_t when; - ChanSuspend() + ChanSuspend() : Serializable("ChanSuspend") { } - const Anope::string serialize_name() const - { - return "ChanSuspend"; - } - Serialize::Data serialize() const anope_override { Serialize::Data sd; diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp index 94b181f51..8a9de386b 100644 --- a/modules/commands/hs_request.cpp +++ b/modules/commands/hs_request.cpp @@ -30,10 +30,7 @@ struct HostRequest : ExtensibleItem, Serializable Anope::string host; time_t time; - const Anope::string serialize_name() const anope_override - { - return "HostRequest"; - } + HostRequest() : Serializable("HostRequest") { } Serialize::Data serialize() const anope_override { diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp index 5a33fb7db..d3b2cadb8 100644 --- a/modules/commands/ns_ajoin.cpp +++ b/modules/commands/ns_ajoin.cpp @@ -26,10 +26,7 @@ struct AJoinEntry : Serializable Anope::string channel; Anope::string key; - const Anope::string serialize_name() const anope_override - { - return "AJoinEntry"; - } + AJoinEntry() : Serializable("AJoinEntry") { } Serialize::Data serialize() const anope_override { diff --git a/modules/commands/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp index c4c7b4ae3..0b7011892 100644 --- a/modules/commands/ns_set_misc.cpp +++ b/modules/commands/ns_set_misc.cpp @@ -19,15 +19,10 @@ struct NSMiscData : ExtensibleItem, Serializable Anope::string name; Anope::string data; - NSMiscData(NickCore *ncore, const Anope::string &n, const Anope::string &d) : nc(ncore), name(n), data(d) + NSMiscData(NickCore *ncore, const Anope::string &n, const Anope::string &d) : Serializable("NSMiscData"), nc(ncore), name(n), data(d) { } - const Anope::string serialize_name() const anope_override - { - return "NSMiscData"; - } - Serialize::Data serialize() const anope_override { Serialize::Data sdata; diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp index dd3da66f6..6b316379e 100644 --- a/modules/commands/ns_suspend.cpp +++ b/modules/commands/ns_suspend.cpp @@ -18,15 +18,10 @@ struct NickSuspend : ExtensibleItem, Serializable Anope::string nick; time_t when; - NickSuspend() + NickSuspend() : Serializable("NickSuspend") { } - const Anope::string serialize_name() const - { - return "NickSuspend"; - } - Serialize::Data serialize() const anope_override { Serialize::Data sd; diff --git a/modules/commands/os_forbid.h b/modules/commands/os_forbid.h index dcc5a9d6e..f79b63616 100644 --- a/modules/commands/os_forbid.h +++ b/modules/commands/os_forbid.h @@ -18,7 +18,7 @@ struct ForbidData : Serializable time_t expires; ForbidType type; - const Anope::string serialize_name() const anope_override { return "ForbidData"; } + ForbidData() : Serializable("ForbidData") { } Serialize::Data serialize() const anope_override; static Serializable* unserialize(Serializable *obj, Serialize::Data &data); }; diff --git a/modules/commands/os_ignore.h b/modules/commands/os_ignore.h index 7c9bf3db5..38042a72d 100644 --- a/modules/commands/os_ignore.h +++ b/modules/commands/os_ignore.h @@ -17,7 +17,7 @@ struct IgnoreData : Serializable Anope::string reason; time_t time; /* When do we stop ignoring them? */ - const Anope::string serialize_name() const anope_override { return "IgnoreData"; } + IgnoreData() : Serializable("IgnoreData") { } Serialize::Data serialize() const anope_override; static Serializable* unserialize(Serializable *obj, Serialize::Data &data); }; diff --git a/modules/commands/os_news.h b/modules/commands/os_news.h index e2ad1fc4f..426121fb7 100644 --- a/modules/commands/os_news.h +++ b/modules/commands/os_news.h @@ -22,7 +22,7 @@ struct NewsItem : Serializable Anope::string who; time_t time; - const Anope::string serialize_name() const anope_override { return "NewsItem"; } + NewsItem() : Serializable("NewsItem") { } Serialize::Data serialize() const anope_override; static Serializable* unserialize(Serializable *obj, Serialize::Data &data); }; diff --git a/modules/commands/os_oper.cpp b/modules/commands/os_oper.cpp index 528ff7382..e2e7b4ab3 100644 --- a/modules/commands/os_oper.cpp +++ b/modules/commands/os_oper.cpp @@ -15,12 +15,7 @@ struct MyOper : Oper, Serializable { - MyOper(const Anope::string &n, OperType *o) : Oper(n, o) { } - - const Anope::string serialize_name() const anope_override - { - return "Oper"; - } + MyOper(const Anope::string &n, OperType *o) : Oper(n, o), Serializable("Oper") { } Serialize::Data serialize() const anope_override { diff --git a/modules/commands/os_session.h b/modules/commands/os_session.h index aa32d9d58..ee37a7594 100644 --- a/modules/commands/os_session.h +++ b/modules/commands/os_session.h @@ -19,7 +19,7 @@ struct Exception : Serializable time_t time; /* When this exception was added */ time_t expires; /* Time when it expires. 0 == no expiry */ - const Anope::string serialize_name() const anope_override { return "Exception"; } + Exception() : Serializable("Exception") { } Serialize::Data serialize() const anope_override; static Serializable* unserialize(Serializable *obj, Serialize::Data &data); }; diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp index dd5bf9ee0..a418396bd 100644 --- a/modules/commands/os_stats.cpp +++ b/modules/commands/os_stats.cpp @@ -15,10 +15,7 @@ struct Stats : Serializable { - const Anope::string serialize_name() const - { - return "Stats"; - } + Stats() : Serializable("Stats") { } Serialize::Data serialize() const anope_override { -- cgit