X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=5d5a95516b27ec8e3a998c3d9d6b3610163f437e;hb=d01978194558a422cf886acb114546d0cbe84c76;hp=1e2e415cde1a2995eb44726e42dc08f8a4e008ff;hpb=15a1ffae233e1bf28a3c1dc9e1e8b6298c6a0f57;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 1e2e415cd..5d5a95516 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -419,7 +419,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 	char sreason[MAXBUF];
 	snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
 	if (*ServerInstance->Config->MoronBanner)
-		u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+		u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner);
 
 	if (ServerInstance->Config->HideBans)
 		ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
@@ -526,13 +526,13 @@ bool QLine::Matches(User *u)
 void QLine::Apply(User* u)
 {       
 	/* Force to uuid on apply of qline, no need to disconnect any more :) */
-	u->ForceNickChange(u->uuid);
+	u->ForceNickChange(u->uuid.c_str());
 }
 
 
 bool ZLine::Matches(const std::string &str)
 {
-	if (match(str.c_str(), this->ipaddr, true))
+	if (match(str, this->ipaddr, true))
 		return true;
 	else
 		return false;
@@ -540,7 +540,7 @@ bool ZLine::Matches(const std::string &str)
 
 bool QLine::Matches(const std::string &str)
 {
-	if (match(str.c_str(), this->nick))
+	if (match(str, this->nick))
 		return true;
 
 	return false;
@@ -548,17 +548,17 @@ bool QLine::Matches(const std::string &str)
 
 bool ELine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return ((match(str, matchtext, true)));
 }
 
 bool KLine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return ((match(str.c_str(), matchtext, true)));
 }
 
 bool GLine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return ((match(str, matchtext, true)));
 }
 
 void ELine::OnAdd()