summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/command_parse.h2
-rw-r--r--include/modules.h2
-rw-r--r--src/command_parse.cpp2
-rw-r--r--src/modules.cpp2
-rw-r--r--src/modules/m_spanningtree/main.cpp2
-rw-r--r--src/modules/m_spanningtree/postcommand.cpp2
-rw-r--r--win/inspircdVC80.vcproj2
7 files changed, 7 insertions, 7 deletions
diff --git a/include/command_parse.h b/include/command_parse.h
index f0d1990dc..f1d9d1b1c 100644
--- 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 TranslateUIDsOnce(TranslateType to, const std::string &source, std::string &dest);
+ int TranslateUIDs(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 7239d7a9b..2f0f48b00 100644
--- 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 SetModulePriority(Module* mod, Priority s);
+ bool SetPriority(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 2d3d87b2e..94a4a55fe 100644
--- 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::TranslateUIDsOnce(TranslateType to, const std::string &source, std::string &dest)
+int CommandParser::TranslateUIDs(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 29d4b5555..6ea939e50 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -238,7 +238,7 @@ void ModuleManager::DetachAll(Module* mod)
Detach((Implementation)n, mod);
}
-bool ModuleManager::SetModulePriority(Module* mod, Priority s)
+bool ModuleManager::SetPriority(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 836fb3185..b38929ad0 100644
--- 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->SetModulePriority(this, PRIORITY_LAST);
+ ServerInstance->Modules->SetPriority(this, PRIORITY_LAST);
}
MODULE_INIT(ModuleSpanningTree)
diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 76ece27f9..d05d42d80 100644
--- 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->TranslateUIDsOnce(translate_to, parameters[j], target);
+ ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
}
if (j == (parameters.size() - 1))
diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj
index 31b2f679b..fc3104185 100644
--- a/win/inspircdVC80.vcproj
+++ b/win/inspircdVC80.vcproj
@@ -3947,7 +3947,7 @@
RelativePath="..\src\modules\m_nationalchars.cpp"
>
<FileConfiguration
- Name="Site Release|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool