Allow converting a Cap::Reference to a Cap::Capability*.

[user/henk/code/inspircd.git] / include / modules / cap.h

diff --git a/include/modules/cap.h b/include/modules/cap.h
index 6dcb9f3bc4d037d5a9055cfe7472824e8adcb190..664120d39de1014a7e2399954bdf7325a4d30700 100644 (file)
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2015-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -32,8 +33,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;
@@ -302,6 +304,12 @@ namespace Cap
                {
                }
 
+               /** Retrieves the underlying cap. */
+               operator const Cap::Capability*() const
+               {
+                       return ref ? *ref : NULL;
+               }
+
                /** Check whether a user has the referenced capability turned on.
                 * @param user User to check
                 * @return True if the user is using the referenced capability, false otherwise
@@ -318,7 +326,7 @@ namespace Cap
        {
         public:
                MessageBase(const std::string& subcmd)
-                       : ClientProtocol::Message("CAP", ServerInstance->Config->ServerName)
+                       : ClientProtocol::Message("CAP", ServerInstance->Config->GetServerName())
                {
                        PushParamPlaceholder();
                        PushParam(subcmd);