Made service_reference type safe

7 files changed, 6 insertions, 16 deletions

diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp
index c7ccf9209..7bc002fc0 100644
--- a/modules/pseudoclients/global.cpp
+++ b/modules/pseudoclients/global.cpp
@@ -57,8 +57,6 @@ class GlobalCore : public Module
 		if (Global == NULL)
 			throw ModuleException("No bot named " + Config->Global);
 
-		ModuleManager::RegisterService(&this->myglobalservice);
-
 		Implementation i[] = { I_OnRestart, I_OnShutdown, I_OnNewServer, I_OnPreHelp };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
diff --git a/modules/pseudoclients/global.h b/modules/pseudoclients/global.h
index 454e879c2..364834e73 100644
--- a/modules/pseudoclients/global.h
+++ b/modules/pseudoclients/global.h
@@ -1,10 +1,10 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-class GlobalService : public Service
+class GlobalService : public Service<GlobalService>
 {
  public:
-	GlobalService(Module *m) : Service(m, "Global") { }
+	GlobalService(Module *m) : Service<GlobalService>(m, "Global") { }
 
 	/** Send out a global message to all users
 	 * @param sender Our client which should send the global
diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp
index eb8af114f..987dec16b 100644
--- a/modules/pseudoclients/memoserv.cpp
+++ b/modules/pseudoclients/memoserv.cpp
@@ -172,8 +172,6 @@ class MemoServCore : public Module
 
 		Implementation i[] = { I_OnNickIdentify, I_OnJoinChannel, I_OnUserAway, I_OnNickUpdate, I_OnPreHelp, I_OnPostHelp };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
-
-		ModuleManager::RegisterService(&this->mymemoserv);
 	}
 
 	void OnNickIdentify(User *u)
diff --git a/modules/pseudoclients/memoserv.h b/modules/pseudoclients/memoserv.h
index 0bf0c79ca..ab608326a 100644
--- a/modules/pseudoclients/memoserv.h
+++ b/modules/pseudoclients/memoserv.h
@@ -1,7 +1,7 @@
 #ifndef MEMOSERV_H
 #define MEMOSERV_H
 
-class MemoServService : public Service
+class MemoServService : public Service<MemoServService>
 {
  public:
 	enum MemoResult
@@ -12,7 +12,7 @@ class MemoServService : public Service
 		MEMO_TARGET_FULL
 	};
 
-	MemoServService(Module *m) : Service(m, "MemoServ") { }
+	MemoServService(Module *m) : Service<MemoServService>(m, "MemoServ") { }
 
 	/** Retrieve the memo info for a nick or channel
 	 * @param target Target
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index c31590881..14067b712 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -149,8 +149,6 @@ class NickServCore : public Module
 		Implementation i[] = { I_OnDelNick, I_OnDelCore, I_OnChangeCoreDisplay, I_OnNickIdentify, I_OnNickGroup,
 		I_OnNickUpdate, I_OnUserNickChange, I_OnPreHelp, I_OnPostHelp };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
-
-		ModuleManager::RegisterService(&this->mynickserv);
 	}
 
 	void OnDelNick(NickAlias *na)
diff --git a/modules/pseudoclients/nickserv.h b/modules/pseudoclients/nickserv.h
index b58dbd65f..1619fac2d 100644
--- a/modules/pseudoclients/nickserv.h
+++ b/modules/pseudoclients/nickserv.h
@@ -1,10 +1,10 @@
 #ifndef NICKSERV_H
 #define NICKSERV_H
 
-class NickServService : public Service
+class NickServService : public Service<NickServService>
 {
  public:
-	NickServService(Module *m) : Service(m, "NickServ") { }
+	NickServService(Module *m) : Service<NickServService>(m, "NickServ") { }
 
 	virtual void Validate(User *u) = 0;
 };
diff --git a/modules/pseudoclients/operserv.cpp b/modules/pseudoclients/operserv.cpp
index 9bc830335..2cf4d2a28 100644
--- a/modules/pseudoclients/operserv.cpp
+++ b/modules/pseudoclients/operserv.cpp
@@ -269,10 +269,6 @@ class OperServCore : public Module
 		Implementation i[] = { I_OnBotPrivmsg, I_OnServerQuit, I_OnUserModeSet, I_OnUserModeUnset, I_OnUserConnect, I_OnUserNickChange, I_OnPreHelp };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
-		ModuleManager::RegisterService(&sglines);
-		ModuleManager::RegisterService(&sqlines);
-		ModuleManager::RegisterService(&snlines);
-		
 		/* Yes, these are in this order for a reason. Most violent->least violent. */
 		XLineManager::RegisterXLineManager(&sglines);
 		XLineManager::RegisterXLineManager(&sqlines);