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.

4 files changed, 23 insertions, 23 deletions

diff --git a/modules/extra/mysql/db_mysql.h b/modules/extra/mysql/db_mysql.h
index 32a2469c9..fcad2f24c 100644
--- a/modules/extra/mysql/db_mysql.h
+++ b/modules/extra/mysql/db_mysql.h
@@ -176,7 +176,7 @@ class DBMySQL : public Module
 	unsigned int Port;
 	unsigned int Delay;
 
-	DBMySQL(const std::string &modname, const std::string &creator) : Module(modname, creator)
+	DBMySQL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
 	{
 		me = this;
 
@@ -184,7 +184,7 @@ class DBMySQL : public Module
 		this->SetType(DATABASE);
 
 		if (!LoadConfig())
-			throw ModuleException("Couldn't load config");
+			throw ModuleException(Anope::string("Couldn't load config"));
 
 		Con = new mysqlpp::Connection(false);
 		Ne = new mysqlpp::NoExceptions(Con);
@@ -193,7 +193,7 @@ class DBMySQL : public Module
 			std::string Error = "MySQL: Error connecting to SQL server: ";
 			Error += Con->error();
 			delete Con;
-			throw ModuleException(Error.c_str());
+			throw ModuleException(Anope::string(Error));
 		}
 
 		mysqlpp::Query query(Con);
diff --git a/modules/extra/mysql/db_mysql_execute.cpp b/modules/extra/mysql/db_mysql_execute.cpp
index 2cc6ab6df..079e88147 100644
--- a/modules/extra/mysql/db_mysql_execute.cpp
+++ b/modules/extra/mysql/db_mysql_execute.cpp
@@ -145,7 +145,7 @@ class DBMySQLExecute : public DBMySQL
 {
 	SQLTimer *_SQLTimer;
  public:
-	DBMySQLExecute(const std::string &modname, const std::string &creator) : DBMySQL(modname, creator)
+	DBMySQLExecute(const Anope::string &modname, const Anope::string &creator) : DBMySQL(modname, creator)
 	{
 		_SQLTimer = new SQLTimer();
 	}
diff --git a/modules/extra/mysql/db_mysql_read.cpp b/modules/extra/mysql/db_mysql_read.cpp
index 3ffc82366..ff608b700 100644
--- a/modules/extra/mysql/db_mysql_read.cpp
+++ b/modules/extra/mysql/db_mysql_read.cpp
@@ -237,37 +237,37 @@ static void LoadDatabase()
 			ci->bantype = atoi(qres[i]["bantype"].c_str());
 			if (qres[i]["mlock_on"].size())
 			{
-				std::vector<std::string> modes;
+				std::vector<Anope::string> modes;
 				std::string buf;
 
 				spacesepstream sep(SQLAssign(qres[i]["mlock_on"]));
 				while (sep.GetToken(buf))
-					modes.push_back(buf);
+					modes.push_back(Anope::string(buf));
 
-				ci->Extend("db_mlock_modes_on", new ExtensibleItemRegular<std::vector<std::string> >(modes));
+				ci->Extend("db_mlock_modes_on", new ExtensibleItemRegular<std::vector<Anope::string> >(modes));
 			}
 			if (qres[i]["mlock_off"].size())
 			{
-				std::vector<std::string> modes;
+				std::vector<Anope::string> modes;
 				std::string buf;
 
 				spacesepstream sep(SQLAssign(qres[i]["mlock_off"]));
 				while (sep.GetToken(buf))
-					modes.push_back(buf);
+					modes.push_back(Anope::string(buf));
 
-				ci->Extend("db_mlock_modes_off", new ExtensibleItemRegular<std::vector<std::string> >(modes));
+				ci->Extend("db_mlock_modes_off", new ExtensibleItemRegular<std::vector<Anope::string> >(modes));
 			}
 			if (qres[i]["mlock_params"].size())
 			{
-				std::vector<std::pair<std::string, std::string> > mlp;
+				std::vector<std::pair<Anope::string, Anope::string> > mlp;
 				std::string buf, buf2;
 
 				spacesepstream sep(SQLAssign(qres[i]["mlock_params"]));
 
 				while (sep.GetToken(buf) && sep.GetToken(buf2))
-					mlp.push_back(std::make_pair(buf, buf2));
+					mlp.push_back(std::make_pair(Anope::string(buf), Anope::string(buf2)));
 
-				ci->Extend("db_mlp", new ExtensibleItemRegular<std::vector<std::pair<std::string, std::string> > >(mlp));
+				ci->Extend("db_mlp", new ExtensibleItemRegular<std::vector<std::pair<Anope::string, Anope::string> > >(mlp));
 			}
 			if (qres[i]["entry_message"].size())
 				ci->entry_message = sstrdup(qres[i]["entry_message"].c_str());
@@ -594,7 +594,7 @@ static void LoadDatabase()
 class DBMySQLRead : public DBMySQL
 {
  public:
-	DBMySQLRead(const std::string &modname, const std::string &creator) : DBMySQL(modname, creator)
+	DBMySQLRead(const Anope::string &modname, const Anope::string &creator) : DBMySQL(modname, creator)
 	{
 		Implementation i[] = { I_OnLoadDatabase };
 		ModuleManager::Attach(i, this, 1);
diff --git a/modules/extra/mysql/db_mysql_write.cpp b/modules/extra/mysql/db_mysql_write.cpp
index c5c002a7e..2d44450c1 100644
--- a/modules/extra/mysql/db_mysql_write.cpp
+++ b/modules/extra/mysql/db_mysql_write.cpp
@@ -161,7 +161,7 @@ void WriteMetadata(const std::string &key, const std::string &data)
 void WriteNickMetadata(const std::string &key, const std::string &data)
 {
 	if (!CurNick)
-		throw CoreException("WriteNickMetadata without a nick to write");
+		throw CoreException(Anope::string("WriteNickMetadata without a nick to write"));
 
 	mysqlpp::Query query(me->Con);
 	query << "INSERT DELAYED INTO `anope_ns_alias_metadata` (nick, name, value) VALUES(" << mysqlpp::quote << CurNick->nick << ", " << mysqlpp::quote << key << ", " << mysqlpp::quote << data << ")";
@@ -171,7 +171,7 @@ void WriteNickMetadata(const std::string &key, const std::string &data)
 void WriteCoreMetadata(const std::string &key, const std::string &data)
 {
 	if (!CurCore)
-		throw CoreException("WritCoreMetadata without a core to write");
+		throw CoreException(Anope::string("WritCoreMetadata without a core to write"));
 
 	mysqlpp::Query query(me->Con);
 	query << "INSERT DELAYED INTO `anope_ns_core_metadata` (nick, name, value) VALUES(" << mysqlpp::quote << CurCore->display << ", " << mysqlpp::quote << key << ", " << mysqlpp::quote << data << ")";
@@ -181,7 +181,7 @@ void WriteCoreMetadata(const std::string &key, const std::string &data)
 void WriteChannelMetadata(const std::string &key, const std::string &data)
 {
 	if (!CurChannel)
-		throw CoreException("WriteChannelMetadata without a channel to write");
+		throw CoreException(Anope::string("WriteChannelMetadata without a channel to write"));
 
 	mysqlpp::Query query(me->Con);
 	query << "INSERT DELAYED INTO `anope_cs_info_metadata` (channel, name, value) VALUES(" << mysqlpp::quote << CurChannel->name << ", " << mysqlpp::quote << key << ", " << mysqlpp::quote << data << ")";
@@ -191,7 +191,7 @@ void WriteChannelMetadata(const std::string &key, const std::string &data)
 void WriteBotMetadata(const std::string &key, const std::string &data)
 {
 	if (!CurBot)
-		throw CoreException("WriteBotMetadata without a bot to write");
+		throw CoreException(Anope::string("WriteBotMetadata without a bot to write"));
 
 	mysqlpp::Query query(me->Con);
 	query << "INSERT DELAYED INTO `anope_bs_info_metadata` (botname, name, value) VALUES(" << mysqlpp::quote << CurBot->nick << ", " << mysqlpp::quote << key << ", " << mysqlpp::quote << data << ")";
@@ -336,7 +336,7 @@ class CommandSyncSQL : public Command
 		return MOD_CONT;
 	}
 
-	bool OnHelp(User *u, const ci::string &subcommand)
+	bool OnHelp(User *u, const Anope::string &subcommand)
 	{
 		notice_help(Config.s_OperServ, u, OPER_HELP_SYNC);
 		return true;
@@ -351,7 +351,7 @@ class CommandSyncSQL : public Command
 class DBMySQLWrite : public DBMySQL
 {
  public:
-	DBMySQLWrite(const std::string &modname, const std::string &creator) : DBMySQL(modname, creator)
+	DBMySQLWrite(const Anope::string &modname, const Anope::string &creator) : DBMySQL(modname, creator)
 	{
 		me = this;
 
@@ -612,14 +612,14 @@ class DBMySQLWrite : public DBMySQL
 		}
 	}
 
-	void OnNickAddAccess(NickCore *nc, const std::string &entry)
+	void OnNickAddAccess(NickCore *nc, const Anope::string &entry)
 	{
 		mysqlpp::Query query(me->Con);
 		query << "INSERT DELAYED INTO `anope_ns_access` (display, access) VALUES(" << mysqlpp::quote << nc->display << ", " << mysqlpp::quote << entry << ")";
 		ExecuteQuery(query);
 	}
 
-	void OnNickEraseAccess(NickCore *nc, const std::string &entry)
+	void OnNickEraseAccess(NickCore *nc, const Anope::string &entry)
 	{
 		mysqlpp::Query query(me->Con);
 		query << "DELETE FROM `anope_ns_access` WHERE `display` = " << mysqlpp::quote << nc->display << " AND `access` = " << mysqlpp::quote << entry;
@@ -703,7 +703,7 @@ class DBMySQLWrite : public DBMySQL
 		ExecuteQuery(query);
 	}
 
-	void OnChangeCoreDisplay(NickCore *nc, const std::string &newdisplay)
+	void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay)
 	{
 		mysqlpp::Query query(me->Con);
 		query << "UPDATE `anope_ns_core` SET `display` = " << mysqlpp::quote << newdisplay << " WHERE `display` = " << mysqlpp::quote << nc->display;