Move nick change code out of cmd_nick; fixes double-invocation of hooks and may elimi...

[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 5109ab54a3cab207a04bf6714d2b2ae2b3114550..19b7b74fdd7a26ecc012d24608f3f3ba3aef1ce7 100644 (file)
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -72,10 +72,6 @@ class CommandWhowas : public Command
         */
        whowas_users_fifo whowas_fifo;
 
-       /* String holding stats so it can be collected
-        */
-       std::string stats;
-
   public:
        CommandWhowas(Module* parent);
        /** Handle command.
@@ -94,7 +90,7 @@ class CommandWhowas : public Command
 
 /** Used to hold WHOWAS information
  */
-class WhoWasGroup : public classbase
+class WhoWasGroup
 {
  public:
        /** Real host
@@ -108,7 +104,7 @@ class WhoWasGroup : public classbase
        std::string ident;
        /** Server name
         */
-       const char* server;
+       std::string server;
        /** Fullname (GECOS)
         */
        std::string gecos;
@@ -116,7 +112,7 @@ class WhoWasGroup : public classbase
         */
        time_t signon;
 
-       /** Initialize this WhoQasFroup with a user
+       /** Initialize this WhoWasFroup with a user
         */
        WhoWasGroup(User* user);
        /** Destructor
@@ -126,11 +122,9 @@ class WhoWasGroup : public classbase
 
 class WhoWasMaintainTimer : public Timer
 {
-  private:
-       InspIRCd* ServerInstance;
   public:
-       WhoWasMaintainTimer(InspIRCd* Instance, long interval)
-       : Timer(interval, Instance->Time(), true), ServerInstance(Instance)
+       WhoWasMaintainTimer(long interval)
+       : Timer(interval, ServerInstance->Time(), true)
        {
        }
        virtual void Tick(time_t TIME);