Heres the beef so far

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11326 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/command_parse.h b/include/command_parse.h
index f1d9d1b1c7b3e7e9cd11cc839aba61babeb2cba0..f0d1990dc50eaa347d55e7de8200fe2bf4609a43 100644 (file)
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -201,7 +201,7 @@ class CoreExport CommandParser : public classbase
         * @param dest The output string, it is safe to pass source and dest as the same variable only for translation type TR_TEXT.
         * @return returns the number of substitutions made. Will always be 0 or 1 for TR_TEXT and 0..n for other types.
         */
-       int TranslateUIDs(TranslateType to, const std::string &source, std::string &dest);
+       int TranslateUIDsOnce(TranslateType to, const std::string &source, std::string &dest);
 
        int TranslateUIDs(const std::deque<TranslateType> to, const std::deque<std::string> &source, std::string &dest);
 };

diff --git a/include/modules.h b/include/modules.h
index 2f0f48b00cd09cae2c8afe58b93324b07583c075..7239d7a9b7b176419a7ed90625d9e4b2ca1081bd 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -1703,7 +1703,7 @@ class CoreExport ModuleManager : public classbase
         * SetPriority method for this, where you may specify other modules to
         * be prioritized against.
         */
-       bool SetPriority(Module* mod, Priority s);
+       bool SetModulePriority(Module* mod, Priority s);
 
        /** Attach an event to a module.
         * You may later detatch the event with ModuleManager::Detach().

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 94a4a55fe741937f1927e431db566f44d58490cf..2d3d87b2eb4509c2dcadd18aaca0435b5b56f49c 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -650,7 +650,7 @@ int CommandParser::TranslateUIDs(const std::deque<TranslateType> to, const std::
        return translations;
 }
 
-int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
+int CommandParser::TranslateUIDsOnce(TranslateType to, const std::string &source, std::string &dest)
 {
        User* user = NULL;
        std::string item;

diff --git a/src/modules.cpp b/src/modules.cpp
index 6ea939e50180f90a4aa4105dd52907f860037946..29d4b555512b18c1c508a28aeac2055f3273893d 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -238,7 +238,7 @@ void ModuleManager::DetachAll(Module* mod)
                Detach((Implementation)n, mod);
 }
 
-bool ModuleManager::SetPriority(Module* mod, Priority s)
+bool ModuleManager::SetModulePriority(Module* mod, Priority s)
 {
        for (size_t n = I_BEGIN + 1; n != I_END; ++n)
                SetPriority(mod, (Implementation)n, s);

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index b38929ad00b2b6a935aa5f80c36964cf7c0fdf0e..836fb31858963cb7e4ee9f0d57d5d7d284b17b52 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -946,7 +946,7 @@ Version ModuleSpanningTree::GetVersion()
  */
 void ModuleSpanningTree::Prioritize()
 {
-       ServerInstance->Modules->SetPriority(this, PRIORITY_LAST);
+       ServerInstance->Modules->SetModulePriority(this, PRIORITY_LAST);
 }
 
 MODULE_INIT(ModuleSpanningTree)

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index d05d42d802aa9db2edf6c450de17e286a12f3370..76ece27f90a70b1fc178a89ce8a6985ff1b8aa29 100644 (file)
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -68,7 +68,7 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
                        }
                        else
                        {
-                               ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
+                               ServerInstance->Parser->TranslateUIDsOnce(translate_to, parameters[j], target);
                        }
 
                        if (j == (parameters.size() - 1))

diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index fc31041857768b24640313b40b28c1be6a97d3c1..31b2f679bf05c5e408732300c9cc6d03b54bf802 100644 (file)
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -3947,7 +3947,7 @@
                                RelativePath="..\src\modules\m_nationalchars.cpp"\r
                                >\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Site Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                        >\r
                                        <Tool\r