Merge the latest changes from insp20 into master.

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

diff --git a/include/inspircd.h b/include/inspircd.h
index a1a82899478d4a7bed1621aa29d6c50a75f287bb..839cccb6ae9f3fffec2aebcddc18e0b43cd114d8 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -320,10 +320,6 @@ class CoreExport InspIRCd
         */
        ProtocolInterface DefaultProtocolInterface;
 
-       /** Holds extensible for user operquit
-        */
-       StringExtItem OperQuit;
-
        /** Manages the generation and transmission of ISUPPORT. */
        ISupportManager ISupport;
 
@@ -528,6 +524,7 @@ class CoreExport InspIRCd
        /** Return a time_t as a human-readable string.
         * @param format The format to retrieve the date/time in. See `man 3 strftime`
         * for more information. If NULL, "%a %b %d %T %Y" is assumed.
+        * @param curtime The timestamp to convert to a human-readable string.
         * @param utc True to convert the time to string as-is, false to convert it to local time first.
         * @return A string representing the given date/time.
         */