Move implementation of ConvTo*() and related functions into convto.h

2 files changed, 106 insertions, 82 deletions

diff --git a/include/convto.h b/include/convto.h
new file mode 100644
index 000000000..82f13c46d
--- /dev/null
+++ b/include/convto.h
@@ -0,0 +1,105 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+/** Template function to convert any input type to std::string
+ */
+template<typename T> inline std::string ConvNumeric(const T& in)
+{
+	if (in == 0)
+		return "0";
+	T quotient = in;
+	std::string out;
+	while (quotient)
+	{
+		out += "0123456789"[std::abs((long)quotient % 10)];
+		quotient /= 10;
+	}
+	if (in < 0)
+		out += '-';
+	std::reverse(out.begin(), out.end());
+	return out;
+}
+
+/** Template function to convert any input type to std::string
+ */
+inline std::string ConvToStr(const int in)
+{
+	return ConvNumeric(in);
+}
+
+/** Template function to convert any input type to std::string
+ */
+inline std::string ConvToStr(const long in)
+{
+	return ConvNumeric(in);
+}
+
+/** Template function to convert any input type to std::string
+ */
+inline std::string ConvToStr(const char* in)
+{
+	return in;
+}
+
+/** Template function to convert any input type to std::string
+ */
+inline std::string ConvToStr(const bool in)
+{
+	return (in ? "1" : "0");
+}
+
+/** Template function to convert any input type to std::string
+ */
+inline std::string ConvToStr(char in)
+{
+	return std::string(1, in);
+}
+
+/** Template function to convert any input type to std::string
+ */
+template <class T> inline std::string ConvToStr(const T& in)
+{
+	std::stringstream tmp;
+	if (!(tmp << in))
+		return std::string();
+	return tmp.str();
+}
+
+/** Template function to convert any input type to any other type
+ * (usually an integer or numeric type)
+ */
+template<typename T> inline long ConvToInt(const T& in)
+{
+	std::stringstream tmp;
+	if (!(tmp << in))
+		return 0;
+	return atol(tmp.str().c_str());
+}
+
+inline uint64_t ConvToUInt64(const std::string& in)
+{
+	uint64_t ret;
+	std::istringstream tmp(in);
+	if (!(tmp >> ret))
+		return 0;
+	return ret;
+}
diff --git a/include/inspircd.h b/include/inspircd.h
index 2c55cf498..188434620 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -65,6 +65,7 @@ struct fakederef
 };
 
 #include "config.h"
+#include "convto.h"
 #include "dynref.h"
 #include "consolecolors.h"
 #include "caller.h"
@@ -95,88 +96,6 @@ struct fakederef
 #include "bancache.h"
 #include "isupportmanager.h"
 
-/** Template function to convert any input type to std::string
- */
-template<typename T> inline std::string ConvNumeric(const T &in)
-{
-	if (in == 0)
-		return "0";
-	T quotient = in;
-	std::string out;
-	while (quotient)
-	{
-		out += "0123456789"[ std::abs( (long)quotient % 10 ) ];
-		quotient /= 10;
-	}
-	if (in < 0)
-		out += '-';
-	std::reverse(out.begin(), out.end());
-	return out;
-}
-
-/** Template function to convert any input type to std::string
- */
-inline std::string ConvToStr(const int in)
-{
-	return ConvNumeric(in);
-}
-
-/** Template function to convert any input type to std::string
- */
-inline std::string ConvToStr(const long in)
-{
-	return ConvNumeric(in);
-}
-
-/** Template function to convert any input type to std::string
- */
-inline std::string ConvToStr(const char* in)
-{
-	return in;
-}
-
-/** Template function to convert any input type to std::string
- */
-inline std::string ConvToStr(const bool in)
-{
-	return (in ? "1" : "0");
-}
-
-/** Template function to convert any input type to std::string
- */
-inline std::string ConvToStr(char in)
-{
-	return std::string(1, in);
-}
-
-/** Template function to convert any input type to std::string
- */
-template <class T> inline std::string ConvToStr(const T &in)
-{
-	std::stringstream tmp;
-	if (!(tmp << in)) return std::string();
-	return tmp.str();
-}
-
-/** Template function to convert any input type to any other type
- * (usually an integer or numeric type)
- */
-template<typename T> inline long ConvToInt(const T &in)
-{
-	std::stringstream tmp;
-	if (!(tmp << in)) return 0;
-	return atol(tmp.str().c_str());
-}
-
-inline uint64_t ConvToUInt64(const std::string& in)
-{
-	uint64_t ret;
-	std::istringstream tmp(in);
-	if (!(tmp >> ret))
-		return 0;
-	return ret;
-}
-
 /** This class contains various STATS counters
  * It is used by the InspIRCd class, which internally
  * has an instance of it.