I think this fixes visual studio oddities

[user/henk/code/inspircd.git] / include / commands / cmd_whowas.h

diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 1181b7ae891924e2403ed06cff16b40ca11035c1..e2bab7a0f610414c431e1e5de8d1a85442247f3a 100644 (file)
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -2,14 +2,14 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd is copyright (C) 2002-2007 ChatSpike-Dev.
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -23,16 +23,54 @@
 #include "users.h"
 #include "channels.h"
 
-class MaintainTimer;
+/* list of available internal commands */
+enum Internals
+{
+       WHOWAS_ADD = 1,
+       WHOWAS_STATS = 2,
+       WHOWAS_PRUNE = 3,
+       WHOWAS_MAINTAIN = 4
+};
+
+/* Forward ref for timer */
+class WhoWasMaintainTimer;
+
+/* Forward ref for typedefs */
+class WhoWasGroup;
 
 /** InspTimer that is used to maintain the whowas list, called once an hour
  */
-MaintainTimer* timer;
+extern WhoWasMaintainTimer* timer;
+
+/** A group of users related by nickname
+ */
+typedef std::deque<WhoWasGroup*> whowas_set;
+
+/** Sets of users in the whowas system
+ */
+typedef std::map<irc::string,whowas_set*> whowas_users;
+
+/** Sets of time and users in whowas list
+ */
+typedef std::deque<std::pair<time_t,irc::string> > whowas_users_fifo;
 
 /** Handle /WHOWAS
  */
 class cmd_whowas : public command_t
 {
+  private:
+       /** Whowas container, contains a map of vectors of users tracked by WHOWAS
+        */
+       whowas_users whowas;
+       
+       /** Whowas container, contains a map of time_t to users tracked by WHOWAS
+        */
+       whowas_users_fifo whowas_fifo;
+
+       /* String holding stats so it can be collected
+        */
+       std::string stats;
+
   public:
        cmd_whowas(InspIRCd* Instance);
        CmdResult Handle(const char** parameters, int pcnt, userrec *user);
@@ -40,17 +78,10 @@ class cmd_whowas : public command_t
        void AddToWhoWas(userrec* user);
        void GetStats(Extensible* ext);
        void PruneWhoWas(time_t t);
+       void MaintainWhoWas(time_t t);
        virtual ~cmd_whowas();
 };
 
-enum Internals
-{
-       WHOWAS_ADD = 1,
-       WHOWAS_STATS = 2,
-       WHOWAS_PRUNE = 3
-};
-
-
 /** Used to hold WHOWAS information
  */
 class WhoWasGroup : public classbase
@@ -83,40 +114,16 @@ class WhoWasGroup : public classbase
        ~WhoWasGroup();
 };
 
-class MaintainTimer : public InspTimer
+class WhoWasMaintainTimer : public InspTimer
 {
   private:
        InspIRCd* ServerInstance;
   public:
-       MaintainTimer(InspIRCd* Instance, long interval)
-       : InspTimer(interval, Instance->Time()), ServerInstance(Instance)
+       WhoWasMaintainTimer(InspIRCd* Instance, long interval)
+       : InspTimer(interval, Instance->Time(), true), ServerInstance(Instance)
        {
        }
        virtual void Tick(time_t TIME);
 };
 
-/** A group of users related by nickname
- */
-typedef std::deque<WhoWasGroup*> whowas_set;
-
-/** Sets of users in the whowas system
- */
-typedef std::map<irc::string,whowas_set*> whowas_users;
-
-/** Sets of time and users in whowas list
- */
-typedef std::deque<std::pair<time_t,irc::string> > whowas_users_fifo;
-
-/** Called every hour by the core to remove expired entries
- */
-void MaintainWhoWas(InspIRCd* ServerInstance, time_t TIME);
-
-/** Whowas container, contains a map of vectors of users tracked by WHOWAS
- */
-whowas_users whowas;
-
-/** Whowas container, contains a map of time_t to users tracked by WHOWAS
- */
-whowas_users_fifo whowas_fifo;
-
 #endif