Move service types to their own namespace.

- ServiceProvider is now Service::Provider

- DataProvider is now Service::SimpleProvider (the old name does
  not really make sense now we don't have SERVICE_DATA and the
  only difference is automatic registration.

- Some members of ModuleManager have been elevated to the Service
  namespace in case other code wants to use them.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 91ab3fce7..add98cc98 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -57,7 +57,7 @@ bool ModuleManager::Load(const std::string& modname, bool defer)
 
 	ModulePtr newmod;
 	auto* newhandle = new DLLManager(moduleFile);
-	ServiceList newservices;
+	Service::List newservices;
 	if (!defer)
 		this->NewServices = &newservices;
 
@@ -125,7 +125,7 @@ bool ModuleManager::Load(const std::string& modname, bool defer)
 }
 
 /* We must load the modules AFTER initializing the socket engine, now */
-void ModuleManager::LoadCoreModules(std::map<std::string, ServiceList>& servicemap)
+void ModuleManager::LoadCoreModules(std::map<std::string, Service::List>& servicemap)
 {
 	fmt::print("Loading core modules ");
 	fflush(stdout);