diff options
| -rw-r--r-- | include/modules.h | 10 | ||||
| -rw-r--r-- | src/modules.cpp | 10 | ||||
| -rw-r--r-- | src/modules/m_spanningtree.cpp | 6 |
3 files changed, 3 insertions, 23 deletions
diff --git a/include/modules.h b/include/modules.h index fca1bc128..49695b63c 100644 --- a/include/modules.h +++ b/include/modules.h @@ -1272,12 +1272,6 @@ class Server : public Extensible */ virtual ~Server(); - /** Obtains a pointer to the server's ServerConfig object. - * The ServerConfig object contains most of the configuration data - * of the IRC server, as read from the config file by the core. - */ - ServerConfig* GetConfig(); - /** For use with Module::Prioritize(). * When the return value of this function is returned from * Module::Prioritize(), this specifies that the module wishes @@ -1298,10 +1292,6 @@ class Server : public Extensible */ long PriorityAfter(const std::string &modulename); - /** Returns the version string of this server - */ - std::string GetVersion(); - /** Publish a 'feature'. * There are two ways for a module to find another module it depends on. * Either by name, using Server::FindModule, or by feature, using this diff --git a/src/modules.cpp b/src/modules.cpp index da4a7e152..ef0136a8e 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -330,16 +330,6 @@ void Server::RehashServer() ServerInstance->Config->Read(false,NULL); } -ServerConfig* Server::GetConfig() -{ - return ServerInstance->Config; -} - -std::string Server::GetVersion() -{ - return ServerInstance->GetVersionString(); -} - void Server::DelSocket(InspSocket* sock) { for (std::vector<InspSocket*>::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++) diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 21209ab6a..3cee35deb 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -228,7 +228,7 @@ class TreeServer : public classbase ServerDesc = ""; VersionString = ""; UserCount = OperCount = 0; - VersionString = Srv->GetVersion(); + VersionString = ServerInstance->GetVersionString(); } /* We use this constructor only to create the 'root' item, TreeRoot, which @@ -240,7 +240,7 @@ class TreeServer : public classbase Parent = NULL; VersionString = ""; UserCount = OperCount = 0; - VersionString = Srv->GetVersion(); + VersionString = ServerInstance->GetVersionString(); Route = NULL; Socket = NULL; /* Fix by brain */ AddHashEntry(); @@ -1817,7 +1817,7 @@ class TreeSocket : public InspSocket ServerInstance->WriteOpers("*** Bursting to \2"+name+"\2."); this->WriteLine(burst); /* send our version string */ - this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion()); + this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+this->Instance->GetVersionString()); /* Send server tree */ this->SendServers(TreeRoot,s,1); /* Send users and their oper status */ |