summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/botserv/bs_badwords.cpp2
-rw-r--r--modules/botserv/bs_kick.cpp4
-rw-r--r--modules/chanserv/chanserv.cpp2
-rw-r--r--modules/chanserv/cs_clone.cpp2
-rw-r--r--modules/chanserv/cs_entrymsg.cpp2
-rw-r--r--modules/chanserv/cs_list.cpp2
-rw-r--r--modules/chanserv/cs_log.cpp2
-rw-r--r--modules/chanserv/cs_mode.cpp2
-rw-r--r--modules/chanserv/cs_set.cpp2
-rw-r--r--modules/chanserv/cs_topic.cpp2
-rw-r--r--modules/database/db_atheme.cpp20
-rw-r--r--modules/database/db_old.cpp14
-rw-r--r--modules/hostserv/hs_request.cpp2
-rw-r--r--modules/nickserv/ns_cert.cpp2
-rw-r--r--modules/nickserv/ns_group.cpp2
-rw-r--r--modules/nickserv/ns_recover.cpp2
-rw-r--r--modules/nickserv/ns_sasl.cpp4
-rw-r--r--modules/operserv/os_defcon.cpp2
-rw-r--r--modules/operserv/os_forbid.cpp2
-rw-r--r--modules/operserv/os_ignore.cpp2
-rw-r--r--modules/operserv/os_news.cpp2
-rw-r--r--modules/operserv/os_oper.cpp2
-rw-r--r--modules/operserv/os_session.cpp2
-rw-r--r--modules/operserv/os_stats.cpp2
-rw-r--r--modules/protocol/hybrid.cpp2
-rw-r--r--modules/protocol/inspircd.cpp6
-rw-r--r--modules/protocol/plexus.cpp2
-rw-r--r--modules/protocol/solanum.cpp4
-rw-r--r--modules/protocol/unrealircd.cpp4
-rw-r--r--modules/webcpanel/pages/nickserv/cert.cpp2
30 files changed, 51 insertions, 51 deletions
diff --git a/modules/botserv/bs_badwords.cpp b/modules/botserv/bs_badwords.cpp
index 95f749488..e1a283eb7 100644
--- a/modules/botserv/bs_badwords.cpp
+++ b/modules/botserv/bs_badwords.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/bs_badwords.h"
+#include "modules/botserv/badwords.h"
struct BadWordImpl final
: BadWord
diff --git a/modules/botserv/bs_kick.cpp b/modules/botserv/bs_kick.cpp
index eba2868a6..9f83e41b3 100644
--- a/modules/botserv/bs_kick.cpp
+++ b/modules/botserv/bs_kick.cpp
@@ -10,8 +10,8 @@
*/
#include "module.h"
-#include "modules/bs_kick.h"
-#include "modules/bs_badwords.h"
+#include "modules/botserv/kick.h"
+#include "modules/botserv/badwords.h"
static Module *me;
diff --git a/modules/chanserv/chanserv.cpp b/modules/chanserv/chanserv.cpp
index cca234812..cc6fa4638 100644
--- a/modules/chanserv/chanserv.cpp
+++ b/modules/chanserv/chanserv.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
inline static Anope::string BotModes()
{
diff --git a/modules/chanserv/cs_clone.cpp b/modules/chanserv/cs_clone.cpp
index 5e4130532..b58635ff0 100644
--- a/modules/chanserv/cs_clone.cpp
+++ b/modules/chanserv/cs_clone.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/bs_badwords.h"
+#include "modules/botserv/badwords.h"
class CommandCSClone final
: public Command
diff --git a/modules/chanserv/cs_entrymsg.cpp b/modules/chanserv/cs_entrymsg.cpp
index 9f76c9d50..01fa5e445 100644
--- a/modules/chanserv/cs_entrymsg.cpp
+++ b/modules/chanserv/cs_entrymsg.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/cs_entrymsg.h"
+#include "modules/chanserv/entrymsg.h"
struct EntryMsgImpl final
: EntryMsg
diff --git a/modules/chanserv/cs_list.cpp b/modules/chanserv/cs_list.cpp
index e8feabed4..1002d10ba 100644
--- a/modules/chanserv/cs_list.cpp
+++ b/modules/chanserv/cs_list.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
class CommandCSList final
: public Command
diff --git a/modules/chanserv/cs_log.cpp b/modules/chanserv/cs_log.cpp
index e91a3f731..3da80b713 100644
--- a/modules/chanserv/cs_log.cpp
+++ b/modules/chanserv/cs_log.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/cs_log.h"
+#include "modules/chanserv/log.h"
struct LogSettingImpl final
: LogSetting
diff --git a/modules/chanserv/cs_mode.cpp b/modules/chanserv/cs_mode.cpp
index cc7a526cd..d20d92581 100644
--- a/modules/chanserv/cs_mode.cpp
+++ b/modules/chanserv/cs_mode.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
struct ModeLockImpl final
: ModeLock
diff --git a/modules/chanserv/cs_set.cpp b/modules/chanserv/cs_set.cpp
index 7b214a531..0fb18cdaa 100644
--- a/modules/chanserv/cs_set.cpp
+++ b/modules/chanserv/cs_set.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
class CommandCSSet final
: public Command
diff --git a/modules/chanserv/cs_topic.cpp b/modules/chanserv/cs_topic.cpp
index 7f05d1d83..59adcd433 100644
--- a/modules/chanserv/cs_topic.cpp
+++ b/modules/chanserv/cs_topic.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
class CommandCSSetKeepTopic final
: public Command
diff --git a/modules/database/db_atheme.cpp b/modules/database/db_atheme.cpp
index 79d924090..6cac99449 100644
--- a/modules/database/db_atheme.cpp
+++ b/modules/database/db_atheme.cpp
@@ -12,17 +12,17 @@
#include <functional>
#include "module.h"
-#include "modules/bs_badwords.h"
-#include "modules/bs_kick.h"
-#include "modules/cs_entrymsg.h"
-#include "modules/cs_mode.h"
-#include "modules/hs_request.h"
+#include "modules/botserv/badwords.h"
+#include "modules/botserv/kick.h"
+#include "modules/chanserv/entrymsg.h"
+#include "modules/chanserv/mode.h"
+#include "modules/hostserv/request.h"
#include "modules/info.h"
-#include "modules/ns_cert.h"
-#include "modules/os_forbid.h"
-#include "modules/os_news.h"
-#include "modules/os_oper.h"
-#include "modules/os_session.h"
+#include "modules/nickserv/cert.h"
+#include "modules/operserv/forbid.h"
+#include "modules/operserv/news.h"
+#include "modules/operserv/oper.h"
+#include "modules/operserv/session.h"
#include "modules/set_misc.h"
#include "modules/suspend.h"
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index 611da4406..7f601068f 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -10,14 +10,14 @@
*/
#include "module.h"
-#include "modules/os_session.h"
-#include "modules/bs_kick.h"
-#include "modules/cs_mode.h"
-#include "modules/bs_badwords.h"
-#include "modules/os_news.h"
+#include "modules/botserv/badwords.h"
+#include "modules/botserv/kick.h"
+#include "modules/chanserv/entrymsg.h"
+#include "modules/chanserv/mode.h"
+#include "modules/operserv/forbid.h"
+#include "modules/operserv/news.h"
+#include "modules/operserv/session.h"
#include "modules/suspend.h"
-#include "modules/os_forbid.h"
-#include "modules/cs_entrymsg.h"
#define READ(x) \
if (true) \
diff --git a/modules/hostserv/hs_request.cpp b/modules/hostserv/hs_request.cpp
index a54184bd3..7b2da2425 100644
--- a/modules/hostserv/hs_request.cpp
+++ b/modules/hostserv/hs_request.cpp
@@ -15,7 +15,7 @@
*/
#include "module.h"
-#include "modules/hs_request.h"
+#include "modules/hostserv/request.h"
static ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
diff --git a/modules/nickserv/ns_cert.cpp b/modules/nickserv/ns_cert.cpp
index 15f6dbab8..856fc6b12 100644
--- a/modules/nickserv/ns_cert.cpp
+++ b/modules/nickserv/ns_cert.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
static Anope::unordered_map<NickCore *> certmap;
diff --git a/modules/nickserv/ns_group.cpp b/modules/nickserv/ns_group.cpp
index 69df8d16e..18521bf0c 100644
--- a/modules/nickserv/ns_group.cpp
+++ b/modules/nickserv/ns_group.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
diff --git a/modules/nickserv/ns_recover.cpp b/modules/nickserv/ns_recover.cpp
index 062eb1dfc..ef0d009ec 100644
--- a/modules/nickserv/ns_recover.cpp
+++ b/modules/nickserv/ns_recover.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
diff --git a/modules/nickserv/ns_sasl.cpp b/modules/nickserv/ns_sasl.cpp
index 58142466d..e001d01d7 100644
--- a/modules/nickserv/ns_sasl.cpp
+++ b/modules/nickserv/ns_sasl.cpp
@@ -7,8 +7,8 @@
*/
#include "module.h"
-#include "modules/sasl.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
+#include "modules/nickserv/sasl.h"
class Plain final
: public SASL::Mechanism
diff --git a/modules/operserv/os_defcon.cpp b/modules/operserv/os_defcon.cpp
index 5fd2d59bb..49ba77b0a 100644
--- a/modules/operserv/os_defcon.cpp
+++ b/modules/operserv/os_defcon.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/os_session.h"
+#include "modules/operserv/session.h"
enum DefconLevel
{
diff --git a/modules/operserv/os_forbid.cpp b/modules/operserv/os_forbid.cpp
index 892d58d0c..36bddb998 100644
--- a/modules/operserv/os_forbid.cpp
+++ b/modules/operserv/os_forbid.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/os_forbid.h"
+#include "modules/operserv/forbid.h"
static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
diff --git a/modules/operserv/os_ignore.cpp b/modules/operserv/os_ignore.cpp
index ec1dda883..e0c8eeb2c 100644
--- a/modules/operserv/os_ignore.cpp
+++ b/modules/operserv/os_ignore.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/os_ignore.h"
+#include "modules/operserv/ignore.h"
struct IgnoreDataImpl final
: IgnoreData
diff --git a/modules/operserv/os_news.cpp b/modules/operserv/os_news.cpp
index 33fa657ef..031e6f5d5 100644
--- a/modules/operserv/os_news.cpp
+++ b/modules/operserv/os_news.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/os_news.h"
+#include "modules/operserv/news.h"
// TODO: msgarray breaks the format string checking
#ifdef __GNUC__
diff --git a/modules/operserv/os_oper.cpp b/modules/operserv/os_oper.cpp
index 674de100a..3eab14b2a 100644
--- a/modules/operserv/os_oper.cpp
+++ b/modules/operserv/os_oper.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/os_oper.h"
+#include "modules/operserv/oper.h"
class CommandOSOper final
: public Command
diff --git a/modules/operserv/os_session.cpp b/modules/operserv/os_session.cpp
index 93ba17473..3d78340a7 100644
--- a/modules/operserv/os_session.cpp
+++ b/modules/operserv/os_session.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/os_session.h"
+#include "modules/operserv/session.h"
namespace
{
diff --git a/modules/operserv/os_stats.cpp b/modules/operserv/os_stats.cpp
index 4b9b2f875..14055971b 100644
--- a/modules/operserv/os_stats.cpp
+++ b/modules/operserv/os_stats.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/os_session.h"
+#include "modules/operserv/session.h"
struct Stats final
: Serializable
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 30ae296ff..71f5611fd 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
static Anope::string UplinkSID;
static bool UseSVSAccount = false; // Temporary backwards compatibility hack until old proto is deprecated
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp
index 56fae4ba9..e4811f428 100644
--- a/modules/protocol/inspircd.cpp
+++ b/modules/protocol/inspircd.cpp
@@ -10,11 +10,11 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
+#include "modules/chanserv/mode.h"
#include "modules/encryption.h"
#include "modules/httpd.h"
-#include "modules/ns_cert.h"
-#include "modules/sasl.h"
+#include "modules/nickserv/cert.h"
+#include "modules/nickserv/sasl.h"
typedef std::map<char, unsigned> ListLimits;
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 3570c45f7..0f2a1ef10 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -10,7 +10,7 @@
*/
#include "module.h"
-#include "modules/sasl.h"
+#include "modules/nickserv/sasl.h"
static Anope::string UplinkSID;
diff --git a/modules/protocol/solanum.cpp b/modules/protocol/solanum.cpp
index c56f95402..4a4789258 100644
--- a/modules/protocol/solanum.cpp
+++ b/modules/protocol/solanum.cpp
@@ -10,8 +10,8 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
-#include "modules/sasl.h"
+#include "modules/chanserv/mode.h"
+#include "modules/nickserv/sasl.h"
static Anope::string UplinkSID;
diff --git a/modules/protocol/unrealircd.cpp b/modules/protocol/unrealircd.cpp
index 083527d53..c90ed64fd 100644
--- a/modules/protocol/unrealircd.cpp
+++ b/modules/protocol/unrealircd.cpp
@@ -10,8 +10,8 @@
*/
#include "module.h"
-#include "modules/cs_mode.h"
-#include "modules/sasl.h"
+#include "modules/chanserv/mode.h"
+#include "modules/nickserv/sasl.h"
typedef Anope::map<Anope::string> ModData;
diff --git a/modules/webcpanel/pages/nickserv/cert.cpp b/modules/webcpanel/pages/nickserv/cert.cpp
index 51851e8d2..a95f8ec38 100644
--- a/modules/webcpanel/pages/nickserv/cert.cpp
+++ b/modules/webcpanel/pages/nickserv/cert.cpp
@@ -6,7 +6,7 @@
*/
#include "../../webcpanel.h"
-#include "modules/ns_cert.h"
+#include "modules/nickserv/cert.h"
WebCPanel::NickServ::Cert::Cert(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
{