1
0
mirror of https://github.com/anope/anope.git synced 2026-06-25 21:46:37 +02:00

Move Serialize::Types to construct after the corresponding extensible items they require when unserializing

This commit is contained in:
Adam
2013-08-27 03:18:43 -04:00
parent fac880664c
commit 59ea36c831
6 changed files with 15 additions and 17 deletions
+2 -3
View File
@@ -252,14 +252,13 @@ class CommandEntryMessage : public Command
class CSEntryMessage : public Module
{
CommandEntryMessage commandentrymsg;
Serialize::Type entrymsg_type;
ExtensibleItem<EntryMessageList> eml;
Serialize::Type entrymsg_type;
public:
CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
commandentrymsg(this),
entrymsg_type("EntryMsg", EntryMsg::Unserialize),
eml(this, "entrymsg")
eml(this, "entrymsg"), entrymsg_type("EntryMsg", EntryMsg::Unserialize)
{
}
+2 -3
View File
@@ -277,8 +277,8 @@ class CSLog : public Module
{
ServiceReference<MemoServService> MSService;
CommandCSLog commandcslog;
Serialize::Type logsetting_type;
ExtensibleItem<LogSettingsImpl> logsettings;
Serialize::Type logsetting_type;
struct LogDefault
{
@@ -290,8 +290,7 @@ class CSLog : public Module
public:
CSLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
MSService("MemoServService", "MemoServ"), commandcslog(this),
logsetting_type("LogSetting", LogSettingImpl::Unserialize),
logsettings(this, "logsettings")
logsettings(this, "logsettings"), logsetting_type("LogSetting", LogSettingImpl::Unserialize)
{
}
+3 -3
View File
@@ -828,14 +828,14 @@ class CSMode : public Module
{
CommandCSMode commandcsmode;
CommandCSModes commandcsmodes;
Serialize::Type modelocks_type;
ExtensibleItem<ModeLocksImpl> modelocks;
Serialize::Type modelocks_type;
public:
CSMode(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
commandcsmode(this), commandcsmodes(this),
modelocks_type("ModeLock", ModeLockImpl::Unserialize),
modelocks(this, "modelocks")
modelocks(this, "modelocks"),
modelocks_type("ModeLock", ModeLockImpl::Unserialize)
{
}
+3 -3
View File
@@ -328,17 +328,17 @@ class CommandHSWaiting : public Command
class HSRequest : public Module
{
Serialize::Type request_type;
CommandHSRequest commandhsrequest;
CommandHSActivate commandhsactive;
CommandHSReject commandhsreject;
CommandHSWaiting commandhswaiting;
ExtensibleItem<HostRequest> hostrequest;
Serialize::Type request_type;
public:
HSRequest(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
request_type("HostRequest", HostRequest::Unserialize), commandhsrequest(this), commandhsactive(this),
commandhsreject(this), commandhswaiting(this), hostrequest(this, "hostrequest")
commandhsrequest(this), commandhsactive(this),
commandhsreject(this), commandhswaiting(this), hostrequest(this, "hostrequest"), request_type("HostRequest", HostRequest::Unserialize)
{
if (!IRCD || !IRCD->CanSetVHost)
+3 -3
View File
@@ -225,13 +225,13 @@ class CommandNSAJoin : public Command
class NSAJoin : public Module
{
CommandNSAJoin commandnsajoin;
Serialize::Type ajoinentry_type;
ExtensibleItem<AJoinList> ajoinlist;
Serialize::Type ajoinentry_type;
public:
NSAJoin(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
commandnsajoin(this),
ajoinentry_type("AJoinEntry", AJoinEntry::Unserialize), ajoinlist(this, "ajoinlist")
commandnsajoin(this), ajoinlist(this, "ajoinlist"),
ajoinentry_type("AJoinEntry", AJoinEntry::Unserialize)
{
if (!IRCD->CanSVSJoin)
+2 -2
View File
@@ -241,8 +241,8 @@ class CommandOSInfo : public Command
class OSInfo : public Module
{
CommandOSInfo commandosinfo;
Serialize::Type oinfo_type;
ExtensibleItem<OperInfos> oinfo;
Serialize::Type oinfo_type;
void OnInfo(CommandSource &source, Extensible *e, InfoFormatter &info)
{
@@ -262,7 +262,7 @@ class OSInfo : public Module
public:
OSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
commandosinfo(this), oinfo_type("OperInfo", OperInfo::Unserialize), oinfo(this, "operinfo")
commandosinfo(this), oinfo(this, "operinfo"), oinfo_type("OperInfo", OperInfo::Unserialize)
{
}