Merge pull request #237 from SaberUK/insp20-fix-windows-build

[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 e4fc695330c2ea6084c69968c23f6a30cdd56b25..d333541228903ae722d7d58d9f9928093bd10053 100644 (file)
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -1,18 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *      the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CMD_WHOWAS_H__
-#define __CMD_WHOWAS_H__
+
+#ifndef CMD_WHOWAS_H
+#define CMD_WHOWAS_H
 #include "modules.h"
 
 struct WhowasRequest : public Request
@@ -72,12 +80,8 @@ class CommandWhowas : public Command
         */
        whowas_users_fifo whowas_fifo;
 
-       /* String holding stats so it can be collected
-        */
-       std::string stats;
-
   public:
-       CommandWhowas(InspIRCd* Instance, Module* parent);
+       CommandWhowas(Module* parent);
        /** Handle command.
         * @param parameters The parameters to the comamnd
         * @param pcnt The number of parameters passed to teh command
@@ -94,7 +98,7 @@ class CommandWhowas : public Command
 
 /** Used to hold WHOWAS information
  */
-class WhoWasGroup : public classbase
+class WhoWasGroup
 {
  public:
        /** Real host
@@ -108,7 +112,7 @@ class WhoWasGroup : public classbase
        std::string ident;
        /** Server name
         */
-       const char* server;
+       std::string server;
        /** Fullname (GECOS)
         */
        std::string gecos;
@@ -116,7 +120,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 +130,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);