diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/extensible.h | 14 | ||||
| -rw-r--r-- | include/modules/cap.h | 5 | ||||
| -rw-r--r-- | include/modules/invite.h | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/include/extensible.h b/include/extensible.h index 588f882b4..9df6d3e18 100644 --- a/include/extensible.h +++ b/include/extensible.h @@ -191,8 +191,6 @@ class CoreExport LocalExtItem : public ExtensionItem public: LocalExtItem(const std::string& key, ExtensibleType exttype, Module* owner); virtual ~LocalExtItem(); - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE; - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE; void free(Extensible* container, void* item) CXX11_OVERRIDE = 0; }; @@ -248,8 +246,8 @@ class CoreExport LocalStringExt : public SimpleExtItem<std::string> public: LocalStringExt(const std::string& key, ExtensibleType exttype, Module* owner); virtual ~LocalStringExt(); - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE; - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE; + std::string ToInternal(const Extensible* container, void* item) const CXX11_OVERRIDE; + void FromInternal(Extensible* container, const std::string& value) CXX11_OVERRIDE; }; class CoreExport LocalIntExt : public LocalExtItem @@ -257,8 +255,8 @@ class CoreExport LocalIntExt : public LocalExtItem public: LocalIntExt(const std::string& key, ExtensibleType exttype, Module* owner); virtual ~LocalIntExt(); - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE; - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE; + std::string ToInternal(const Extensible* container, void* item) const CXX11_OVERRIDE; + void FromInternal(Extensible* container, const std::string& value) CXX11_OVERRIDE; intptr_t get(const Extensible* container) const; intptr_t set(Extensible* container, intptr_t value); void unset(Extensible* container) { set(container, 0); } @@ -271,8 +269,8 @@ class CoreExport StringExtItem : public ExtensionItem StringExtItem(const std::string& key, ExtensibleType exttype, Module* owner); virtual ~StringExtItem(); std::string* get(const Extensible* container) const; - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE; - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE; + std::string ToNetwork(const Extensible* container, void* item) const CXX11_OVERRIDE; + void FromNetwork(Extensible* container, const std::string& value) CXX11_OVERRIDE; void set(Extensible* container, const std::string& value); void unset(Extensible* container); void free(Extensible* container, void* item) CXX11_OVERRIDE; diff --git a/include/modules/cap.h b/include/modules/cap.h index 6dcb9f3bc..5f63b58ce 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 CXX11_OVERRIDE; - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE; + void FromInternal(Extensible* container, const std::string& value) CXX11_OVERRIDE; + std::string ToHuman(const Extensible* container, void* item) const CXX11_OVERRIDE; + std::string ToInternal(const Extensible* container, void* item) const CXX11_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; |