InspSocket -> BufferedSocket. Paves the way for a SimpleSocket class which ident...

[user/henk/code/inspircd.git] / include / ctables.h

diff --git a/include/ctables.h b/include/ctables.h
index a1f05a3a8ab4ab26a98751b82967067943f6b54f..0c2802baa982120349e4285016dd7b1b31557dcf 100644 (file)
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -20,7 +20,7 @@
 #include "base.h"
 
 /* Forward declarations - required */
-class userrec;
+class User;
 class InspIRCd;
 
 /** Used to indicate command success codes
@@ -52,9 +52,9 @@ enum TranslateType
 
 
 /** A structure that defines a command. Every command available
- * in InspIRCd must be defined as derived from command_t.
+ * in InspIRCd must be defined as derived from Command.
  */
-class CoreExport command_t : public Extensible
+class CoreExport Command : public Extensible
 {
  protected:
        /** Owner/Creator object
@@ -72,10 +72,10 @@ class CoreExport command_t : public Extensible
        int min_params;
        /** used by /stats m
         */
-       long use_count;
+       long double use_count;
        /** used by /stats m
         */
-       float total_bytes;
+       long double total_bytes;
        /** used for resource tracking between modules
         */
        std::string source;
@@ -102,13 +102,13 @@ class CoreExport command_t : public Extensible
         * be allowed before the user is 'registered' (has sent USER,
         * NICK, optionally PASS, and been resolved).
         */
-       command_t(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg)
+       Command(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg)
        {
                use_count = 0;
                total_bytes = 0;
                source = "<core>";
                syntax = "";
-               translation.push_back(TR_END);
+               translation.clear();
        }
 
        /** Handle the command from a user.
@@ -119,7 +119,7 @@ class CoreExport command_t : public Extensible
         * If the command succeeds but should remain local to this server,
         * return CMD_LOCALONLY.
         */
-       virtual CmdResult Handle(const char** parameters, int pcnt, userrec* user) = 0;
+       virtual CmdResult Handle(const char** parameters, int pcnt, User* user) = 0;
 
        /** Handle an internal request from another command, the core, or a module
         * @param Command ID
@@ -173,12 +173,25 @@ class CoreExport command_t : public Extensible
 
        /** Standard constructor gubbins
         */
-       virtual ~command_t() {}
+       virtual ~Command() {}
 };
 
 /** A hash of commands used by the core
  */
-typedef nspace::hash_map<std::string,command_t*> command_table;
+typedef nspace::hash_map<std::string,Command*> Commandable;
+
+#define TRANSLATE1(x1) translation.push_back(x1);
+#define TRANSLATE2(x1,x2)  translation.push_back(x1);translation.push_back(x2);
+#define TRANSLATE3(x1,x2,x3)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);
+#define TRANSLATE4(x1,x2,x3,x4)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);
+#define TRANSLATE5(x1,x2,x3,x4,x5)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
+       translation.push_back(x5);
+#define TRANSLATE6(x1,x2,x3,x4,x5,x6)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
+       translation.push_back(x5);translation.push_back(x6);
+#define TRANSLATE7(x1,x2,x3,x4,x5,x6,x7)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
+       translation.push_back(x5);translation.push_back(x6);translation.push_back(x7);
+#define TRANSLATE8(x1,x2,x3,x4,x5,x6,x7,x8)  translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\
+       translation.push_back(x5);translation.push_back(x6);translation.push_back(x7);translation.push_back(x8);
 
 #endif