From 3075cc7bd0aa6db5752e76183c267d091584705f Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 3 Nov 2020 22:30:58 +0000 Subject: Move config typedefs to ServerConfig and use auto in more places. --- src/modules/extra/m_ssl_gnutls.cpp | 2 +- src/modules/extra/m_ssl_mbedtls.cpp | 2 +- src/modules/extra/m_ssl_openssl.cpp | 2 +- src/modules/m_cloaking.cpp | 2 +- src/modules/m_helpop.cpp | 2 +- src/modules/m_websocket.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/modules') diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 2f509bf9e..2190def6c 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1125,7 +1125,7 @@ class ModuleSSLGnuTLS : public Module // avoiding unpleasant situations where no new TLS (SSL) connections are possible. ProfileList newprofiles; - ConfigTagList tags = ServerInstance->Config->ConfTags("sslprofile"); + auto tags = ServerInstance->Config->ConfTags("sslprofile"); if (tags.empty()) throw ModuleException("You have not specified any tags that are usable by this module!"); diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 10107e2f9..4a95329fa 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -858,7 +858,7 @@ class ModuleSSLmbedTLS : public Module // avoiding unpleasant situations where no new TLS (SSL) connections are possible. ProfileList newprofiles; - ConfigTagList tags = ServerInstance->Config->ConfTags("sslprofile"); + auto tags = ServerInstance->Config->ConfTags("sslprofile"); if (tags.empty()) throw ModuleException("You have not specified any tags that are usable by this module!"); diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 199fe4189..a8c09eec3 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -905,7 +905,7 @@ class ModuleSSLOpenSSL : public Module void ReadProfiles() { ProfileList newprofiles; - ConfigTagList tags = ServerInstance->Config->ConfTags("sslprofile"); + auto tags = ServerInstance->Config->ConfTags("sslprofile"); if (tags.empty()) throw ModuleException("You have not specified any tags that are usable by this module!"); diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index fad072489..4cf366ebd 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -426,7 +426,7 @@ class ModuleCloaking : public Module void ReadConfig(ConfigStatus& status) override { - ConfigTagList tags = ServerInstance->Config->ConfTags("cloak"); + auto tags = ServerInstance->Config->ConfTags("cloak"); if (tags.empty()) throw ModuleException("You have loaded the cloaking module but not configured any tags!"); diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp index c91534f7a..dff2803ea 100644 --- a/src/modules/m_helpop.cpp +++ b/src/modules/m_helpop.cpp @@ -115,7 +115,7 @@ class ModuleHelpop size_t longestkey = 0; HelpMap newhelp; - ConfigTagList tags = ServerInstance->Config->ConfTags("helpop"); + auto tags = ServerInstance->Config->ConfTags("helpop"); if (tags.empty()) throw ModuleException("You have loaded the helpop module but not configured any help topics!"); diff --git a/src/modules/m_websocket.cpp b/src/modules/m_websocket.cpp index 556329be7..bfbd8e871 100644 --- a/src/modules/m_websocket.cpp +++ b/src/modules/m_websocket.cpp @@ -510,7 +510,7 @@ class ModuleWebSocket : public Module void ReadConfig(ConfigStatus& status) override { - ConfigTagList tags = ServerInstance->Config->ConfTags("wsorigin"); + auto tags = ServerInstance->Config->ConfTags("wsorigin"); if (tags.empty()) throw ModuleException("You have loaded the websocket module but not configured any allowed origins!"); -- cgit v1.3.1-10-gc9f91