Move typedef ClassVector to ServerConfig::ClassVector

diff --git a/include/configreader.h b/include/configreader.h
index f3b1f8b741dc27ba58aea1591c832dd72a5b787a..8615388d521c832aa08cf3b129dd844cb738f6d5 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -227,6 +227,10 @@ class CoreExport ServerConfig
                std::string PrependModule(const std::string& fn) const { return FileSystem::ExpandPath(Module, fn); }
        };
 
+       /** Holds a complete list of all connect blocks
+        */
+       typedef std::vector<reference<ConnectClass> > ClassVector;
+
        /** Get a configuration tag
         * @param tag The name of the tag to get
         */

diff --git a/include/typedefs.h b/include/typedefs.h
index bd236dc62fe1f447a0092797cf867aac8b4e380a..85d86504f032af6d0a8fcd275e6e54da57006cbf 100644 (file)
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -61,10 +61,6 @@ typedef intrusive_list<LocalUser> LocalUserList;
 /** A list of failed port bindings, used for informational purposes on startup */
 typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
 
-/** Holds a complete list of all allow and deny tags from the configuration file (connection classes)
- */
-typedef std::vector<reference<ConnectClass> > ClassVector;
-
 /** List of channels to consider when building the neighbor list of a user
  */
 typedef std::vector<Membership*> IncludeChanList;

diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index e28b3d1eff6009bcb5b04def5f256d7ff1f044df..f9cd78ddda59a2249c058a171585c795c7790202 100644 (file)
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -103,7 +103,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 
                case 'i':
                {
-                       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+                       for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); ++i)
                        {
                                ConnectClass* c = *i;
                                std::stringstream res;
@@ -132,7 +132,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
                case 'Y':
                {
                        int idx = 0;
-                       for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+                       for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
                        {
                                ConnectClass* c = *i;
                                results.push_back("215 "+user->nick+" i NOMATCH * "+c->GetHost()+" "+ConvToStr(c->limit ? c->limit : SocketEngine::GetMaxFds())+" "+ConvToStr(idx)+" "+ServerInstance->Config->ServerName+" *");

diff --git a/src/users.cpp b/src/users.cpp
index c2b8852d8f4f6bed0da558d1c6516d1aef6533ce..246efd7cf868f85f12e806b6bb0ab3bcd0eb706f 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1078,7 +1078,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
 
        if (!explicit_name.empty())
        {
-               for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+               for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); ++i)
                {
                        ConnectClass* c = *i;
 
@@ -1091,7 +1091,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
        }
        else
        {
-               for (ClassVector::iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); i++)
+               for (ServerConfig::ClassVector::const_iterator i = ServerInstance->Config->Classes.begin(); i != ServerInstance->Config->Classes.end(); ++i)
                {
                        ConnectClass* c = *i;
                        ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "Checking %s", c->GetName().c_str());