Move whowas stuff into its own namespace, move more stuff into userrec

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4795 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 27 insertions, 18 deletions

diff --git a/include/users.h b/include/users.h
index 983ae193e..a01b0f28b 100644
--- a/include/users.h
+++ b/include/users.h
@@ -447,10 +447,12 @@ class userrec : public connection
 	userrec* UpdateNickHash(const char* New);
 	bool ForceNickChange(const char* newnick);
 
+	static void AddClient(int socket, int port, bool iscached, insp_inaddr ip);
+
 	void UnOper();
 
-long GlobalCloneCount();
-long LocalCloneCount();
+	long GlobalCloneCount();
+	long LocalCloneCount();
 
 	/** Default destructor
 	 */
@@ -459,26 +461,33 @@ long LocalCloneCount();
 
 /** Used to hold WHOWAS information
  */
-class WhoWasGroup : public classbase
+
+namespace irc
 {
- public:
-	char* host;
-	char* dhost;
-	char* ident;
-	const char* server;
-	char* gecos;
-	time_t signon;
+	namespace whowas
+	{
 
-	WhoWasGroup(userrec* user);
-	~WhoWasGroup();
+		class WhoWasGroup : public classbase
+		{
+		 public:
+			char* host;
+			char* dhost;
+			char* ident;
+			const char* server;
+			char* gecos;
+			time_t signon;
+	
+			WhoWasGroup(userrec* user);
+			~WhoWasGroup();
+		};
+	
+		typedef std::deque<WhoWasGroup*> whowas_set;
+		typedef std::map<irc::string,whowas_set*> whowas_users;
+	
+		void MaintainWhoWas(time_t TIME);
+	};
 };
 
-typedef std::deque<WhoWasGroup*> whowas_set;
-typedef std::map<irc::string,whowas_set*> whowas_users;
-
-void MaintainWhoWas(time_t TIME);
-void AddClient(int socket, int port, bool iscached, insp_inaddr ip4);
-
 /* Configuration callbacks */
 bool InitTypes(const char* tag);
 bool InitClasses(const char* tag);