X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=303d24745664ef2936e7c145e4ad17b1cf24a809;hb=754f0130893bacb2b69a32c3de9ed1b3da9659cd;hp=b90c0c797d06f68fb07ec43e8198c4bafbde5bc2;hpb=8f34594cb7d600ccff100dff1817b69b03756ea2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index b90c0c797..303d24745 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -32,6 +32,7 @@
 #include <cstdio>
 #include <cstring>
 #include <ctime>
+#include <stdint.h>
 
 #include <algorithm>
 #include <bitset>
@@ -64,6 +65,7 @@ struct fakederef
 };
 
 #include "config.h"
+#include "convto.h"
 #include "dynref.h"
 #include "consolecolors.h"
 #include "caller.h"
@@ -71,6 +73,7 @@ struct fakederef
 #include "extensible.h"
 #include "fileutils.h"
 #include "numerics.h"
+#include "numeric.h"
 #include "uid.h"
 #include "server.h"
 #include "users.h"
@@ -94,88 +97,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.
@@ -502,11 +423,6 @@ class CoreExport InspIRCd
 	static const char* Format(const char* formatString, ...) CUSTOM_PRINTF(1, 2);
 	static const char* Format(va_list &vaList, const char* formatString) CUSTOM_PRINTF(2, 0);
 
-	/** Send an error notice to all local users, opered and unopered
-	 * @param s The error string to send
-	 */
-	void SendError(const std::string &s);
-
 	/** Return true if a nickname is valid
 	 * @param n A nickname to verify
 	 * @return True if the nick is valid
@@ -551,7 +467,7 @@ class CoreExport InspIRCd
 	 */
 	static bool IsValidMask(const std::string& mask);
 
-	/** Strips all color codes from the given string
+	/** Strips all color and control codes except 001 from the given string
 	 * @param sentence The string to strip from
 	 */
 	static void StripColor(std::string &sentence);
@@ -591,9 +507,10 @@ class CoreExport InspIRCd
 
 	/** Attempt to write the process id to a given file
 	 * @param filename The PID file to attempt to write to
+	 * @param exitonfail If true and the PID fail cannot be written log to stdout and exit, otherwise only log on failure
 	 * @return This function may bail if the file cannot be written
 	 */
-	void WritePID(const std::string &filename);
+	void WritePID(const std::string& filename, bool exitonfail = true);
 
 	/** This constructor initialises all the subsystems and reads the config file.
 	 * @param argc The argument count passed to main()
@@ -669,4 +586,6 @@ inline void stdalgo::culldeleter::operator()(classbase* item)
 		ServerInstance->GlobalCulls.AddItem(item);
 }
 
+#include "numericbuilder.h"
 #include "modules/whois.h"
+#include "modules/stats.h"