diff options
| author |  Sadie Powell | 2019-08-09 03:57:55 +0100 |
|---|---|---|
| committer | Sadie Powell | 2019-08-09 04:07:33 +0100 |
| commit | 7c7de81b6d513330984bb328de7599bb1328f989 (patch) | |
| tree | 1cd62b0d3419fcb93c488911f6ef8e5048f4bb99 /include/modules | |
| parent | Merge branch 'insp3' into master. (diff) | |
| parent | Fix waitpong referring to registration timeouts as ping timeouts. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'include/modules')
| -rw-r--r-- | include/modules/cap.h | 5 | ||||
| -rw-r--r-- | include/modules/invite.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/modules/cap.h b/include/modules/cap.h index 658aefe5c..6d1ad633c 100644 --- a/include/modules/cap.h +++ b/include/modules/cap.h @@ -32,8 +32,9 @@ namespace Cap { public: ExtItem(Module* mod); - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const override; - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) override; + void FromInternal(Extensible* container, const std::string& value) override; + std::string ToHuman(const Extensible* container, void* item) const override; + std::string ToInternal(const Extensible* container, void* item) const override; }; class Capability; diff --git a/include/modules/invite.h b/include/modules/invite.h index e53d5202f..abd483247 100644 --- a/include/modules/invite.h +++ b/include/modules/invite.h @@ -101,11 +101,11 @@ class Invite::Invite : public insp::intrusive_list_node<Invite, LocalUser>, publ bool IsTimed() const { return (expiretimer != NULL); } /** Serialize this object - * @param format Serialization format + * @param human Whether to serialize for human consumption or not. * @param show_chans True to include channel in the output, false to include the nick/uuid * @param out Output will be appended to this string */ - void Serialize(SerializeFormat format, bool show_chans, std::string& out); + void Serialize(bool human, bool show_chans, std::string& out); friend class APIImpl; |