Fixed service_reference to work correctly with external classes

4 files changed, 9 insertions, 72 deletions

diff --git a/modules/pseudoclients/botserv.h b/modules/pseudoclients/botserv.h
deleted file mode 100644
index 5fa03f870..000000000
--- a/modules/pseudoclients/botserv.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef BOTSERV_H
-#define BOTSERV_H
-
-struct UserData
-{
-	UserData()
-	{
-		this->Clear();
-	}
-
-	void Clear()
-	{
-		last_use = last_start = Anope::CurTime;
-		lines = times = 0;
-		lastline.clear();
-	}
-
-	/* Data validity */
-	time_t last_use;
-
-	/* for flood kicker */
-	int16 lines;
-	time_t last_start;
-
-	/* for repeat kicker */
-	Anope::string lastline;
-	Anope::string lasttarget;
-	int16 times;
-};
-
-struct BanData
-{
-	Anope::string mask;
-	time_t last_use;
-	int16 ttb[TTB_SIZE];
-
-	BanData()
-	{
-		this->Clear();
-	}
-
-	void Clear()
-	{
-		last_use = 0;
-		for (int i = 0; i < TTB_SIZE; ++i)
-			this->ttb[i] = 0;
-	}
-};
-
-class BotServService : public Service
-{
- public:
-	BotServService(Module *m) : Service(m, "BotServ") { }
-
-	virtual UserData *GetUserData(User *u, Channel *c) = 0;
-
-	virtual BanData *GetBanData(User *u, Channel *c) = 0;
-};
-
-static service_reference<BotServService> botserv("BotServ");
-
-#endif // BOTSERV_H
-
diff --git a/modules/pseudoclients/global.h b/modules/pseudoclients/global.h
index 364834e73..440ca1d8b 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<GlobalService>
+class GlobalService : public Service<Base>
 {
  public:
-	GlobalService(Module *m) : Service<GlobalService>(m, "Global") { }
+	GlobalService(Module *m) : Service<Base>(m, "Global") { }
 
 	/** Send out a global message to all users
 	 * @param sender Our client which should send the global
@@ -14,7 +14,7 @@ class GlobalService : public Service<GlobalService>
 	virtual void SendGlobal(BotInfo *sender, const Anope::string &source, const Anope::string &message) = 0;
 };
 
-static service_reference<GlobalService> global("Global");
+static service_reference<GlobalService, Base> global("Global");
 
 #endif // GLOBAL_H
 
diff --git a/modules/pseudoclients/memoserv.h b/modules/pseudoclients/memoserv.h
index ab608326a..0cc88c9f0 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<MemoServService>
+class MemoServService : public Service<Base>
 {
  public:
 	enum MemoResult
@@ -12,7 +12,7 @@ class MemoServService : public Service<MemoServService>
 		MEMO_TARGET_FULL
 	};
 
-	MemoServService(Module *m) : Service<MemoServService>(m, "MemoServ") { }
+	MemoServService(Module *m) : Service<Base>(m, "MemoServ") { }
 
 	/** Retrieve the memo info for a nick or channel
 	 * @param target Target
@@ -35,7 +35,7 @@ class MemoServService : public Service<MemoServService>
 	virtual void Check(User *u) = 0;
 };
 
-static service_reference<MemoServService> memoserv("MemoServ");
+static service_reference<MemoServService, Base> memoserv("MemoServ");
 
 #endif // MEMOSERV_H
 
diff --git a/modules/pseudoclients/nickserv.h b/modules/pseudoclients/nickserv.h
index 1619fac2d..dcca4164b 100644
--- a/modules/pseudoclients/nickserv.h
+++ b/modules/pseudoclients/nickserv.h
@@ -1,15 +1,15 @@
 #ifndef NICKSERV_H
 #define NICKSERV_H
 
-class NickServService : public Service<NickServService>
+class NickServService : public Service<Base>
 {
  public:
-	NickServService(Module *m) : Service<NickServService>(m, "NickServ") { }
+	NickServService(Module *m) : Service<Base>(m, "NickServ") { }
 
 	virtual void Validate(User *u) = 0;
 };
 
-static service_reference<NickServService> nickserv("NickServ");
+static service_reference<NickServService, Base> nickserv("NickServ");
 
 #endif // NICKSERV_H