From 7d1047490e4380c4f02900b711c66055d29fb387 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 4 Jan 2022 12:02:50 +0000 Subject: Consistently use #pragma once across all header files. This replaces a mixture of no include guards, ANOPE_FOO_H, and FOO_H. --- include/modules/bs_badwords.h | 2 ++ include/modules/bs_kick.h | 2 ++ include/modules/cs_entrymsg.h | 2 ++ include/modules/cs_log.h | 2 ++ include/modules/cs_mode.h | 2 ++ include/modules/dns.h | 5 +---- include/modules/encryption.h | 2 ++ include/modules/httpd.h | 5 +---- include/modules/ldap.h | 5 +---- include/modules/ns_cert.h | 2 ++ include/modules/os_forbid.h | 5 +---- include/modules/os_ignore.h | 2 ++ include/modules/os_news.h | 5 +---- include/modules/os_session.h | 5 +---- include/modules/pseudoclients/chanserv.h | 5 +---- include/modules/pseudoclients/global.h | 5 +---- include/modules/pseudoclients/memoserv.h | 5 +---- include/modules/pseudoclients/nickserv.h | 5 +---- include/modules/redis.h | 2 ++ include/modules/sasl.h | 2 ++ include/modules/set_misc.h | 2 ++ include/modules/sql.h | 2 ++ include/modules/ssl.h | 2 ++ include/modules/suspend.h | 2 ++ include/modules/xmlrpc.h | 2 ++ 25 files changed, 40 insertions(+), 40 deletions(-) (limited to 'include/modules') diff --git a/include/modules/bs_badwords.h b/include/modules/bs_badwords.h index 7bb7f1130..a3120d609 100644 --- a/include/modules/bs_badwords.h +++ b/include/modules/bs_badwords.h @@ -9,6 +9,8 @@ * Based on the original code of Services by Andy Church. */ +#pragma once + /** Flags for badwords */ enum BadWordType diff --git a/include/modules/bs_kick.h b/include/modules/bs_kick.h index 69c5c43ad..dc9926615 100644 --- a/include/modules/bs_kick.h +++ b/include/modules/bs_kick.h @@ -9,6 +9,8 @@ * Based on the original code of Services by Andy Church. */ +#pragma once + /* Indices for TTB (Times To Ban) */ enum { diff --git a/include/modules/cs_entrymsg.h b/include/modules/cs_entrymsg.h index 5b899ec84..5ff38130e 100644 --- a/include/modules/cs_entrymsg.h +++ b/include/modules/cs_entrymsg.h @@ -6,6 +6,8 @@ * Please read COPYING and README for further details. */ +#pragma once + struct EntryMsg { Anope::string chan; diff --git a/include/modules/cs_log.h b/include/modules/cs_log.h index 14f9764e3..6438dfada 100644 --- a/include/modules/cs_log.h +++ b/include/modules/cs_log.h @@ -9,6 +9,8 @@ * Based on the original code of Services by Andy Church. */ +#pragma once + struct LogSetting { Anope::string chan; diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h index d99a9a1ff..33bf14317 100644 --- a/include/modules/cs_mode.h +++ b/include/modules/cs_mode.h @@ -9,6 +9,8 @@ * Based on the original code of Services by Andy Church. */ +#pragma once + struct ModeLock { Anope::string ci; diff --git a/include/modules/dns.h b/include/modules/dns.h index 6c9eda89f..2dc75a188 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -9,8 +9,7 @@ * Based on the original code of Services by Andy Church. */ -#ifndef DNS_H -#define DNS_H +#pragma once namespace DNS { @@ -174,5 +173,3 @@ namespace DNS }; } // namespace DNS - -#endif // DNS_H diff --git a/include/modules/encryption.h b/include/modules/encryption.h index 4adc77136..6d20c906e 100644 --- a/include/modules/encryption.h +++ b/include/modules/encryption.h @@ -9,6 +9,8 @@ * Based on the original code of Services by Andy Church. */ +#pragma once + namespace Encryption { typedef std::pair Hash; diff --git a/include/modules/httpd.h b/include/modules/httpd.h index c4c2c7d74..f5a4c026f 100644 --- a/include/modules/httpd.h +++ b/include/modules/httpd.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef ANOPE_HTTPD_H -#define ANOPE_HTTPD_H +#pragma once enum HTTPError { @@ -240,5 +239,3 @@ namespace HTTPUtils return dst; } } - -#endif // ANOPE_HTTPD_H diff --git a/include/modules/ldap.h b/include/modules/ldap.h index 7b778b6d4..05eceed50 100644 --- a/include/modules/ldap.h +++ b/include/modules/ldap.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef ANOPE_LDAP_H -#define ANOPE_LDAP_H +#pragma once class LDAPException : public ModuleException { @@ -167,5 +166,3 @@ class LDAPProvider : public Service */ virtual void Modify(LDAPInterface *i, const Anope::string &base, LDAPMods &attributes) = 0; }; - -#endif // ANOPE_LDAP_H diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h index 62ac07846..a4c9df02b 100644 --- a/include/modules/ns_cert.h +++ b/include/modules/ns_cert.h @@ -9,6 +9,8 @@ * Based on the original code of Services by Andy Church. */ +#pragma once + struct NSCertList { protected: diff --git a/include/modules/os_forbid.h b/include/modules/os_forbid.h index dd73dca4a..2c49fb197 100644 --- a/include/modules/os_forbid.h +++ b/include/modules/os_forbid.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef OS_FORBID_H -#define OS_FORBID_H +#pragma once enum ForbidType { @@ -51,5 +50,3 @@ class ForbidService : public Service }; static ServiceReference forbid_service("ForbidService", "forbid"); - -#endif diff --git a/include/modules/os_ignore.h b/include/modules/os_ignore.h index c4e401e81..658f5b712 100644 --- a/include/modules/os_ignore.h +++ b/include/modules/os_ignore.h @@ -9,6 +9,8 @@ * Based on the original code of Services by Andy Church. */ +#pragma once + struct IgnoreData { Anope::string mask; diff --git a/include/modules/os_news.h b/include/modules/os_news.h index acae4b641..68baa79cc 100644 --- a/include/modules/os_news.h +++ b/include/modules/os_news.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef OS_NEWS -#define OS_NEWS +#pragma once enum NewsType { @@ -48,5 +47,3 @@ class NewsService : public Service }; static ServiceReference news_service("NewsService", "news"); - -#endif // OS_NEWS diff --git a/include/modules/os_session.h b/include/modules/os_session.h index 8318a40ec..638a587c2 100644 --- a/include/modules/os_session.h +++ b/include/modules/os_session.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef OS_SESSION_H -#define OS_SESSION_H +#pragma once struct Session { @@ -90,5 +89,3 @@ Serializable* Exception::Unserialize(Serializable *obj, Serialize::Data &data) session_service->AddException(ex); return ex; } - -#endif diff --git a/include/modules/pseudoclients/chanserv.h b/include/modules/pseudoclients/chanserv.h index 893ea05aa..c9b52e630 100644 --- a/include/modules/pseudoclients/chanserv.h +++ b/include/modules/pseudoclients/chanserv.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef CHANSERV_H -#define CHANSERV_H +#pragma once class ChanServService : public Service { @@ -21,5 +20,3 @@ class ChanServService : public Service */ virtual void Hold(Channel *c) = 0; }; - -#endif // CHANSERV_H diff --git a/include/modules/pseudoclients/global.h b/include/modules/pseudoclients/global.h index 357f1c5cf..9d1f4505c 100644 --- a/include/modules/pseudoclients/global.h +++ b/include/modules/pseudoclients/global.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef GLOBAL_H -#define GLOBAL_H +#pragma once class GlobalService : public Service { @@ -26,5 +25,3 @@ class GlobalService : public Service */ virtual void SendGlobal(BotInfo *sender, const Anope::string &source, const Anope::string &message) = 0; }; - -#endif // GLOBAL_H diff --git a/include/modules/pseudoclients/memoserv.h b/include/modules/pseudoclients/memoserv.h index e64b2104a..ff0584772 100644 --- a/include/modules/pseudoclients/memoserv.h +++ b/include/modules/pseudoclients/memoserv.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef MEMOSERV_H -#define MEMOSERV_H +#pragma once class MemoServService : public Service { @@ -37,5 +36,3 @@ class MemoServService : public Service */ virtual void Check(User *u) = 0; }; - -#endif // MEMOSERV_H diff --git a/include/modules/pseudoclients/nickserv.h b/include/modules/pseudoclients/nickserv.h index d17e14e8e..1a50a67c1 100644 --- a/include/modules/pseudoclients/nickserv.h +++ b/include/modules/pseudoclients/nickserv.h @@ -6,8 +6,7 @@ * Please read COPYING and README for further details. */ -#ifndef NICKSERV_H -#define NICKSERV_H +#pragma once class NickServService : public Service { @@ -20,5 +19,3 @@ class NickServService : public Service virtual void Collide(User *u, NickAlias *na) = 0; virtual void Release(NickAlias *na) = 0; }; - -#endif // NICKSERV_H diff --git a/include/modules/redis.h b/include/modules/redis.h index 4d72b2afa..b4adb1f40 100644 --- a/include/modules/redis.h +++ b/include/modules/redis.h @@ -6,6 +6,8 @@ * Please read COPYING and README for further details. */ +#pragma once + namespace Redis { struct Reply diff --git a/include/modules/sasl.h b/include/modules/sasl.h index 3b2d587fa..ab848e587 100644 --- a/include/modules/sasl.h +++ b/include/modules/sasl.h @@ -6,6 +6,8 @@ * Please read COPYING and README for further details. */ +#pragma once + namespace SASL { struct Message diff --git a/include/modules/set_misc.h b/include/modules/set_misc.h index c056c4c98..a2cd1b973 100644 --- a/include/modules/set_misc.h +++ b/include/modules/set_misc.h @@ -6,6 +6,8 @@ * Please read COPYING and README for further details. */ +#pragma once + struct MiscData { Anope::string object; diff --git a/include/modules/sql.h b/include/modules/sql.h index f7734a717..fcad4c79d 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -6,6 +6,8 @@ * Please read COPYING and README for further details. */ +#pragma once + namespace SQL { diff --git a/include/modules/ssl.h b/include/modules/ssl.h index 5dcc98b6e..83536558f 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -6,6 +6,8 @@ * Please read COPYING and README for further details. */ +#pragma once + class SSLService : public Service { public: diff --git a/include/modules/suspend.h b/include/modules/suspend.h index b9865717d..b376e4f00 100644 --- a/include/modules/suspend.h +++ b/include/modules/suspend.h @@ -9,6 +9,8 @@ * Based on the original code of Services by Andy Church. */ +#pragma once + struct SuspendInfo { Anope::string what, by, reason; diff --git a/include/modules/xmlrpc.h b/include/modules/xmlrpc.h index a39cdf061..1ccaa5ac9 100644 --- a/include/modules/xmlrpc.h +++ b/include/modules/xmlrpc.h @@ -6,6 +6,8 @@ * Please read COPYING and README for further details. */ +#pragma once + #include "httpd.h" class XMLRPCRequest -- cgit