pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-03 17:43:13 +02:00
Code Activity

Improve the layout of types that inherit from another type.

Browse Source
This commit is contained in:
Sadie Powell
2024-01-23 15:28:23 +00:00
parent 398d674cf4
commit a6a0f6c447
232 changed files with 1648 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/access.h
+4 -2
View File
@@ -52,7 +52,8 @@ public:
/* A provider of access. Only used for creating ChanAccesses, as
* they contain pure virtual functions.
*/
class CoreExport AccessProvider : public Service
class CoreExport AccessProvider
: public Service
{
public:
AccessProvider(Module *owner, const Anope::string &name);
@@ -70,7 +71,8 @@ public:
};
/* Represents one entry of an access list on a channel. */
class CoreExport ChanAccess : public Serializable
class CoreExport ChanAccess
: public Serializable
{
Anope::string mask;
/* account this access entry is for, if any */
include/account.h
+6 -2
View File
@@ -28,7 +28,9 @@ extern CoreExport nickcoreid_map NickCoreIdList;
/* A registered nickname.
* It matters that Base is here before Extensible (it is inherited by Serializable)
*/
class CoreExport NickAlias : public Serializable, public Extensible
class CoreExport NickAlias
: public Serializable
, public Extensible
{
Anope::string vhost_ident, vhost_host, vhost_creator;
time_t vhost_created;
@@ -104,7 +106,9 @@ public:
* account's display.
* It matters that Base is here before Extensible (it is inherited by Serializable)
*/
class CoreExport NickCore : public Serializable, public Extensible
class CoreExport NickCore
: public Serializable
, public Extensible
{
/* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */
Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
include/anope.h
+10 -5
View File
@@ -628,7 +628,8 @@ public:
/** A derived form of sepstream, which separates on commas
*/
class commasepstream : public sepstream
class commasepstream
: public sepstream
{
public:
/** Initialize with comma separator
@@ -638,7 +639,8 @@ public:
/** A derived form of sepstream, which separates on spaces
*/
class spacesepstream : public sepstream
class spacesepstream
: public sepstream
{
public:
/** Initialize with space separator
@@ -652,7 +654,8 @@ public:
* be loaded. If this happens, the error message returned by ModuleException::GetReason will be displayed to the user
* attempting to load the module, or dumped to the console if the ircd is currently loading for the first time.
*/
class CoreExport CoreException : public std::exception
class CoreExport CoreException
: public std::exception
{
protected:
/** Holds the error message to be displayed
@@ -691,7 +694,8 @@ public:
}
};
class CoreExport ModuleException : public CoreException
class CoreExport ModuleException
: public CoreException
{
public:
/** Default constructor, just uses the error message 'Module threw an exception'.
@@ -708,7 +712,8 @@ public:
virtual ~ModuleException() noexcept = default;
};
class CoreExport ConvertException : public CoreException
class CoreExport ConvertException
: public CoreException
{
public:
ConvertException(const Anope::string &reason = "") : CoreException(reason) { }
include/base.h
+2 -1
View File
@@ -43,7 +43,8 @@ public:
* no longer be valid once the object it refers is destructed.
*/
template<typename T>
class Reference : public ReferenceBase
class Reference
: public ReferenceBase
{
protected:
T *ref = nullptr;
include/bots.h
+3 -1
View File
@@ -19,7 +19,9 @@ typedef Anope::map<BotInfo *> botinfo_map;
extern CoreExport Serialize::Checker<botinfo_map> BotListByNick, BotListByUID;
/* A service bot (NickServ, ChanServ, a BotServ bot, etc). */
class CoreExport BotInfo : public User, public Serializable
class CoreExport BotInfo
: public User
, public Serializable
{
/* Channels this bot is assigned to */
Serialize::Checker<std::set<ChannelInfo *> > channels;
include/channels.h
+5 -2
View File
@@ -18,7 +18,8 @@ typedef Anope::hash_map<Channel *> channel_map;
extern CoreExport channel_map ChannelList;
/* A user container, there is one of these per user per channel. */
struct ChanUserContainer : public Extensible
struct ChanUserContainer
: public Extensible
{
User *user;
Channel *chan;
@@ -28,7 +29,9 @@ struct ChanUserContainer : public Extensible
ChanUserContainer(User *u, Channel *c) : user(u), chan(c) { }
};
class CoreExport Channel : public Base, public Extensible
class CoreExport Channel
: public Base
, public Extensible
{
static std::vector<Channel *> deleting;
include/commands.h
+2 -1
View File
@@ -88,7 +88,8 @@ public:
/** Every services command is a class, inheriting from Command.
*/
class CoreExport Command : public Service
class CoreExport Command
: public Service
{
Anope::string desc;
std::vector<Anope::string> syntax;
include/config.h
+4 -2
View File
@@ -98,7 +98,8 @@ namespace Configuration
struct Uplink;
struct CoreExport Conf : Block
struct CoreExport Conf
: Block
{
/* options:readtimeout */
time_t ReadTimeout;
@@ -171,7 +172,8 @@ namespace Configuration
* be loaded. If this happens, the error message returned by ModuleException::GetReason will be displayed to the user
* attempting to load the module, or dumped to the console if the ircd is currently loading for the first time.
*/
class CoreExport ConfigException : public CoreException
class CoreExport ConfigException
: public CoreException
{
public:
/** Default constructor, just uses the error message 'Config threw an exception'.
include/extensible.h
+12 -6
View File
@@ -15,7 +15,8 @@
class Extensible;
class CoreExport ExtensibleBase : public Service
class CoreExport ExtensibleBase
: public Service
{
protected:
std::map<Extensible *, void *> items;
@@ -53,7 +54,8 @@ public:
};
template<typename T>
class BaseExtensibleItem : public ExtensibleBase
class BaseExtensibleItem
: public ExtensibleBase
{
protected:
virtual T *Create(Extensible *) = 0;
@@ -124,7 +126,8 @@ public:
};
template<typename T>
class ExtensibleItem : public BaseExtensibleItem<T>
class ExtensibleItem
: public BaseExtensibleItem<T>
{
protected:
T* Create(Extensible *obj) override
@@ -136,7 +139,8 @@ public:
};
template<typename T>
class PrimitiveExtensibleItem : public BaseExtensibleItem<T>
class PrimitiveExtensibleItem
: public BaseExtensibleItem<T>
{
protected:
T* Create(Extensible *obj) override
@@ -160,7 +164,8 @@ public:
};
template<typename T>
class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
class SerializableExtensibleItem
: public PrimitiveExtensibleItem<T>
{
public:
SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
@@ -204,7 +209,8 @@ public:
};
template<typename T>
struct ExtensibleRef : ServiceReference<BaseExtensibleItem<T> >
struct ExtensibleRef
: ServiceReference<BaseExtensibleItem<T> >
{
ExtensibleRef(const Anope::string &n) : ServiceReference<BaseExtensibleItem<T> >("Extensible", n) { }
};
include/hashcomp.h
+6 -3
View File
@@ -27,7 +27,8 @@ namespace Anope
/* ASCII case insensitive ctype. */
template<typename char_type>
class ascii_ctype : public std::ctype<char_type>
class ascii_ctype
: public std::ctype<char_type>
{
public:
char_type do_toupper(char_type c) const override
@@ -49,7 +50,8 @@ namespace Anope
/* rfc1459 case insensitive ctype, { = [, } = ], and | = \ */
template<typename char_type>
class rfc1459_ctype : public ascii_ctype<char_type>
class rfc1459_ctype
: public ascii_ctype<char_type>
{
public:
char_type do_toupper(char_type c) const override
@@ -78,7 +80,8 @@ namespace ci
* This class is used to implement ci::string, a case-insensitive, ASCII-
* comparing string class.
*/
struct CoreExport ci_char_traits : std::char_traits<char>
struct CoreExport ci_char_traits
: std::char_traits<char>
{
/** Check if two chars match.
* @param c1st First character
include/mail.h
+2 -1
View File
@@ -22,7 +22,8 @@ namespace Mail
extern CoreExport bool Validate(const Anope::string &email);
/* A email message being sent */
class Message : public Thread
class Message
: public Thread
{
private:
Anope::string sendmail_path;
include/memo.h
+2 -1
View File
@@ -14,7 +14,8 @@
#include "anope.h"
#include "serialize.h"
class CoreExport Memo : public Serializable
class CoreExport Memo
: public Serializable
{
public:
MemoInfo *mi;
include/messages.h
+40 -20
View File
@@ -21,35 +21,40 @@
namespace Message
{
struct CoreExport Away : IRCDMessage
struct CoreExport Away
: IRCDMessage
{
Away(Module *creator, const Anope::string &mname = "AWAY") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Capab : IRCDMessage
struct CoreExport Capab
: IRCDMessage
{
Capab(Module *creator, const Anope::string &mname = "CAPAB") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Error : IRCDMessage
struct CoreExport Error
: IRCDMessage
{
Error(Module *creator, const Anope::string &mname = "ERROR") : IRCDMessage(creator, mname, 1) { }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Invite : IRCDMessage
struct CoreExport Invite
: IRCDMessage
{
Invite(Module *creator, const Anope::string &mname = "INVITE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Join : IRCDMessage
struct CoreExport Join
: IRCDMessage
{
Join(Module *creator, const Anope::string &mname = "JOIN") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
@@ -67,105 +72,120 @@ namespace Message
static void SJoin(MessageSource &source, const Anope::string &chan, time_t ts, const Anope::string &modes, const std::list<SJoinUser> &users);
};
struct CoreExport Kick : IRCDMessage
struct CoreExport Kick
: IRCDMessage
{
Kick(Module *creator, const Anope::string &mname = "KICK") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Kill : IRCDMessage
struct CoreExport Kill
: IRCDMessage
{
Kill(Module *creator, const Anope::string &mname = "KILL") : IRCDMessage(creator, mname, 2) { }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Mode : IRCDMessage
struct CoreExport Mode
: IRCDMessage
{
Mode(Module *creator, const Anope::string &mname = "MODE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport MOTD : IRCDMessage
struct CoreExport MOTD
: IRCDMessage
{
MOTD(Module *creator, const Anope::string &mname = "MOTD") : IRCDMessage(creator, mname, 1) { }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Notice : IRCDMessage
struct CoreExport Notice
: IRCDMessage
{
Notice(Module *creator, const Anope::string &mname = "NOTICE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Part : IRCDMessage
struct CoreExport Part
: IRCDMessage
{
Part(Module *creator, const Anope::string &mname = "PART") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Ping : IRCDMessage
struct CoreExport Ping
: IRCDMessage
{
Ping(Module *creator, const Anope::string &mname = "PING") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Privmsg : IRCDMessage
struct CoreExport Privmsg
: IRCDMessage
{
Privmsg(Module *creator, const Anope::string &mname = "PRIVMSG") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Quit : IRCDMessage
struct CoreExport Quit
: IRCDMessage
{
Quit(Module *creator, const Anope::string &mname = "QUIT") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport SQuit : IRCDMessage
struct CoreExport SQuit
: IRCDMessage
{
SQuit(Module *creator, const Anope::string &mname = "SQUIT") : IRCDMessage(creator, mname, 2) { }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Stats : IRCDMessage
struct CoreExport Stats
: IRCDMessage
{
Stats(Module *creator, const Anope::string &mname = "STATS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Time : IRCDMessage
struct CoreExport Time
: IRCDMessage
{
Time(Module *creator, const Anope::string &mname = "TIME") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Topic : IRCDMessage
struct CoreExport Topic
: IRCDMessage
{
Topic(Module *creator, const Anope::string &mname = "TOPIC") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Version : IRCDMessage
struct CoreExport Version
: IRCDMessage
{
Version(Module *creator, const Anope::string &mname = "VERSION") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
};
struct CoreExport Whois : IRCDMessage
struct CoreExport Whois
: IRCDMessage
{
Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
include/modes.h
+26 -13
View File
@@ -35,7 +35,8 @@ enum ModeClass
/** This class is the basis of all modes in Anope
*/
class CoreExport Mode : public Base
class CoreExport Mode
: public Base
{
public:
/* Mode name */
@@ -64,7 +65,8 @@ public:
/** This class is a user mode, all user modes use this/inherit from this
*/
class CoreExport UserMode : public Mode
class CoreExport UserMode
: public Mode
{
public:
/** constructor
@@ -74,7 +76,8 @@ public:
UserMode(const Anope::string &name, char mc);
};
class CoreExport UserModeParam : public UserMode
class CoreExport UserModeParam
: public UserMode
{
public:
/** constructor
@@ -92,7 +95,8 @@ public:
/** This class is a channel mode, all channel modes use this/inherit from this
*/
class CoreExport ChannelMode : public Mode
class CoreExport ChannelMode
: public Mode
{
public:
/* channel modes that can possibly unwrap this mode */
@@ -123,7 +127,8 @@ public:
/** This is a mode for lists, eg b/e/I. These modes should inherit from this
*/
class CoreExport ChannelModeList : public ChannelMode
class CoreExport ChannelModeList
: public ChannelMode
{
public:
/** constructor
@@ -161,7 +166,8 @@ public:
/** This is a mode with a parameter, eg +k/l. These modes should use/inherit from this
*/
class CoreExport ChannelModeParam : public ChannelMode
class CoreExport ChannelModeParam
: public ChannelMode
{
public:
/** constructor
@@ -183,7 +189,8 @@ public:
/** This is a mode that is a channel status, eg +v/h/o/a/q.
*/
class CoreExport ChannelModeStatus : public ChannelMode
class CoreExport ChannelModeStatus
: public ChannelMode
{
public:
/* The symbol, eg @ % + */
@@ -206,7 +213,8 @@ public:
* but we still have a representation for it.
*/
template<typename T>
class CoreExport ChannelModeVirtual : public T
class CoreExport ChannelModeVirtual
: public T
{
Anope::string base;
ChannelMode *basech;
@@ -239,7 +247,8 @@ public:
Anope::string BuildModePrefixList() const;
};
class CoreExport UserModeOperOnly : public UserMode
class CoreExport UserModeOperOnly
: public UserMode
{
public:
UserModeOperOnly(const Anope::string &mname, char um) : UserMode(mname, um) { }
@@ -247,7 +256,8 @@ public:
bool CanSet(User *u) const override;
};
class CoreExport UserModeNoone : public UserMode
class CoreExport UserModeNoone
: public UserMode
{
public:
UserModeNoone(const Anope::string &mname, char um) : UserMode(mname, um) { }
@@ -257,7 +267,8 @@ public:
/** Channel mode +k (key)
*/
class CoreExport ChannelModeKey : public ChannelModeParam
class CoreExport ChannelModeKey
: public ChannelModeParam
{
public:
ChannelModeKey(char mc) : ChannelModeParam("KEY", mc) { }
@@ -267,7 +278,8 @@ public:
/** This class is used for oper only channel modes
*/
class CoreExport ChannelModeOperOnly : public ChannelMode
class CoreExport ChannelModeOperOnly
: public ChannelMode
{
public:
ChannelModeOperOnly(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
@@ -278,7 +290,8 @@ public:
/** This class is used for channel modes only servers may set
*/
class CoreExport ChannelModeNoone : public ChannelMode
class CoreExport ChannelModeNoone
: public ChannelMode
{
public:
ChannelModeNoone(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
include/modules.h
+6 -2
View File
@@ -196,11 +196,15 @@ public:
int GetPatch() const;
};
class CoreExport NotImplementedException : public CoreException { };
class CoreExport NotImplementedException
: public CoreException
{
};
/** Every module in Anope is actually a class.
*/
class CoreExport Module : public Extensible
class CoreExport Module
: public Extensible
{
private:
bool permanent;
include/modules/cs_entrymsg.h
+2 -1
View File
@@ -20,7 +20,8 @@ protected:
EntryMsg() = default;
};
struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> >
struct EntryMessageList
: Serialize::Checker<std::vector<EntryMsg *> >
{
protected:
EntryMessageList() : Serialize::Checker<std::vector<EntryMsg *> >("EntryMsg") { }
include/modules/cs_log.h
+2 -1
View File
@@ -29,7 +29,8 @@ protected:
LogSetting() = default;
};
struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
struct LogSettings
: Serialize::Checker<std::vector<LogSetting *> >
{
typedef std::vector<LogSetting *>::iterator iterator;
include/modules/dns.h
+7 -3
View File
@@ -88,7 +88,8 @@ namespace DNS
};
};
struct ResourceRecord : Question
struct ResourceRecord
: Question
{
unsigned int ttl = 0;
Anope::string rdata;
@@ -113,7 +114,8 @@ namespace DNS
/** DNS manager
*/
class Manager : public Service
class Manager
: public Service
{
public:
Manager(Module *creator) : Service(creator, "DNS::Manager", "dns/manager") { }
@@ -131,7 +133,9 @@ namespace DNS
/** A DNS query.
*/
class Request : public Timer, public Question
class Request
: public Timer
, public Question
{
Manager *manager;
public:
include/modules/encryption.h
+2 -1
View File
@@ -25,7 +25,8 @@ namespace Encryption
virtual Hash GetFinalizedHash() = 0;
};
class Provider : public Service
class Provider
: public Service
{
public:
Provider(Module *creator, const Anope::string &sname) : Service(creator, "Encryption::Provider", sname) { }
include/modules/httpd.h
+9 -3
View File
@@ -93,7 +93,8 @@ struct HTTPMessage
class HTTPClient;
class HTTPProvider;
class HTTPPage : public virtual Base
class HTTPPage
: public virtual Base
{
Anope::string url;
Anope::string content_type;
@@ -115,7 +116,10 @@ public:
virtual bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &) = 0;
};
class HTTPClient : public ClientSocket, public BinarySocket, public Base
class HTTPClient
: public ClientSocket
, public BinarySocket
, public Base
{
protected:
void WriteClient(const Anope::string &message)
@@ -135,7 +139,9 @@ public:
virtual void SendReply(HTTPReply *) = 0;
};
class HTTPProvider : public ListenSocket, public Service
class HTTPProvider
: public ListenSocket
, public Service
{
Anope::string ip;
unsigned short port;
include/modules/ldap.h
+4 -2
View File
@@ -31,7 +31,8 @@ struct LDAPModification
};
typedef std::vector<LDAPModification> LDAPMods;
struct LDAPAttributes : public std::map<Anope::string, std::vector<Anope::string> >
struct LDAPAttributes
: public std::map<Anope::string, std::vector<Anope::string>>
{
size_t size(const Anope::string &attr) const
{
@@ -122,7 +123,8 @@ public:
virtual void OnDelete() { }
};
class LDAPProvider : public Service
class LDAPProvider
: public Service
{
public:
LDAPProvider(Module *c, const Anope::string &n) : Service(c, "LDAPProvider", n) { }
include/modules/ns_cert.h
+2 -1
View File
@@ -63,7 +63,8 @@ public:
virtual void Check() = 0;
};
class CertService : public Service
class CertService
: public Service
{
public:
CertService(Module *c) : Service(c, "CertService", "certs") { }
include/modules/os_forbid.h
+2 -1
View File
@@ -31,7 +31,8 @@ protected:
ForbidData() = default;
};
class ForbidService : public Service
class ForbidService
: public Service
{
public:
ForbidService(Module *m) : Service(m, "ForbidService", "forbid") { }
include/modules/os_ignore.h
+2 -1
View File
@@ -23,7 +23,8 @@ protected:
IgnoreData() = default;
};
class IgnoreService : public Service
class IgnoreService
: public Service
{
protected:
IgnoreService(Module *c) : Service(c, "IgnoreService", "ignore") { }
include/modules/os_news.h
+4 -2
View File
@@ -22,7 +22,8 @@ struct NewsMessages
const char *msgs[10];
};
struct NewsItem : Serializable
struct NewsItem
: Serializable
{
NewsType type;
Anope::string text;
@@ -32,7 +33,8 @@ struct NewsItem : Serializable
NewsItem() : Serializable("NewsItem") { }
};
class NewsService : public Service
class NewsService
: public Service
{
public:
NewsService(Module *m) : Service(m, "NewsService", "news") { }
include/modules/os_session.h
+4 -2
View File
@@ -17,7 +17,8 @@ struct Session
Session(const sockaddrs &ip, int len) : addr(ip, len) { }
};
struct Exception : Serializable
struct Exception
: Serializable
{
Anope::string mask; /* Hosts to which this exception applies */
unsigned limit; /* Session limit for exception */
@@ -31,7 +32,8 @@ struct Exception : Serializable
static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
};
class SessionService : public Service
class SessionService
: public Service
{
public:
typedef std::unordered_map<cidr, Session *, cidr::hash> SessionMap;
include/modules/pseudoclients/chanserv.h
+2 -1
View File
@@ -8,7 +8,8 @@
#pragma once
class ChanServService : public Service
class ChanServService
: public Service
{
public:
ChanServService(Module *m) : Service(m, "ChanServService", "ChanServ")
include/modules/pseudoclients/global.h
+2 -1
View File
@@ -8,7 +8,8 @@
#pragma once
class GlobalService : public Service
class GlobalService
: public Service
{
public:
GlobalService(Module *m) : Service(m, "GlobalService", "Global")
include/modules/pseudoclients/memoserv.h
+2 -1
View File
@@ -8,7 +8,8 @@
#pragma once
class MemoServService : public Service
class MemoServService
: public Service
{
public:
enum MemoResult
include/modules/pseudoclients/nickserv.h
+2 -1
View File
@@ -8,7 +8,8 @@
#pragma once
class NickServService : public Service
class NickServService
: public Service
{
public:
NickServService(Module *m) : Service(m, "NickServService", "NickServ")
include/modules/redis.h
+2 -1
View File
@@ -55,7 +55,8 @@ namespace Redis
virtual void OnError(const Anope::string &error) { Log(owner) << error; }
};
class Provider : public Service
class Provider
: public Service
{
public:
Provider(Module *c, const Anope::string &n) : Service(c, "Redis::Provider", n) { }
include/modules/sasl.h
+6 -3
View File
@@ -22,7 +22,8 @@ namespace SASL
class Mechanism;
struct Session;
class Service : public ::Service
class Service
: public ::Service
{
public:
Service(Module *o) : ::Service(o, "SASL::Service", "sasl") { }
@@ -60,7 +61,8 @@ namespace SASL
};
/* PLAIN, EXTERNAL, etc */
class Mechanism : public ::Service
class Mechanism
: public ::Service
{
public:
Mechanism(Module *o, const Anope::string &sname) : Service(o, "SASL::Mechanism", sname) { }
@@ -76,7 +78,8 @@ namespace SASL
}
};
class IdentifyRequest : public ::IdentifyRequest
class IdentifyRequest
: public ::IdentifyRequest
{
Anope::string uid;
Anope::string hostname, ip;
include/modules/sql.h
+4 -2
View File
@@ -11,7 +11,8 @@
namespace SQL
{
class Data : public Serialize::Data
class Data
: public Serialize::Data
{
public:
typedef std::map<Anope::string, std::stringstream *> Map;
@@ -199,7 +200,8 @@ namespace SQL
/** Class providing the SQL service, modules call this to execute queries
*/
class Provider : public Service
class Provider
: public Service
{
public:
Provider(Module *c, const Anope::string &n) : Service(c, "SQL::Provider", n) { }
include/modules/ssl.h
+2 -1
View File
@@ -8,7 +8,8 @@
#pragma once
class SSLService : public Service
class SSLService
: public Service
{
public:
SSLService(Module *o, const Anope::string &n) : Service(o, "SSLService", n) { }
include/modules/xmlrpc.h
+2 -1
View File
@@ -34,7 +34,8 @@ public:
virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
};
class XMLRPCServiceInterface : public Service
class XMLRPCServiceInterface
: public Service
{
public:
XMLRPCServiceInterface(Module *creator, const Anope::string &sname) : Service(creator, "XMLRPCServiceInterface", sname) { }
include/protocol.h
+4 -2
View File
@@ -17,7 +17,8 @@
#include "modes.h"
/* Encapsulates the IRCd protocol we are speaking. */
class CoreExport IRCDProto : public Service
class CoreExport IRCDProto
: public Service
{
Anope::string proto_name;
@@ -268,7 +269,8 @@ enum IRCDMessageFlag
IRCDMESSAGE_REQUIRE_USER
};
class CoreExport IRCDMessage : public Service
class CoreExport IRCDMessage
: public Service
{
Anope::string name;
unsigned param_count;
include/regchannel.h
+5 -2
View File
@@ -21,7 +21,8 @@ typedef Anope::hash_map<ChannelInfo *> registered_channel_map;
extern CoreExport Serialize::Checker<registered_channel_map> RegisteredChannelList;
/* AutoKick data. */
class CoreExport AutoKick : public Serializable
class CoreExport AutoKick
: public Serializable
{
public:
/* Channel this autokick is on */
@@ -43,7 +44,9 @@ public:
/* It matters that Base is here before Extensible (it is inherited by Serializable)
*/
class CoreExport ChannelInfo : public Serializable, public Extensible
class CoreExport ChannelInfo
: public Serializable
, public Extensible
{
/* channels who reference this one */
Anope::map<int> references;
include/regexpr.h
+4 -2
View File
@@ -15,7 +15,8 @@
#include "anope.h"
#include "service.h"
class CoreExport RegexException : public CoreException
class CoreExport RegexException
: public CoreException
{
public:
RegexException(const Anope::string &reason = "") : CoreException(reason) { }
@@ -34,7 +35,8 @@ public:
virtual bool Matches(const Anope::string &str) = 0;
};
class CoreExport RegexProvider : public Service
class CoreExport RegexProvider
: public Service
{
public:
RegexProvider(Module *o, const Anope::string &n) : Service(o, "Regex", n) { }
include/serialize.h
+6 -3
View File
@@ -49,7 +49,8 @@ namespace Serialize
* abstract data types (Serialize::Data), and then reconstructed or
* updated later at any time.
*/
class CoreExport Serializable : public virtual Base
class CoreExport Serializable
: public virtual Base
{
private:
/* A list of every serializable item in Anope.
@@ -107,7 +108,8 @@ public:
* of class that inherits from Serializable. Used for unserializing objects
* of this type, as it requires a function pointer to a static member function.
*/
class CoreExport Serialize::Type : public Base
class CoreExport Serialize::Type
: public Base
{
typedef Serializable* (*unserialize_func)(Serializable *obj, Serialize::Data &);
@@ -240,7 +242,8 @@ public:
* destructed.
*/
template<typename T>
class Serialize::Reference : public ReferenceBase
class Serialize::Reference
: public ReferenceBase
{
protected:
T *ref = nullptr;
include/servers.h
+2 -1
View File
@@ -37,7 +37,8 @@ namespace Servers
/** Class representing a server
*/
class CoreExport Server : public Extensible
class CoreExport Server
: public Extensible
{
private:
/* Server name */
include/service.h
+4 -2
View File
@@ -20,7 +20,8 @@
* such as commands, use this. This is also used for modules
* that publish a service (m_ssl_openssl, etc).
*/
class CoreExport Service : public virtual Base
class CoreExport Service
: public virtual Base
{
static std::map<Anope::string, std::map<Anope::string, Service *> > Services;
static std::map<Anope::string, std::map<Anope::string, Anope::string> > Aliases;
@@ -115,7 +116,8 @@ public:
/** Like Reference, but used to refer to a Service.
*/
template<typename T>
class ServiceReference : public Reference<T>
class ServiceReference
: public Reference<T>
{
Anope::string type;
Anope::string name;
include/sockets.h
+14 -7
View File
@@ -126,7 +126,8 @@ public:
};
};
class CoreExport SocketException : public CoreException
class CoreExport SocketException
: public CoreException
{
public:
/** Constructor for socket exceptions
@@ -286,7 +287,8 @@ public:
virtual void ProcessError();
};
class CoreExport BufferedSocket : public virtual Socket
class CoreExport BufferedSocket
: public virtual Socket
{
protected:
/* Things read from the socket */
@@ -333,7 +335,8 @@ public:
int WriteBufferLen() const;
};
class CoreExport BinarySocket : public virtual Socket
class CoreExport BinarySocket
: public virtual Socket
{
protected:
struct DataBlock
@@ -378,7 +381,8 @@ public:
virtual bool Read(const char *buffer, size_t l);
};
class CoreExport ListenSocket : public virtual Socket
class CoreExport ListenSocket
: public virtual Socket
{
public:
/** Constructor
@@ -402,7 +406,8 @@ public:
virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr) = 0;
};
class CoreExport ConnectionSocket : public virtual Socket
class CoreExport ConnectionSocket
: public virtual Socket
{
public:
/* Sockaddrs for connection ip/port */
@@ -435,7 +440,8 @@ public:
virtual void OnError(const Anope::string &error);
};
class CoreExport ClientSocket : public virtual Socket
class CoreExport ClientSocket
: public virtual Socket
{
public:
/* Listen socket this connection came from */
@@ -469,7 +475,8 @@ public:
virtual void OnError(const Anope::string &error);
};
class CoreExport Pipe : public Socket
class CoreExport Pipe
: public Socket
{
public:
/** The FD of the write pipe
include/threadengine.h
+5 -2
View File
@@ -14,7 +14,9 @@
#include "sockets.h"
#include "extensible.h"
class CoreExport Thread : public Pipe, public Extensible
class CoreExport Thread
: public Pipe
, public Extensible
{
private:
/* Set to true to tell the thread to finish and we are waiting for it */
@@ -88,7 +90,8 @@ public:
bool TryLock();
};
class CoreExport Condition : public Mutex
class CoreExport Condition
: public Mutex
{
private:
/* A condition */
include/uplink.h
+3 -1
View File
@@ -20,7 +20,9 @@ namespace Uplink
}
/* This is the socket to our uplink */
class UplinkSocket : public ConnectionSocket, public BufferedSocket
class UplinkSocket
: public ConnectionSocket
, public BufferedSocket
{
public:
bool error;
include/users.h
+4 -1
View File
@@ -28,7 +28,10 @@ extern CoreExport unsigned MaxUserCount;
extern CoreExport time_t MaxUserTime;
/* Online user and channel data. */
class CoreExport User : public virtual Base, public Extensible, public CommandReply
class CoreExport User
: public virtual Base
, public Extensible
, public CommandReply
{
/* true if the user was quit or killed */
bool quit;
include/xline.h
+4 -2
View File
@@ -13,7 +13,8 @@
#include "sockets.h"
/* An Xline, eg, anything added with operserv/akill, or any of the operserv/sxline commands */
class CoreExport XLine : public Serializable
class CoreExport XLine
: public Serializable
{
void Init();
Anope::string nick, user, host, real;
@@ -48,7 +49,8 @@ public:
};
/* Managers XLines. There is one XLineManager per type of XLine. */
class CoreExport XLineManager : public Service
class CoreExport XLineManager
: public Service
{
char type;
/* List of XLines in this XLineManager */
modules/bs_autoassign.cpp
+2 -1
View File
@@ -9,7 +9,8 @@
#include "module.h"
class BSAutoAssign : public Module
class BSAutoAssign
: public Module
{
public:
BSAutoAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
modules/commands/bs_assign.cpp
+8 -4
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandBSAssign : public Command
class CommandBSAssign
: public Command
{
public:
CommandBSAssign(Module *creator) : Command(creator, "botserv/assign", 2, 2)
@@ -82,7 +83,8 @@ public:
}
};
class CommandBSUnassign : public Command
class CommandBSUnassign
: public Command
{
public:
CommandBSUnassign(Module *creator) : Command(creator, "botserv/unassign", 1, 1)
@@ -145,7 +147,8 @@ public:
}
};
class CommandBSSetNoBot : public Command
class CommandBSSetNoBot
: public Command
{
public:
CommandBSSetNoBot(Module *creator, const Anope::string &sname = "botserv/set/nobot") : Command(creator, sname, 2, 2)
@@ -202,7 +205,8 @@ public:
}
};
class BSAssign : public Module
class BSAssign
: public Module
{
ExtensibleItem<bool> nobot;
modules/commands/bs_badwords.cpp
+13 -6
View File
@@ -12,7 +12,9 @@
#include "module.h"
#include "modules/bs_badwords.h"
struct BadWordImpl : BadWord, Serializable
struct BadWordImpl
: BadWord
, Serializable
{
BadWordImpl() : Serializable("BadWord") { }
~BadWordImpl() override;
@@ -27,7 +29,8 @@ struct BadWordImpl : BadWord, Serializable
static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
};
struct BadWordsImpl : BadWords
struct BadWordsImpl
: BadWords
{
Serialize::Reference<ChannelInfo> ci;
typedef std::vector<BadWordImpl *> list;
@@ -144,7 +147,8 @@ Serializable* BadWordImpl::Unserialize(Serializable *obj, Serialize::Data &data)
return bw;
}
class BadwordsDelCallback : public NumberList
class BadwordsDelCallback
: public NumberList
{
CommandSource &source;
ChannelInfo *ci;
@@ -181,7 +185,8 @@ public:
}
};
class CommandBSBadwords : public Command
class CommandBSBadwords
: public Command
{
private:
void DoList(CommandSource &source, ChannelInfo *ci, const Anope::string &word)
@@ -200,7 +205,8 @@ private:
}
else if (!word.empty() && word.find_first_not_of("1234567890,-") == Anope::string::npos)
{
class BadwordsListCallback : public NumberList
class BadwordsListCallback
: public NumberList
{
ListFormatter &list;
BadWords *bw;
@@ -453,7 +459,8 @@ public:
}
};
class BSBadwords : public Module
class BSBadwords
: public Module
{
CommandBSBadwords commandbsbadwords;
ExtensibleItem<BadWordsImpl> badwords;
modules/commands/bs_bot.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandBSBot : public Command
class CommandBSBot
: public Command
{
private:
void DoAdd(CommandSource &source, const std::vector<Anope::string> &params)
@@ -370,7 +371,8 @@ public:
}
};
class BSBot : public Module
class BSBot
: public Module
{
CommandBSBot commandbsbot;
modules/commands/bs_botlist.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandBSBotList : public Command
class CommandBSBotList
: public Command
{
public:
CommandBSBotList(Module *creator) : Command(creator, "botserv/botlist", 0, 0)
@@ -65,7 +66,8 @@ public:
}
};
class BSBotList : public Module
class BSBotList
: public Module
{
CommandBSBotList commandbsbotlist;
modules/commands/bs_control.cpp
+6 -3
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandBSSay : public Command
class CommandBSSay
: public Command
{
public:
CommandBSSay(Module *creator) : Command(creator, "botserv/say", 2, 2)
@@ -71,7 +72,8 @@ public:
}
};
class CommandBSAct : public Command
class CommandBSAct
: public Command
{
public:
CommandBSAct(Module *creator) : Command(creator, "botserv/act", 2, 2)
@@ -130,7 +132,8 @@ public:
}
};
class BSControl : public Module
class BSControl
: public Module
{
CommandBSSay commandbssay;
CommandBSAct commandbsact;
modules/commands/bs_info.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandBSInfo : public Command
class CommandBSInfo
: public Command
{
private:
void send_bot_channels(std::vector<Anope::string> &buffers, const BotInfo *bi)
@@ -117,7 +118,8 @@ public:
}
};
class BSInfo : public Module
class BSInfo
: public Module
{
CommandBSInfo commandbsinfo;
modules/commands/bs_kick.cpp
+36 -18
View File
@@ -15,7 +15,8 @@
static Module *me;
struct KickerDataImpl : KickerData
struct KickerDataImpl
: KickerData
{
KickerDataImpl(Extensible *obj)
{
@@ -37,7 +38,8 @@ struct KickerDataImpl : KickerData
ci->Shrink<KickerData>("kickerdata");
}
struct ExtensibleItem : ::ExtensibleItem<KickerDataImpl>
struct ExtensibleItem
: ::ExtensibleItem<KickerDataImpl>
{
ExtensibleItem(Module *m, const Anope::string &ename) : ::ExtensibleItem<KickerDataImpl>(m, ename) { }
@@ -115,7 +117,8 @@ struct KickerDataImpl : KickerData
};
};
class CommandBSKick : public Command
class CommandBSKick
: public Command
{
public:
CommandBSKick(Module *creator) : Command(creator, "botserv/kick", 0)
@@ -159,7 +162,8 @@ public:
}
};
class CommandBSKickBase : public Command
class CommandBSKickBase
: public Command
{
public:
CommandBSKickBase(Module *creator, const Anope::string &cname, int minarg, int maxarg) : Command(creator, cname, minarg, maxarg)
@@ -244,7 +248,8 @@ protected:
}
};
class CommandBSKickAMSG : public CommandBSKickBase
class CommandBSKickAMSG
: public CommandBSKickBase
{
public:
CommandBSKickAMSG(Module *creator) : CommandBSKickBase(creator, "botserv/kick/amsg", 2, 3)
@@ -280,7 +285,8 @@ public:
}
};
class CommandBSKickBadwords : public CommandBSKickBase
class CommandBSKickBadwords
: public CommandBSKickBase
{
public:
CommandBSKickBadwords(Module *creator) : CommandBSKickBase(creator, "botserv/kick/badwords", 2, 3)
@@ -319,7 +325,8 @@ public:
}
};
class CommandBSKickBolds : public CommandBSKickBase
class CommandBSKickBolds
: public CommandBSKickBase
{
public:
CommandBSKickBolds(Module *creator) : CommandBSKickBase(creator, "botserv/kick/bolds", 2, 3)
@@ -353,7 +360,8 @@ public:
}
};
class CommandBSKickCaps : public CommandBSKickBase
class CommandBSKickCaps
: public CommandBSKickBase
{
public:
CommandBSKickCaps(Module *creator) : CommandBSKickBase(creator, "botserv/kick/caps", 2, 5)
@@ -449,7 +457,8 @@ public:
}
};
class CommandBSKickColors : public CommandBSKickBase
class CommandBSKickColors
: public CommandBSKickBase
{
public:
CommandBSKickColors(Module *creator) : CommandBSKickBase(creator, "botserv/kick/colors", 2, 3)
@@ -483,7 +492,8 @@ public:
}
};
class CommandBSKickFlood : public CommandBSKickBase
class CommandBSKickFlood
: public CommandBSKickBase
{
public:
CommandBSKickFlood(Module *creator) : CommandBSKickBase(creator, "botserv/kick/flood", 2, 5)
@@ -581,7 +591,8 @@ public:
}
};
class CommandBSKickItalics : public CommandBSKickBase
class CommandBSKickItalics
: public CommandBSKickBase
{
public:
CommandBSKickItalics(Module *creator) : CommandBSKickBase(creator, "botserv/kick/italics", 2, 3)
@@ -615,7 +626,8 @@ public:
}
};
class CommandBSKickRepeat : public CommandBSKickBase
class CommandBSKickRepeat
: public CommandBSKickBase
{
public:
CommandBSKickRepeat(Module *creator) : CommandBSKickBase(creator, "botserv/kick/repeat", 2, 4)
@@ -716,7 +728,8 @@ public:
}
};
class CommandBSKickReverses : public CommandBSKickBase
class CommandBSKickReverses
: public CommandBSKickBase
{
public:
CommandBSKickReverses(Module *creator) : CommandBSKickBase(creator, "botserv/kick/reverses", 2, 3)
@@ -750,7 +763,8 @@ public:
}
};
class CommandBSKickUnderlines : public CommandBSKickBase
class CommandBSKickUnderlines
: public CommandBSKickBase
{
public:
CommandBSKickUnderlines(Module *creator) : CommandBSKickBase(creator, "botserv/kick/underlines", 2, 3)
@@ -784,7 +798,8 @@ public:
}
};
class CommandBSSetDontKickOps : public Command
class CommandBSSetDontKickOps
: public Command
{
public:
CommandBSSetDontKickOps(Module *creator, const Anope::string &sname = "botserv/set/dontkickops") : Command(creator, sname, 2, 2)
@@ -849,7 +864,8 @@ public:
}
};
class CommandBSSetDontKickVoices : public Command
class CommandBSSetDontKickVoices
: public Command
{
public:
CommandBSSetDontKickVoices(Module *creator, const Anope::string &sname = "botserv/set/dontkickvoices") : Command(creator, sname, 2, 2)
@@ -985,7 +1001,8 @@ struct UserData
Anope::string lastline;
};
class BanDataPurger : public Timer
class BanDataPurger
: public Timer
{
public:
BanDataPurger(Module *o) : Timer(o, 300, Anope::CurTime, true) { }
@@ -1007,7 +1024,8 @@ public:
}
};
class BSKick : public Module
class BSKick
: public Module
{
ExtensibleItem<BanData> bandata;
ExtensibleItem<UserData> userdata;
modules/commands/bs_set.cpp
+10 -5
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandBSSet : public Command
class CommandBSSet
: public Command
{
public:
CommandBSSet(Module *creator) : Command(creator, "botserv/set", 3, 3)
@@ -64,10 +65,12 @@ public:
}
};
class CommandBSSetBanExpire : public Command
class CommandBSSetBanExpire
: public Command
{
public:
class UnbanTimer : public Timer
class UnbanTimer
: public Timer
{
Anope::string chname;
Anope::string mask;
@@ -151,7 +154,8 @@ public:
}
};
class CommandBSSetPrivate : public Command
class CommandBSSetPrivate
: public Command
{
public:
CommandBSSetPrivate(Module *creator, const Anope::string &sname = "botserv/set/private") : Command(creator, sname, 2, 2)
@@ -201,7 +205,8 @@ public:
}
};
class BSSet : public Module
class BSSet
: public Module
{
CommandBSSet commandbsset;
CommandBSSetBanExpire commandbssetbanexpire;
modules/commands/cs_access.cpp
+14 -7
View File
@@ -20,7 +20,8 @@ static inline void reset_levels(ChannelInfo *ci)
ci->SetLevel(priv, level);
}
class AccessChanAccess : public ChanAccess
class AccessChanAccess
: public ChanAccess
{
public:
int level = 0;
@@ -67,7 +68,8 @@ public:
}
};
class AccessAccessProvider : public AccessProvider
class AccessAccessProvider
: public AccessProvider
{
public:
static AccessAccessProvider *me;
@@ -84,7 +86,8 @@ public:
};
AccessAccessProvider* AccessAccessProvider::me;
class CommandCSAccess : public Command
class CommandCSAccess
: public Command
{
void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
{
@@ -257,7 +260,8 @@ class CommandCSAccess : public Command
source.Reply(_("%s access list is empty."), ci->name.c_str());
else if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
{
class AccessDelCallback : public NumberList
class AccessDelCallback
: public NumberList
{
CommandSource &source;
ChannelInfo *ci;
@@ -361,7 +365,8 @@ class CommandCSAccess : public Command
source.Reply(_("%s access list is empty."), ci->name.c_str());
else if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos)
{
class AccessListCallback : public NumberList
class AccessListCallback
: public NumberList
{
ListFormatter &list;
ChannelInfo *ci;
@@ -633,7 +638,8 @@ public:
}
};
class CommandCSLevels : public Command
class CommandCSLevels
: public Command
{
void DoSet(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
{
@@ -857,7 +863,8 @@ public:
}
};
class CSAccess : public Module
class CSAccess
: public Module
{
AccessAccessProvider accessprovider;
CommandCSAccess commandcsaccess;
modules/commands/cs_akick.cpp
+8 -4
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSAKick : public Command
class CommandCSAKick
: public Command
{
void Enforce(CommandSource &source, ChannelInfo *ci)
{
@@ -203,7 +204,8 @@ class CommandCSAKick : public Command
/* Special case: is it a number/list? Only do search if it isn't. */
if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
{
class AkickDelCallback : public NumberList
class AkickDelCallback
: public NumberList
{
CommandSource &source;
ChannelInfo *ci;
@@ -280,7 +282,8 @@ class CommandCSAKick : public Command
if (!mask.empty() && isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
{
class AkickListCallback : public NumberList
class AkickListCallback
: public NumberList
{
ListFormatter &list;
ChannelInfo *ci;
@@ -525,7 +528,8 @@ public:
}
};
class CSAKick : public Module
class CSAKick
: public Module
{
CommandCSAKick commandcsakick;
modules/commands/cs_ban.cpp
+6 -3
View File
@@ -13,7 +13,8 @@
static Module *me;
class TempBan : public Timer
class TempBan
: public Timer
{
private:
Anope::string channel;
@@ -31,7 +32,8 @@ public:
}
};
class CommandCSBan : public Command
class CommandCSBan
: public Command
{
public:
CommandCSBan(Module *creator) : Command(creator, "chanserv/ban", 2, 4)
@@ -237,7 +239,8 @@ public:
}
};
class CSBan : public Module
class CSBan
: public Module
{
CommandCSBan commandcsban;
modules/commands/cs_clone.cpp
+4 -2
View File
@@ -12,7 +12,8 @@
#include "module.h"
#include "modules/bs_badwords.h"
class CommandCSClone : public Command
class CommandCSClone
: public Command
{
void CopySetting(ChannelInfo *ci, ChannelInfo *target_ci, const Anope::string &setting)
{
@@ -246,7 +247,8 @@ public:
}
};
class CSClone : public Module
class CSClone
: public Module
{
CommandCSClone commandcsclone;
modules/commands/cs_drop.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSDrop : public Command
class CommandCSDrop
: public Command
{
public:
CommandCSDrop(Module *creator) : Command(creator, "chanserv/drop", 1, 2)
@@ -81,7 +82,8 @@ public:
}
};
class CSDrop : public Module
class CSDrop
: public Module
{
CommandCSDrop commandcsdrop;
modules/commands/cs_enforce.cpp
+4 -2
View File
@@ -13,7 +13,8 @@
#include "module.h"
class CommandCSEnforce : public Command
class CommandCSEnforce
: public Command
{
private:
void DoSecureOps(CommandSource &source, ChannelInfo *ci)
@@ -262,7 +263,8 @@ public:
}
};
class CSEnforce : public Module
class CSEnforce
: public Module
{
CommandCSEnforce commandcsenforce;
modules/commands/cs_entrymsg.cpp
+9 -4
View File
@@ -12,7 +12,9 @@
#include "module.h"
#include "modules/cs_entrymsg.h"
struct EntryMsgImpl : EntryMsg, Serializable
struct EntryMsgImpl
: EntryMsg
, Serializable
{
EntryMsgImpl() : Serializable("EntryMsg")
{
@@ -39,7 +41,8 @@ struct EntryMsgImpl : EntryMsg, Serializable
static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
};
struct EntryMessageListImpl : EntryMessageList
struct EntryMessageListImpl
: EntryMessageList
{
EntryMessageListImpl(Extensible *) { }
@@ -97,7 +100,8 @@ Serializable* EntryMsgImpl::Unserialize(Serializable *obj, Serialize::Data &data
return m;
}
class CommandEntryMessage : public Command
class CommandEntryMessage
: public Command
{
private:
void DoList(CommandSource &source, ChannelInfo *ci)
@@ -260,7 +264,8 @@ public:
}
};
class CSEntryMessage : public Module
class CSEntryMessage
: public Module
{
CommandEntryMessage commandentrymsg;
ExtensibleItem<EntryMessageListImpl> eml;
modules/commands/cs_flags.cpp
+8 -4
View File
@@ -13,7 +13,8 @@
static std::map<Anope::string, char> defaultFlags;
class FlagsChanAccess : public ChanAccess
class FlagsChanAccess
: public ChanAccess
{
public:
std::set<char> flags;
@@ -59,7 +60,8 @@ public:
}
};
class FlagsAccessProvider : public AccessProvider
class FlagsAccessProvider
: public AccessProvider
{
public:
static FlagsAccessProvider *ap;
@@ -76,7 +78,8 @@ public:
};
FlagsAccessProvider* FlagsAccessProvider::ap;
class CommandCSFlags : public Command
class CommandCSFlags
: public Command
{
void DoModify(CommandSource &source, ChannelInfo *ci, Anope::string mask, const Anope::string &flags, const Anope::string &description)
{
@@ -475,7 +478,8 @@ public:
}
};
class CSFlags : public Module
class CSFlags
: public Module
{
FlagsAccessProvider accessprovider;
CommandCSFlags commandcsflags;
modules/commands/cs_getkey.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSGetKey : public Command
class CommandCSGetKey
: public Command
{
public:
CommandCSGetKey(Module *creator) : Command(creator, "chanserv/getkey", 1, 1)
@@ -59,7 +60,8 @@ public:
}
};
class CSGetKey : public Module
class CSGetKey
: public Module
{
CommandCSGetKey commandcsgetkey;
modules/commands/cs_info.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSInfo : public Command
class CommandCSInfo
: public Command
{
public:
CommandCSInfo(Module *creator) : Command(creator, "chanserv/info", 1, 2)
@@ -83,7 +84,8 @@ public:
}
};
class CSInfo : public Module
class CSInfo
: public Module
{
CommandCSInfo commandcsinfo;
modules/commands/cs_invite.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSInvite : public Command
class CommandCSInvite
: public Command
{
public:
CommandCSInvite(Module *creator) : Command(creator, "chanserv/invite", 1, 3)
@@ -97,7 +98,8 @@ public:
}
};
class CSInvite : public Module
class CSInvite
: public Module
{
CommandCSInvite commandcsinvite;
modules/commands/cs_kick.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSKick : public Command
class CommandCSKick
: public Command
{
public:
CommandCSKick(Module *creator) : Command(creator, "chanserv/kick", 2, 3)
@@ -133,7 +134,8 @@ public:
}
};
class CSKick : public Module
class CSKick
: public Module
{
CommandCSKick commandcskick;
modules/commands/cs_list.cpp
+6 -3
View File
@@ -12,7 +12,8 @@
#include "module.h"
#include "modules/cs_mode.h"
class CommandCSList : public Command
class CommandCSList
: public Command
{
public:
CommandCSList(Module *creator) : Command(creator, "chanserv/list", 1, 2)
@@ -170,7 +171,8 @@ public:
}
};
class CommandCSSetPrivate : public Command
class CommandCSSetPrivate
: public Command
{
public:
CommandCSSetPrivate(Module *creator, const Anope::string &cname = "chanserv/set/private") : Command(creator, cname, 2, 2)
@@ -238,7 +240,8 @@ public:
}
};
class CSList : public Module
class CSList
: public Module
{
CommandCSList commandcslist;
CommandCSSetPrivate commandcssetprivate;
modules/commands/cs_log.cpp
+9 -4
View File
@@ -12,7 +12,9 @@
#include "module.h"
#include "modules/cs_log.h"
struct LogSettingImpl : LogSetting, Serializable
struct LogSettingImpl
: LogSetting
, Serializable
{
LogSettingImpl() : Serializable("LogSetting")
{
@@ -77,7 +79,8 @@ struct LogSettingImpl : LogSetting, Serializable
}
};
struct LogSettingsImpl : LogSettings
struct LogSettingsImpl
: LogSettings
{
LogSettingsImpl(Extensible *) { }
@@ -97,7 +100,8 @@ struct LogSettingsImpl : LogSettings
}
};
class CommandCSLog : public Command
class CommandCSLog
: public Command
{
public:
CommandCSLog(Module *creator) : Command(creator, "chanserv/log", 1, 4)
@@ -281,7 +285,8 @@ public:
}
};
class CSLog : public Module
class CSLog
: public Module
{
ServiceReference<MemoServService> MSService;
CommandCSLog commandcslog;
modules/commands/cs_mode.cpp
+11 -5
View File
@@ -12,7 +12,9 @@
#include "module.h"
#include "modules/cs_mode.h"
struct ModeLockImpl : ModeLock, Serializable
struct ModeLockImpl
: ModeLock
, Serializable
{
ModeLockImpl() : Serializable("ModeLock")
{
@@ -33,7 +35,8 @@ struct ModeLockImpl : ModeLock, Serializable
static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
};
struct ModeLocksImpl : ModeLocks
struct ModeLocksImpl
: ModeLocks
{
Serialize::Reference<ChannelInfo> ci;
Serialize::Checker<ModeList> mlocks;
@@ -241,7 +244,8 @@ Serializable* ModeLockImpl::Unserialize(Serializable *obj, Serialize::Data &data
return ml;
}
class CommandCSMode : public Command
class CommandCSMode
: public Command
{
bool CanSet(CommandSource &source, ChannelInfo *ci, ChannelMode *cm, bool self)
{
@@ -789,7 +793,8 @@ public:
static Anope::map<std::pair<bool, Anope::string> > modes;
class CommandCSModes : public Command
class CommandCSModes
: public Command
{
public:
CommandCSModes(Module *creator) : Command(creator, "chanserv/modes", 1, 2)
@@ -906,7 +911,8 @@ public:
}
};
class CSMode : public Module
class CSMode
: public Module
{
CommandCSMode commandcsmode;
CommandCSModes commandcsmodes;
modules/commands/cs_register.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSRegister : public Command
class CommandCSRegister
: public Command
{
public:
CommandCSRegister(Module *creator) : Command(creator, "chanserv/register", 1, 2)
@@ -110,7 +111,8 @@ public:
};
class CSRegister : public Module
class CSRegister
: public Module
{
CommandCSRegister commandcsregister;
modules/commands/cs_seen.cpp
+8 -4
View File
@@ -22,7 +22,8 @@ static SeenInfo *FindInfo(const Anope::string &nick);
typedef Anope::hash_map<SeenInfo *> database_map;
database_map database;
struct SeenInfo : Serializable
struct SeenInfo
: Serializable
{
Anope::string nick;
Anope::string vhost;
@@ -109,7 +110,8 @@ static bool ShouldHide(const Anope::string &channel, User *u)
return false;
}
class CommandOSSeen : public Command
class CommandOSSeen
: public Command
{
public:
CommandOSSeen(Module *creator) : Command(creator, "operserv/seen", 1, 2)
@@ -180,7 +182,8 @@ public:
}
};
class CommandSeen : public Command
class CommandSeen
: public Command
{
void SimpleSeen(CommandSource &source, const std::vector<Anope::string> &params)
{
@@ -368,7 +371,8 @@ public:
}
};
class CSSeen : public Module
class CSSeen
: public Module
{
Serialize::Type seeninfo_type;
CommandSeen commandseen;
modules/commands/cs_set.cpp
+34 -17
View File
@@ -12,7 +12,8 @@
#include "module.h"
#include "modules/cs_mode.h"
class CommandCSSet : public Command
class CommandCSSet
: public Command
{
public:
CommandCSSet(Module *creator) : Command(creator, "chanserv/set", 2, 3)
@@ -64,7 +65,8 @@ public:
}
};
class CommandCSSetAutoOp : public Command
class CommandCSSetAutoOp
: public Command
{
public:
CommandCSSetAutoOp(Module *creator, const Anope::string &cname = "chanserv/set/autoop") : Command(creator, cname, 2, 2)
@@ -127,7 +129,8 @@ public:
}
};
class CommandCSSetBanType : public Command
class CommandCSSetBanType
: public Command
{
public:
CommandCSSetBanType(Module *creator, const Anope::string &cname = "chanserv/set/bantype") : Command(creator, cname, 2, 2)
@@ -194,7 +197,8 @@ public:
}
};
class CommandCSSetDescription : public Command
class CommandCSSetDescription
: public Command
{
public:
CommandCSSetDescription(Module *creator, const Anope::string &cname = "chanserv/set/description") : Command(creator, cname, 1, 2)
@@ -256,7 +260,8 @@ public:
}
};
class CommandCSSetFounder : public Command
class CommandCSSetFounder
: public Command
{
public:
CommandCSSetFounder(Module *creator, const Anope::string &cname = "chanserv/set/founder") : Command(creator, cname, 2, 2)
@@ -325,7 +330,8 @@ public:
}
};
class CommandCSSetKeepModes : public Command
class CommandCSSetKeepModes
: public Command
{
public:
CommandCSSetKeepModes(Module *creator, const Anope::string &cname = "chanserv/set/keepmodes") : Command(creator, cname, 2, 2)
@@ -390,7 +396,8 @@ public:
}
};
class CommandCSSetPeace : public Command
class CommandCSSetPeace
: public Command
{
public:
CommandCSSetPeace(Module *creator, const Anope::string &cname = "chanserv/set/peace") : Command(creator, cname, 2, 2)
@@ -462,7 +469,8 @@ inline static Anope::string BotModes()
);
}
class CommandCSSetPersist : public Command
class CommandCSSetPersist
: public Command
{
public:
CommandCSSetPersist(Module *creator, const Anope::string &cname = "chanserv/set/persist") : Command(creator, cname, 2, 2)
@@ -611,7 +619,8 @@ public:
}
};
class CommandCSSetRestricted : public Command
class CommandCSSetRestricted
: public Command
{
public:
CommandCSSetRestricted(Module *creator, const Anope::string &cname = "chanserv/set/restricted") : Command(creator, cname, 2, 2)
@@ -673,7 +682,8 @@ public:
}
};
class CommandCSSetSecure : public Command
class CommandCSSetSecure
: public Command
{
public:
CommandCSSetSecure(Module *creator, const Anope::string &cname = "chanserv/set/secure") : Command(creator, cname, 2, 2)
@@ -736,7 +746,8 @@ public:
}
};
class CommandCSSetSecureFounder : public Command
class CommandCSSetSecureFounder
: public Command
{
public:
CommandCSSetSecureFounder(Module *creator, const Anope::string &cname = "chanserv/set/securefounder") : Command(creator, cname, 2, 2)
@@ -800,7 +811,8 @@ public:
}
};
class CommandCSSetSecureOps : public Command
class CommandCSSetSecureOps
: public Command
{
public:
CommandCSSetSecureOps(Module *creator, const Anope::string &cname = "chanserv/set/secureops") : Command(creator, cname, 2, 2)
@@ -862,7 +874,8 @@ public:
}
};
class CommandCSSetSignKick : public Command
class CommandCSSetSignKick
: public Command
{
public:
CommandCSSetSignKick(Module *creator, const Anope::string &cname = "chanserv/set/signkick") : Command(creator, cname, 2, 2)
@@ -939,7 +952,8 @@ public:
}
};
class CommandCSSetSuccessor : public Command
class CommandCSSetSuccessor
: public Command
{
public:
CommandCSSetSuccessor(Module *creator, const Anope::string &cname = "chanserv/set/successor") : Command(creator, cname, 1, 2)
@@ -1033,7 +1047,8 @@ public:
}
};
class CommandCSSetNoexpire : public Command
class CommandCSSetNoexpire
: public Command
{
public:
CommandCSSetNoexpire(Module *creator) : Command(creator, "chanserv/saset/noexpire", 2, 2)
@@ -1091,13 +1106,15 @@ public:
}
};
class CSSet : public Module
class CSSet
: public Module
{
SerializableExtensibleItem<bool> noautoop, peace, securefounder,
restricted, secure, secureops, signkick, signkick_level, noexpire,
persist;
struct KeepModes : SerializableExtensibleItem<bool>
struct KeepModes
: SerializableExtensibleItem<bool>
{
KeepModes(Module *m, const Anope::string &n) : SerializableExtensibleItem<bool>(m, n) { }
modules/commands/cs_set_misc.cpp
+7 -3
View File
@@ -31,7 +31,9 @@ static ExtensibleItem<CSMiscData> *GetItem(const Anope::string &name)
return it;
}
struct CSMiscData : MiscData, Serializable
struct CSMiscData
: MiscData
, Serializable
{
CSMiscData(Extensible *obj) : Serializable("CSMiscData") { }
@@ -88,7 +90,8 @@ static Anope::string GetAttribute(const Anope::string &command)
return command;
}
class CommandCSSetMisc : public Command
class CommandCSSetMisc
: public Command
{
public:
CommandCSSetMisc(Module *creator, const Anope::string &cname = "chanserv/set/misc") : Command(creator, cname, 1, 2)
@@ -164,7 +167,8 @@ public:
}
};
class CSSetMisc : public Module
class CSSetMisc
: public Module
{
CommandCSSetMisc commandcssetmisc;
Serialize::Type csmiscdata_type;
modules/commands/cs_status.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSStatus : public Command
class CommandCSStatus
: public Command
{
public:
CommandCSStatus(Module *creator) : Command(creator, "chanserv/status", 1, 2)
@@ -110,7 +111,8 @@ public:
}
};
class CSStatus : public Module
class CSStatus
: public Module
{
CommandCSStatus commandcsstatus;
modules/commands/cs_suspend.cpp
+9 -4
View File
@@ -12,7 +12,9 @@
#include "module.h"
#include "modules/suspend.h"
struct CSSuspendInfo : SuspendInfo, Serializable
struct CSSuspendInfo
: SuspendInfo
, Serializable
{
CSSuspendInfo(Extensible *) : Serializable("CSSuspendInfo") { }
@@ -50,7 +52,8 @@ struct CSSuspendInfo : SuspendInfo, Serializable
}
};
class CommandCSSuspend : public Command
class CommandCSSuspend
: public Command
{
public:
CommandCSSuspend(Module *creator) : Command(creator, "chanserv/suspend", 2, 3)
@@ -142,7 +145,8 @@ public:
}
};
class CommandCSUnSuspend : public Command
class CommandCSUnSuspend
: public Command
{
public:
CommandCSUnSuspend(Module *creator) : Command(creator, "chanserv/unsuspend", 1, 1)
@@ -193,7 +197,8 @@ public:
}
};
class CSSuspend : public Module
class CSSuspend
: public Module
{
CommandCSSuspend commandcssuspend;
CommandCSUnSuspend commandcsunsuspend;
modules/commands/cs_sync.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSSync : public Command
class CommandCSSync
: public Command
{
public:
CommandCSSync(Module *creator) : Command(creator, "chanserv/sync", 1, 1)
@@ -52,7 +53,8 @@ public:
}
};
class CSSync : public Module
class CSSync
: public Module
{
CommandCSSync commandcssync;
public:
modules/commands/cs_topic.cpp
+6 -3
View File
@@ -12,7 +12,8 @@
#include "module.h"
#include "modules/cs_mode.h"
class CommandCSSetKeepTopic : public Command
class CommandCSSetKeepTopic
: public Command
{
public:
CommandCSSetKeepTopic(Module *creator, const Anope::string &cname = "chanserv/set/keeptopic") : Command(creator, cname, 2, 2)
@@ -76,7 +77,8 @@ public:
}
};
class CommandCSTopic : public Command
class CommandCSTopic
: public Command
{
ExtensibleRef<bool> topiclock;
@@ -202,7 +204,8 @@ public:
}
};
class CSTopic : public Module
class CSTopic
: public Module
{
CommandCSTopic commandcstopic;
CommandCSSetKeepTopic commandcssetkeeptopic;
modules/commands/cs_unban.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSUnban : public Command
class CommandCSUnban
: public Command
{
public:
CommandCSUnban(Module *creator) : Command(creator, "chanserv/unban", 0, 2)
@@ -115,7 +116,8 @@ public:
}
};
class CSUnban : public Module
class CSUnban
: public Module
{
CommandCSUnban commandcsunban;
modules/commands/cs_updown.cpp
+6 -3
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandCSUp : public Command
class CommandCSUp
: public Command
{
void SetModes(User *u, Channel *c)
{
@@ -129,7 +130,8 @@ public:
}
};
class CommandCSDown : public Command
class CommandCSDown
: public Command
{
void RemoveAll(User *u, Channel *c)
{
@@ -226,7 +228,8 @@ public:
}
};
class CSUpDown : public Module
class CSUpDown
: public Module
{
CommandCSUp commandcsup;
CommandCSDown commandcsdown;
modules/commands/cs_xop.cpp
+12 -6
View File
@@ -17,7 +17,8 @@ namespace
std::map<Anope::string, std::vector<Anope::string> > permissions;
}
class XOPChanAccess : public ChanAccess
class XOPChanAccess
: public ChanAccess
{
public:
Anope::string type;
@@ -84,7 +85,8 @@ public:
}
};
class XOPAccessProvider : public AccessProvider
class XOPAccessProvider
: public AccessProvider
{
public:
XOPAccessProvider(Module *o) : AccessProvider(o, "access/xop")
@@ -97,7 +99,8 @@ public:
}
};
class CommandCSXOP : public Command
class CommandCSXOP
: public Command
{
private:
void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
@@ -291,7 +294,8 @@ private:
/* Special case: is it a number/list? Only do search if it isn't. */
if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
{
class XOPDelCallback : public NumberList
class XOPDelCallback
: public NumberList
{
CommandSource &source;
ChannelInfo *ci;
@@ -394,7 +398,8 @@ private:
if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos)
{
class XOPListCallback : public NumberList
class XOPListCallback
: public NumberList
{
ListFormatter &list;
ChannelInfo *ci;
@@ -595,7 +600,8 @@ public:
}
};
class CSXOP : public Module
class CSXOP
: public Module
{
XOPAccessProvider accessprovider;
CommandCSXOP commandcsxop;
modules/commands/gl_global.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandGLGlobal : public Command
class CommandGLGlobal
: public Command
{
ServiceReference<GlobalService> GService;
@@ -51,7 +52,8 @@ public:
}
};
class GLGlobal : public Module
class GLGlobal
: public Module
{
CommandGLGlobal commandglglobal;
modules/commands/greet.cpp
+8 -4
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandBSSetGreet : public Command
class CommandBSSetGreet
: public Command
{
public:
CommandBSSetGreet(Module *creator, const Anope::string &sname = "botserv/set/greet") : Command(creator, sname, 2, 2)
@@ -75,7 +76,8 @@ public:
}
};
class CommandNSSetGreet : public Command
class CommandNSSetGreet
: public Command
{
public:
CommandNSSetGreet(Module *creator, const Anope::string &sname = "nickserv/set/greet", size_t min = 0) : Command(creator, sname, min, min + 1)
@@ -136,7 +138,8 @@ public:
}
};
class CommandNSSASetGreet : public CommandNSSetGreet
class CommandNSSASetGreet
: public CommandNSSetGreet
{
public:
CommandNSSASetGreet(Module *creator) : CommandNSSetGreet(creator, "nickserv/saset/greet", 1)
@@ -162,7 +165,8 @@ public:
}
};
class Greet : public Module
class Greet
: public Module
{
/* channel setting for whether or not greet should be shown */
SerializableExtensibleItem<bool> bs_greet;
modules/commands/help.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandHelp : public Command
class CommandHelp
: public Command
{
static const unsigned help_wrap_len = 40;
@@ -182,7 +183,8 @@ public:
}
};
class Help : public Module
class Help
: public Module
{
CommandHelp commandhelp;
modules/commands/hs_del.cpp
+6 -3
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandHSDel : public Command
class CommandHSDel
: public Command
{
public:
CommandHSDel(Module *creator) : Command(creator, "hostserv/del", 1, 1)
@@ -51,7 +52,8 @@ public:
}
};
class CommandHSDelAll : public Command
class CommandHSDelAll
: public Command
{
public:
CommandHSDelAll(Module *creator) : Command(creator, "hostserv/delall", 1, 1)
@@ -96,7 +98,8 @@ public:
}
};
class HSDel : public Module
class HSDel
: public Module
{
CommandHSDel commandhsdel;
CommandHSDelAll commandhsdelall;
modules/commands/hs_group.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandHSGroup : public Command
class CommandHSGroup
: public Command
{
bool setting = false;
@@ -75,7 +76,8 @@ public:
}
};
class HSGroup : public Module
class HSGroup
: public Module
{
CommandHSGroup commandhsgroup;
bool syncongroup;
modules/commands/hs_list.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandHSList : public Command
class CommandHSList
: public Command
{
public:
CommandHSList(Module *creator) : Command(creator, "hostserv/list", 0, 1)
@@ -142,7 +143,8 @@ public:
}
};
class HSList : public Module
class HSList
: public Module
{
CommandHSList commandhslist;
modules/commands/hs_off.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandHSOff : public Command
class CommandHSOff
: public Command
{
public:
CommandHSOff(Module *creator) : Command(creator, "hostserv/off", 0, 0)
@@ -53,7 +54,8 @@ public:
}
};
class HSOff : public Module
class HSOff
: public Module
{
CommandHSOff commandhsoff;
modules/commands/hs_on.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandHSOn : public Command
class CommandHSOn
: public Command
{
public:
CommandHSOn(Module *creator) : Command(creator, "hostserv/on", 0, 0)
@@ -59,7 +60,8 @@ public:
}
};
class HSOn : public Module
class HSOn
: public Module
{
CommandHSOn commandhson;
modules/commands/hs_request.cpp
+12 -6
View File
@@ -20,7 +20,8 @@ static ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ")
static void req_send_memos(Module *me, CommandSource &source, const Anope::string &vIdent, const Anope::string &vHost);
struct HostRequest : Serializable
struct HostRequest
: Serializable
{
Anope::string nick;
Anope::string ident;
@@ -63,7 +64,8 @@ struct HostRequest : Serializable
}
};
class CommandHSRequest : public Command
class CommandHSRequest
: public Command
{
bool isvalidchar(char c)
{
@@ -185,7 +187,8 @@ public:
}
};
class CommandHSActivate : public Command
class CommandHSActivate
: public Command
{
public:
CommandHSActivate(Module *creator) : Command(creator, "hostserv/activate", 1, 1)
@@ -234,7 +237,8 @@ public:
}
};
class CommandHSReject : public Command
class CommandHSReject
: public Command
{
public:
CommandHSReject(Module *creator) : Command(creator, "hostserv/reject", 1, 2)
@@ -290,7 +294,8 @@ public:
}
};
class CommandHSWaiting : public Command
class CommandHSWaiting
: public Command
{
public:
CommandHSWaiting(Module *creator) : Command(creator, "hostserv/waiting", 0, 0)
@@ -348,7 +353,8 @@ public:
}
};
class HSRequest : public Module
class HSRequest
: public Module
{
CommandHSRequest commandhsrequest;
CommandHSActivate commandhsactive;
modules/commands/hs_set.cpp
+6 -3
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandHSSet : public Command
class CommandHSSet
: public Command
{
public:
CommandHSSet(Module *creator) : Command(creator, "hostserv/set", 2, 2)
@@ -104,7 +105,8 @@ public:
}
};
class CommandHSSetAll : public Command
class CommandHSSetAll
: public Command
{
void Sync(const NickAlias *na)
{
@@ -212,7 +214,8 @@ public:
}
};
class HSSet : public Module
class HSSet
: public Module
{
CommandHSSet commandhsset;
CommandHSSetAll commandhssetall;
modules/commands/ms_cancel.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandMSCancel : public Command
class CommandMSCancel
: public Command
{
public:
CommandMSCancel(Module *creator) : Command(creator, "memoserv/cancel", 1, 1)
@@ -87,7 +88,8 @@ public:
}
};
class MSCancel : public Module
class MSCancel
: public Module
{
CommandMSCancel commandmscancel;
modules/commands/ms_check.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandMSCheck : public Command
class CommandMSCheck
: public Command
{
public:
CommandMSCheck(Module *creator) : Command(creator, "memoserv/check", 1, 1)
@@ -72,7 +73,8 @@ public:
}
};
class MSCheck : public Module
class MSCheck
: public Module
{
CommandMSCheck commandmscheck;
modules/commands/ms_del.cpp
+6 -3
View File
@@ -11,7 +11,8 @@
#include "module.h"
class MemoDelCallback : public NumberList
class MemoDelCallback
: public NumberList
{
CommandSource &source;
Command *cmd;
@@ -36,7 +37,8 @@ public:
}
};
class CommandMSDel : public Command
class CommandMSDel
: public Command
{
public:
CommandMSDel(Module *creator) : Command(creator, "memoserv/del", 0, 2)
@@ -144,7 +146,8 @@ public:
}
};
class MSDel : public Module
class MSDel
: public Module
{
CommandMSDel commandmsdel;
modules/commands/ms_ignore.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandMSIgnore : public Command
class CommandMSIgnore
: public Command
{
public:
CommandMSIgnore(Module *creator) : Command(creator, "memoserv/ignore", 1, 3)
@@ -118,7 +119,8 @@ public:
}
};
class MSIgnore : public Module
class MSIgnore
: public Module
{
CommandMSIgnore commandmsignore;
modules/commands/ms_info.cpp
+4 -2
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandMSInfo : public Command
class CommandMSInfo
: public Command
{
public:
CommandMSInfo(Module *creator) : Command(creator, "memoserv/info", 0, 1)
@@ -218,7 +219,8 @@ public:
}
};
class MSInfo : public Module
class MSInfo
: public Module
{
CommandMSInfo commandmsinfo;
modules/commands/ms_list.cpp
+6 -3
View File
@@ -11,7 +11,8 @@
#include "module.h"
class CommandMSList : public Command
class CommandMSList
: public Command
{
public:
CommandMSList(Module *creator) : Command(creator, "memoserv/list", 0, 2)
@@ -65,7 +66,8 @@ public:
if (!param.empty() && isdigit(param[0]))
{
class MemoListCallback : public NumberList
class MemoListCallback
: public NumberList
{
ListFormatter &list;
CommandSource &source;
@@ -149,7 +151,8 @@ public:
}
};
class MSList : public Module
class MSList
: public Module
{
CommandMSList commandmslist;
modules/commands/ms_read.cpp
+6 -3
View File
@@ -47,7 +47,8 @@ static void rsend_notify(CommandSource &source, MemoInfo *mi, Memo *m, const Ano
m->receipt = false;
}
class MemoListCallback : public NumberList
class MemoListCallback
: public NumberList
{
CommandSource &source;
MemoInfo *mi;
@@ -104,7 +105,8 @@ public:
}
};
class CommandMSRead : public Command
class CommandMSRead
: public Command
{
public:
CommandMSRead(Module *creator) : Command(creator, "memoserv/read", 1, 2)
@@ -209,7 +211,8 @@ public:
}
};
class MSRead : public Module
class MSRead
: public Module
{
CommandMSRead commandmsread;
modules/commands/ms_rsend.cpp
+4 -2
View File
@@ -16,7 +16,8 @@ namespace
ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
}
class CommandMSRSend : public Command
class CommandMSRSend
: public Command
{
public:
CommandMSRSend(Module *creator) : Command(creator, "memoserv/rsend", 2, 2)
@@ -88,7 +89,8 @@ public:
}
};
class MSRSend : public Module
class MSRSend
: public Module
{
CommandMSRSend commandmsrsend;
modules/commands/ms_send.cpp
+4 -2
View File
@@ -16,7 +16,8 @@ namespace
ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
}
class CommandMSSend : public Command
class CommandMSSend
: public Command
{
public:
CommandMSSend(Module *creator) : Command(creator, "memoserv/send", 2, 2)
@@ -71,7 +72,8 @@ public:
}
};
class MSSend : public Module
class MSSend
: public Module
{
CommandMSSend commandmssend;

Some files were not shown because too many files have changed in this diff Show More