diff options
Diffstat (limited to 'include/modules/chanserv')
| -rw-r--r-- | include/modules/chanserv/chanaccess.h | 7 | ||||
| -rw-r--r-- | include/modules/chanserv/main/chanaccess.h | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/modules/chanserv/chanaccess.h b/include/modules/chanserv/chanaccess.h index faaf48175..dff39c0f8 100644 --- a/include/modules/chanserv/chanaccess.h +++ b/include/modules/chanserv/chanaccess.h @@ -35,7 +35,7 @@ class CoreExport ChanAccess : public Serialize::Object static constexpr const char *const NAME = "access"; Serialize::Storage<Channel *> channel; - Serialize::Storage<Serialize::Object *> object; + Serialize::Storage<NickServ::Account *> account; Serialize::Storage<Anope::string> creator, mask; Serialize::Storage<time_t> last_seen, created; @@ -56,11 +56,10 @@ class CoreExport ChanAccess : public Serialize::Object virtual Anope::string GetMask() anope_abstract; virtual void SetMask(const Anope::string &) anope_abstract; - virtual Serialize::Object *GetObj() anope_abstract; - virtual void SetObj(Serialize::Object *) anope_abstract; + virtual NickServ::Account *GetAccount() anope_abstract; + virtual void SetAccount(NickServ::Account *) anope_abstract; virtual Anope::string Mask() anope_abstract; - virtual NickServ::Account *GetAccount() anope_abstract; /** Check if this access entry matches the given user or account * @param u The user diff --git a/include/modules/chanserv/main/chanaccess.h b/include/modules/chanserv/main/chanaccess.h index a126da685..fb78056ea 100644 --- a/include/modules/chanserv/main/chanaccess.h +++ b/include/modules/chanserv/main/chanaccess.h @@ -22,8 +22,7 @@ class ChanAccessImpl : public ChanServ::ChanAccess { public: - ChanAccessImpl(Serialize::TypeBase *type) : ChanServ::ChanAccess(type) { } - ChanAccessImpl(Serialize::TypeBase *type, Serialize::ID id) : ChanServ::ChanAccess(type, id) { } + using ChanServ::ChanAccess::ChanAccess; ChanServ::Channel *GetChannel() override; void SetChannel(ChanServ::Channel *ci) override; @@ -40,11 +39,10 @@ class ChanAccessImpl : public ChanServ::ChanAccess Anope::string GetMask() override; void SetMask(const Anope::string &) override; - Serialize::Object *GetObj() override; - void SetObj(Serialize::Object *) override; + NickServ::Account *GetAccount() override; + void SetAccount(NickServ::Account *) override; Anope::string Mask() override; - NickServ::Account *GetAccount() override; bool Matches(const User *u, NickServ::Account *acc) override; }; |