Make various self contained methods static.

- InspIRCd::IsValidMask
- InspIRCd::TimeString

6 files changed, 6 insertions, 6 deletions

diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp
index 67f67e9f0..8025ba15a 100644
--- a/src/commands/cmd_eline.cpp
+++ b/src/commands/cmd_eline.cpp
@@ -80,7 +80,7 @@ CmdResult CommandEline::Handle (const std::vector<std::string>& parameters, User
 			else
 			{
 				time_t c_requires_crap = duration + ServerInstance->Time();
-				std::string timestr = ServerInstance->TimeString(c_requires_crap);
+				std::string timestr = InspIRCd::TimeString(c_requires_crap);
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
 						timestr.c_str(), parameters[2].c_str());
 			}
diff --git a/src/commands/cmd_gline.cpp b/src/commands/cmd_gline.cpp
index bdb5c26b2..bc81172d3 100644
--- a/src/commands/cmd_gline.cpp
+++ b/src/commands/cmd_gline.cpp
@@ -87,7 +87,7 @@ CmdResult CommandGline::Handle (const std::vector<std::string>& parameters, User
 			else
 			{
 				time_t c_requires_crap = duration + ServerInstance->Time();
-				std::string timestr = ServerInstance->TimeString(c_requires_crap);
+				std::string timestr = InspIRCd::TimeString(c_requires_crap);
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
 						timestr.c_str(), parameters[2].c_str());
 			}
diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp
index 20afae2a9..e95a7ca66 100644
--- a/src/commands/cmd_kline.cpp
+++ b/src/commands/cmd_kline.cpp
@@ -87,7 +87,7 @@ CmdResult CommandKline::Handle (const std::vector<std::string>& parameters, User
 			else
 			{
 				time_t c_requires_crap = duration + ServerInstance->Time();
-				std::string timestr = ServerInstance->TimeString(c_requires_crap);
+				std::string timestr = InspIRCd::TimeString(c_requires_crap);
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires on %s: %s",user->nick.c_str(),target.c_str(),
 						timestr.c_str(), parameters[2].c_str());
 			}
diff --git a/src/commands/cmd_qline.cpp b/src/commands/cmd_qline.cpp
index bfc9e4519..06b0e74f1 100644
--- a/src/commands/cmd_qline.cpp
+++ b/src/commands/cmd_qline.cpp
@@ -63,7 +63,7 @@ CmdResult CommandQline::Handle (const std::vector<std::string>& parameters, User
 			else
 			{
 				time_t c_requires_crap = duration + ServerInstance->Time();
-				std::string timestr = ServerInstance->TimeString(c_requires_crap);
+				std::string timestr = InspIRCd::TimeString(c_requires_crap);
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires on %s: %s",user->nick.c_str(),parameters[0].c_str(),
 						timestr.c_str(), parameters[2].c_str());
 			}
diff --git a/src/commands/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp
index bdd16b520..fab65aae3 100644
--- a/src/commands/cmd_whowas.cpp
+++ b/src/commands/cmd_whowas.cpp
@@ -62,7 +62,7 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
 					user->WriteNumeric(RPL_WHOWASIP, "%s :was connecting from *@%s",
 						parameters[0].c_str(), u->host.c_str());
 
-				std::string signon = ServerInstance->TimeString(u->signon);
+				std::string signon = InspIRCd::TimeString(u->signon);
 				bool hide_server = (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex"));
 				user->WriteNumeric(RPL_WHOISSERVER, "%s %s :%s", parameters[0].c_str(), (hide_server ? ServerInstance->Config->HideWhoisServer.c_str() : u->server.c_str()), signon.c_str());
 			}
diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index fdb156e0a..2c5997558 100644
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -83,7 +83,7 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
 			else
 			{
 				time_t c_requires_crap = duration + ServerInstance->Time();
-				std::string timestr = ServerInstance->TimeString(c_requires_crap);
+				std::string timestr = InspIRCd::TimeString(c_requires_crap);
 				ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s: %s",user->nick.c_str(),ipaddr,
 						timestr.c_str(), parameters[2].c_str());
 			}