Clean up the FileReader class and all of the modules that use it.

[user/henk/code/inspircd.git] / src / xline.cpp

diff --git a/src/xline.cpp b/src/xline.cpp
index d347e3763b4709116a64675f62797a4d5242a1f4..4bb9551ecc6d8c1006f6b70459ec936004c78047 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -259,7 +259,7 @@ bool XLineManager::AddLine(XLine* line, User* user)
        ContainerIter x = lookup_lines.find(line->type);
        if (x != lookup_lines.end())
        {
-               LookupIter i = x->second.find(line->Displayable());
+               LookupIter i = x->second.find(line->Displayable().c_str());
                if (i != x->second.end())
                {
                        // XLine propagation bug was here, if the line to be added already exists and
@@ -281,7 +281,7 @@ bool XLineManager::AddLine(XLine* line, User* user)
        if (xlf->AutoApplyToUserList(line))
                pending_lines.push_back(line);
 
-       lookup_lines[line->type][line->Displayable()] = line;
+       lookup_lines[line->type][line->Displayable().c_str()] = line;
        line->OnAdd();
 
        FOREACH_MOD(I_OnAddLine,OnAddLine(user, line));
@@ -692,32 +692,32 @@ void XLine::DisplayExpiry()
 {
        bool onechar = (type.length() == 1);
        ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago)",
-               type.c_str(), (onechar ? "-Line" : ""), Displayable(), source.c_str(), (long)(ServerInstance->Time() - set_time));
+               type.c_str(), (onechar ? "-Line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time));
 }
 
-const char* ELine::Displayable()
+const std::string& ELine::Displayable()
 {
-       return matchtext.c_str();
+       return matchtext;
 }
 
-const char* KLine::Displayable()
+const std::string& KLine::Displayable()
 {
-       return matchtext.c_str();
+       return matchtext;
 }
 
-const char* GLine::Displayable()
+const std::string& GLine::Displayable()
 {
-       return matchtext.c_str();
+       return matchtext;
 }
 
-const char* ZLine::Displayable()
+const std::string& ZLine::Displayable()
 {
-       return ipaddr.c_str();
+       return ipaddr;
 }
 
-const char* QLine::Displayable()
+const std::string& QLine::Displayable()
 {
-       return nick.c_str();
+       return nick;
 }
 
 bool KLine::IsBurstable()