X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nationalchars.cpp;h=e8a70d14873b51b626d7620f593c6989171fdbfd;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=2fe8dcf3988789a6f8ced71646b5100784d75148;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 2fe8dcf39..e8a70d148 100755
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -24,9 +24,8 @@
 
 class lwbNickHandler : public HandlerBase2<bool, const char*, size_t>
 {
-	InspIRCd* Server;
  public:
-	lwbNickHandler(InspIRCd* Srv) : Server(Srv) { }
+	lwbNickHandler() { }
 	virtual ~lwbNickHandler() { }
 	virtual bool Call(const char*, size_t);
 };
@@ -214,29 +213,21 @@ bool lwbNickHandler::Call(const char* n, size_t max)
 class ModuleNationalChars : public Module
 {
  private:
-
-	InspIRCd* ServerInstance;
-	lwbNickHandler* myhandler;
+	lwbNickHandler myhandler;
 	std::string charset, casemapping;
 	unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256];
-	caller2<bool, const char*, size_t> * rememberer;
+	caller2<bool, const char*, size_t> rememberer;
 	bool forcequit;
 	const unsigned char * lowermap_rememberer;
 
  public:
-	ModuleNationalChars(InspIRCd* Me) : Module(Me)
+	ModuleNationalChars() : rememberer(ServerInstance->IsNick)
 	{
-		rememberer = (caller2<bool, const char*, size_t> *) malloc(sizeof(caller2<bool, const char*, size_t>));
-
 		lowermap_rememberer = national_case_insensitive_map;
 		memcpy(m_lower, rfc_case_insensitive_map, 256);
 		national_case_insensitive_map = m_lower;
 
-		ServerInstance = Me;
-
-		*rememberer = ServerInstance->IsNick;
-		myhandler = new lwbNickHandler(ServerInstance);
-		ServerInstance->IsNick = myhandler;
+		ServerInstance->IsNick = &myhandler;
 
 		Implementation eventlist[] = { I_OnRehash, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -252,15 +243,14 @@ class ModuleNationalChars : public Module
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader* conf = new ConfigReader(ServerInstance);
-		charset = conf->ReadValue("nationalchars", "file", 0);
-		casemapping = conf->ReadValue("nationalchars", "casemapping", charset, 0, false);
+		ConfigReader conf;
+		charset = conf.ReadValue("nationalchars", "file", 0);
+		casemapping = conf.ReadValue("nationalchars", "casemapping", charset, 0, false);
 		charset.insert(0, "../locales/");
 		unsigned char * tables[8] = { m_additional, m_additionalMB, m_additionalUp, m_lower, m_upper, m_additionalUtf8, m_additionalUtf8range, m_additionalUtf8interval };
 		loadtables(charset, tables, 8, 5);
-		forcequit = conf->ReadFlag("nationalchars", "forcequit", 0);
+		forcequit = conf.ReadFlag("nationalchars", "forcequit", 0);
 		CheckForceQuit("National character set changed");
-		delete conf;
 	}
 
 	void CheckForceQuit(const char * message)
@@ -268,7 +258,7 @@ class ModuleNationalChars : public Module
 		if (!forcequit)
 			return;
 
-		for (std::vector<User*>::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
+		for (std::vector<LocalUser*>::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
 		{
 			/* Fix by Brain: Dont quit UID users */
 			User* n = *iter;
@@ -279,16 +269,14 @@ class ModuleNationalChars : public Module
 
 	virtual ~ModuleNationalChars()
 	{
-		delete myhandler;
-		ServerInstance->IsNick = *rememberer;
-		free(rememberer);
+		ServerInstance->IsNick = rememberer;
 		national_case_insensitive_map = lowermap_rememberer;
 		CheckForceQuit("National characters module unloaded");
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON,API_VERSION);
+		return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON);
 	}
 
 	/*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/