Epic commit to replace most of the strings in Anope with a single Anope::string class, plus some other little fixes here and there. If you follow 1.9.x development and are testing things, THIS is one of those things that NEEDS testing.

1 files changed, 11 insertions, 9 deletions

diff --git a/include/mail.h b/include/mail.h
index 7148b56d8..8a1f8e390 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -1,22 +1,24 @@
 #ifndef MAIL_H
 #define MAIL_H
 
-extern CoreExport bool Mail(User *u, NickRequest *nr, const std::string &service, const std::string &subject, const std::string &message);
-extern CoreExport bool Mail(User *u, NickCore *nc, const std::string &service, const std::string &subject, const std::string &message);
-extern CoreExport bool Mail(NickCore *nc, const std::string &subject, const std::string &message);
-extern CoreExport bool MailValidate(const std::string &email);
+#include "anope.h"
+
+extern CoreExport bool Mail(User *u, NickRequest *nr, const Anope::string &service, const Anope::string &subject, const Anope::string &message);
+extern CoreExport bool Mail(User *u, NickCore *nc, const Anope::string &service, const Anope::string &subject, const Anope::string &message);
+extern CoreExport bool Mail(NickCore *nc, const Anope::string &subject, const Anope::string &message);
+extern CoreExport bool MailValidate(const Anope::string &email);
 
 class MailThread : public Thread
 {
  private:
-	std::string MailTo;
-	std::string Addr;
-	std::string Subject;
-	std::string Message;
+	Anope::string MailTo;
+	Anope::string Addr;
+	Anope::string Subject;
+	Anope::string Message;
 
 	bool Success;
  public:
-	MailThread(const std::string &mailto, const std::string &addr, const std::string &subject, const std::string &message) : Thread(), MailTo(mailto), Addr(addr), Subject(subject), Message(message), Success(false)
+	MailThread(const Anope::string &mailto, const Anope::string &addr, const Anope::string &subject, const Anope::string &message) : Thread(), MailTo(mailto), Addr(addr), Subject(subject), Message(message), Success(false)
 	{
 	}