Remove a few unneeded string copies in the PRIVMSG path

[user/henk/code/inspircd.git] / src / modules / m_taxonomy.cpp

diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index 516af20c3af0e2fbacbdd69a5c0c9d28dfef5252..6f06b36605558828af65c0b7f0468d25dbacedb8 100644 (file)
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -40,7 +40,7 @@ class CommandTaxonomy : public Command
                        for (unsigned int j = 0; j < list.size(); j++)
                        {
                                claimed = false;
-                               FOREACH_MOD(I_OnSyncUserMetaData, OnSyncUserMetaData(user, Creator, dest, list[j], true));
+                               FOREACH_MOD(I_OnSyncUserMetaData, OnSyncUserMetaData(dest, Creator, user, list[j], true));
                                if (!claimed)
                                {
                                        user->WriteNumeric(304, "" + std::string(user->nick) + ":TAXONOMY METADATA " + list[j] + " = <unknown>");
@@ -54,26 +54,21 @@ class CommandTaxonomy : public Command
 
 class ModuleTaxonomy : public Module
 {
-       CommandTaxonomy* newcommand;
+       CommandTaxonomy cmd;
        bool claimed;
  public:
        ModuleTaxonomy(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me, this, claimed)
        {
-
-               // Create a new command
-               newcommand = new CommandTaxonomy(ServerInstance, this, claimed);
-               ServerInstance->AddCommand(newcommand);
-               Implementation eventlist[] = { I_ProtoSendMetaData };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->AddCommand(&cmd);
        }
 
 
-       void ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata)
+       void ProtoSendMetaData(void* opaque, TargetTypeFlags target_type, void* target, const std::string &extname, const std::string &extdata)
        {
                if (target_type == TYPE_USER)
                {
-                       User* spoolto = (User*)target;
+                       User* spoolto = (User*)opaque;
                        std::string taxstr = "304 " + std::string(spoolto->nick) + ":TAXONOMY METADATA "+extname+" = "+extdata;
                        spoolto->WriteServ(taxstr);
                        claimed = true;
@@ -86,7 +81,7 @@ class ModuleTaxonomy : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };