The first of a few "CBX OCDing over code style" commits, focusing on include/* and src/* but not src/core/* or src/modules/*.

28 files changed, 51 insertions, 51 deletions

diff --git a/src/core/cs_set_bantype.cpp b/src/core/cs_set_bantype.cpp
index 985c6f1e6..fca1e6fdc 100644
--- a/src/core/cs_set_bantype.cpp
+++ b/src/core/cs_set_bantype.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetBanType : public Command
 {
  public:
-	CommandCSSetBanType(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetBanType(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_description.cpp b/src/core/cs_set_description.cpp
index 44e6090bf..0900f4792 100644
--- a/src/core/cs_set_description.cpp
+++ b/src/core/cs_set_description.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetDescription : public Command
 {
  public:
-	CommandCSSetDescription(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetDescription(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
@@ -86,7 +86,7 @@ class CSSetDescription : public Module
 		Command *c = FindCommand(ChanServ, "SET");
 		if (c)
 			c->AddSubcommand(new CommandCSSetDescription("DESC"));
-		
+
 		c = FindCommand(ChanServ, "SASEt");
 		if (c)
 			c->AddSubcommand(new CommandCSSASetDescription("DESC"));
diff --git a/src/core/cs_set_email.cpp b/src/core/cs_set_email.cpp
index d226a3b06..9923f6061 100644
--- a/src/core/cs_set_email.cpp
+++ b/src/core/cs_set_email.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetEMail : public Command
 {
  public:
-	CommandCSSetEMail(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 1, 2, cpermission)
+	CommandCSSetEMail(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 1, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_entrymsg.cpp b/src/core/cs_set_entrymsg.cpp
index b7c223546..321f00f73 100644
--- a/src/core/cs_set_entrymsg.cpp
+++ b/src/core/cs_set_entrymsg.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetEntryMsg : public Command
 {
  public:
-	CommandCSSetEntryMsg(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 1, 2, cpermission)
+	CommandCSSetEntryMsg(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 1, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_founder.cpp b/src/core/cs_set_founder.cpp
index 6a456a0f6..c1dbfb62f 100644
--- a/src/core/cs_set_founder.cpp
+++ b/src/core/cs_set_founder.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetFounder : public Command
 {
  public:
-	CommandCSSetFounder(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetFounder(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
@@ -121,7 +121,7 @@ class CSSetFounder : public Module
 		Command *c = FindCommand(ChanServ, "SET");
 		if (c)
 			c->AddSubcommand(new CommandCSSetFounder("FOUNDER"));
-		
+
 		c = FindCommand(ChanServ, "SASET");
 		if (c)
 			c->AddSubcommand(new CommandCSSASetFounder("FOUNDER"));
diff --git a/src/core/cs_set_keeptopic.cpp b/src/core/cs_set_keeptopic.cpp
index 87a4660cf..819d3e9c8 100644
--- a/src/core/cs_set_keeptopic.cpp
+++ b/src/core/cs_set_keeptopic.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetKeepTopic : public Command
 {
  public:
-	CommandCSSetKeepTopic(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetKeepTopic(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_mlock.cpp b/src/core/cs_set_mlock.cpp
index d75363ac4..87d55790a 100644
--- a/src/core/cs_set_mlock.cpp
+++ b/src/core/cs_set_mlock.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetMLock : public Command
 {
  public:
-	CommandCSSetMLock(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 1, 0, cpermission)
+	CommandCSSetMLock(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 1, 0, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_opnotice.cpp b/src/core/cs_set_opnotice.cpp
index b889869bd..3c4950d6f 100644
--- a/src/core/cs_set_opnotice.cpp
+++ b/src/core/cs_set_opnotice.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetOpNotice : public Command
 {
  public:
-	CommandCSSetOpNotice(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetOpNotice(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
@@ -91,7 +91,7 @@ class CSSetOpNotice : public Module
 		Command *c = FindCommand(ChanServ, "SET");
 		if (c)
 			c->AddSubcommand(new CommandCSSetOpNotice("OPNOTICE"));
-		
+
 		c = FindCommand(ChanServ, "SASET");
 		if (c)
 			c->AddSubcommand(new CommandCSSASetOpNotice("OPNOTICE"));
diff --git a/src/core/cs_set_peace.cpp b/src/core/cs_set_peace.cpp
index 05cf5f863..613dad6fd 100644
--- a/src/core/cs_set_peace.cpp
+++ b/src/core/cs_set_peace.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetPeace : public Command
 {
  public:
-	CommandCSSetPeace(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetPeace(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_persist.cpp b/src/core/cs_set_persist.cpp
index 0e713c715..592e54485 100644
--- a/src/core/cs_set_persist.cpp
+++ b/src/core/cs_set_persist.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetPersist : public Command
 {
  public:
-	CommandCSSetPersist(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetPersist(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
@@ -79,7 +79,7 @@ class CommandCSSetPersist : public Command
 				if (!cm && !Config.s_BotServ && ci->bi)
 				{
 					/* Unassign bot */
-					ChanServ->UnAssign(NULL, ci);   
+					ChanServ->UnAssign(NULL, ci);
 				}
 
 				if (ci->c && ci->c->users.empty())
@@ -142,7 +142,7 @@ class CSSetPersist : public Module
 		Command *c = FindCommand(ChanServ, "SET");
 		if (c)
 			c->AddSubcommand(new CommandCSSetPersist("PERSIST"));
-		
+
 		c = FindCommand(ChanServ, "SASET");
 		if (c)
 			c->AddSubcommand(new CommandCSSASetPersist("PERSIST"));
diff --git a/src/core/cs_set_private.cpp b/src/core/cs_set_private.cpp
index 9f96828df..53e482000 100644
--- a/src/core/cs_set_private.cpp
+++ b/src/core/cs_set_private.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetPrivate : public Command
 {
  public:
-	CommandCSSetPrivate(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetPrivate(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_restricted.cpp b/src/core/cs_set_restricted.cpp
index 7e0cc42b3..8fe4c244e 100644
--- a/src/core/cs_set_restricted.cpp
+++ b/src/core/cs_set_restricted.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetRestricted : public Command
 {
  public:
-	CommandCSSetRestricted(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetRestricted(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_secure.cpp b/src/core/cs_set_secure.cpp
index bdcffdb21..4c70a43de 100644
--- a/src/core/cs_set_secure.cpp
+++ b/src/core/cs_set_secure.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetSecure : public Command
 {
  public:
-	CommandCSSetSecure(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetSecure(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_securefounder.cpp b/src/core/cs_set_securefounder.cpp
index 9d4a99d20..c999dffd1 100644
--- a/src/core/cs_set_securefounder.cpp
+++ b/src/core/cs_set_securefounder.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetSecureFounder : public Command
 {
  public:
-	CommandCSSetSecureFounder(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetSecureFounder(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_secureops.cpp b/src/core/cs_set_secureops.cpp
index dc510f71a..88deb7a90 100644
--- a/src/core/cs_set_secureops.cpp
+++ b/src/core/cs_set_secureops.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetSecureOps : public Command
 {
  public:
-	CommandCSSetSecureOps(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetSecureOps(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
@@ -91,7 +91,7 @@ class CSSetSecureOps : public Module
 		Command *c = FindCommand(ChanServ, "SET");
 		if (c)
 			c->AddSubcommand(new CommandCSSetSecureOps("SECUREOPS"));
-		
+
 		c = FindCommand(ChanServ, "SASET");
 		if (c)
 			c->AddSubcommand(new CommandCSSASetSecureOps("SECUREOPS"));
diff --git a/src/core/cs_set_signkick.cpp b/src/core/cs_set_signkick.cpp
index 2e24f8d38..a54548b1f 100644
--- a/src/core/cs_set_signkick.cpp
+++ b/src/core/cs_set_signkick.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetSignKick : public Command
 {
  public:
-	CommandCSSetSignKick(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetSignKick(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_successor.cpp b/src/core/cs_set_successor.cpp
index 3de30631a..30b9060ba 100644
--- a/src/core/cs_set_successor.cpp
+++ b/src/core/cs_set_successor.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetSuccessor : public Command
 {
  public:
-	CommandCSSetSuccessor(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 1, 2, cpermission)
+	CommandCSSetSuccessor(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 1, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_topiclock.cpp b/src/core/cs_set_topiclock.cpp
index 14934f551..4edea3961 100644
--- a/src/core/cs_set_topiclock.cpp
+++ b/src/core/cs_set_topiclock.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetTopicLock : public Command
 {
  public:
-	CommandCSSetTopicLock(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetTopicLock(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_url.cpp b/src/core/cs_set_url.cpp
index 06c49da4f..241c0645b 100644
--- a/src/core/cs_set_url.cpp
+++ b/src/core/cs_set_url.cpp
@@ -18,7 +18,7 @@
 class CommandCSSetURL : public Command
 {
  public:
-	CommandCSSetURL(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 1, 2, cpermission)
+	CommandCSSetURL(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 1, 2, cpermission)
 	{
 	}
 
diff --git a/src/core/cs_set_xop.cpp b/src/core/cs_set_xop.cpp
index 398cf4c1b..648eefba1 100644
--- a/src/core/cs_set_xop.cpp
+++ b/src/core/cs_set_xop.cpp
@@ -20,7 +20,7 @@
 class CommandCSSetXOP : public Command
 {
  public:
-	CommandCSSetXOP(const ci::string &cname, const std::string &cpermission = "") : Command(cname, 2, 2, cpermission)
+	CommandCSSetXOP(const ci::string &cname, const ci::string &cpermission = "") : Command(cname, 2, 2, cpermission)
 	{
 	}
 
@@ -54,7 +54,7 @@ class CommandCSSetXOP : public Command
 						access->level = ACCESS_SOP;
 					else if (CHECKLEV(CA_AUTOOP) || CHECKLEV(CA_OPDEOP) || CHECKLEV(CA_OPDEOPME))
 						access->level = ACCESS_AOP;
-					else if (ModeManager::FindChannelModeByName(CMODE_HALFOP) && (CHECKLEV(CA_AUTOHALFOP) || CHECKLEV(CA_HALFOP) 
+					else if (ModeManager::FindChannelModeByName(CMODE_HALFOP) && (CHECKLEV(CA_AUTOHALFOP) || CHECKLEV(CA_HALFOP)
 || CHECKLEV(CA_HALFOPME)))
 							access->level = ACCESS_HOP;
 					else if (CHECKLEV(CA_AUTOVOICE) || CHECKLEV(CA_VOICE) || CHECKLEV(CA_VOICEME))
diff --git a/src/core/enc_md5.cpp b/src/core/enc_md5.cpp
index 1c46ca72b..5ec245a7b 100644
--- a/src/core/enc_md5.cpp
+++ b/src/core/enc_md5.cpp
@@ -382,10 +382,10 @@ class EMD5 : public Module
 		this->OnEncrypt(plaintext, buf);
 		if (!password.compare(buf))
 		{
-			/* if we are NOT the first module in the list, 
+			/* if we are NOT the first module in the list,
 			 * we want to re-encrypt the pass with the new encryption
 			 */
-			if (Config.EncModuleList.front().compare(this->name))
+			if (Config.EncModuleList.front() == this->name)
 			{
 				enc_encrypt(plaintext, password);
 			}
diff --git a/src/core/enc_none.cpp b/src/core/enc_none.cpp
index 280c86bd2..c89db82ae 100644
--- a/src/core/enc_none.cpp
+++ b/src/core/enc_none.cpp
@@ -53,7 +53,7 @@ class ENone : public Module
 		return EVENT_ALLOW;
 	}
 
-	EventReturn OnCheckPassword(const std::string &hashm, std::string &plaintext, std::string &password) 
+	EventReturn OnCheckPassword(const std::string &hashm, std::string &plaintext, std::string &password)
 	{
 		if (hashm != "plain")
 			return EVENT_CONTINUE;
@@ -61,10 +61,10 @@ class ENone : public Module
 		this->OnEncrypt(plaintext, buf);
 		if(!password.compare(buf))
 		{
-			/* if we are NOT the first module in the list, 
+			/* if we are NOT the first module in the list,
 			 * we want to re-encrypt the pass with the new encryption
 			 */
-			if (Config.EncModuleList.front().compare(this->name))
+			if (Config.EncModuleList.front() == this->name)
 			{
 				enc_encrypt(plaintext, password);
 			}
diff --git a/src/core/enc_old.cpp b/src/core/enc_old.cpp
index 68eece13c..307e42316 100644
--- a/src/core/enc_old.cpp
+++ b/src/core/enc_old.cpp
@@ -385,10 +385,10 @@ class EOld : public Module
 		this->OnEncrypt(plaintext, buf);
 		if (!password.compare(buf))
 		{
-			/* if we are NOT the first module in the list, 
+			/* if we are NOT the first module in the list,
 			 * we want to re-encrypt the pass with the new encryption
 			 */
-			if (Config.EncModuleList.front().compare(this->name))
+			if (Config.EncModuleList.front() == this->name)
 			{
 				enc_encrypt(plaintext, password);
 			}
diff --git a/src/core/enc_sha1.cpp b/src/core/enc_sha1.cpp
index b4ac2a4e2..82c3f97a1 100644
--- a/src/core/enc_sha1.cpp
+++ b/src/core/enc_sha1.cpp
@@ -239,10 +239,10 @@ class ESHA1 : public Module
 		this->OnEncrypt(plaintext, buf);
 		if (!password.compare(buf))
 		{
-			/* when we are NOT the first module in the list, 
+			/* when we are NOT the first module in the list,
 			 * we want to re-encrypt the pass with the new encryption
 			 */
-			if (Config.EncModuleList.front().compare(this->name))
+			if (Config.EncModuleList.front() == this->name)
 			{
 				enc_encrypt(plaintext, password);
 			}
diff --git a/src/core/enc_sha256.cpp b/src/core/enc_sha256.cpp
index ef1ed7a00..7d29b43d2 100644
--- a/src/core/enc_sha256.cpp
+++ b/src/core/enc_sha256.cpp
@@ -156,7 +156,7 @@ class ESHA256 : public Module
 		return buf2;
 	}
 
-	/* splits the appended IV from the password string so it can be used for the next encryption */ 
+	/* splits the appended IV from the password string so it can be used for the next encryption */
 	/* password format:  <hashmethod>:<password_b64>:<iv_b64> */
 	void GetIVFromPass(std::string &password)
 	{
@@ -302,7 +302,7 @@ class ESHA256 : public Module
 		Alog(LOG_DEBUG_2) << "(enc_sha256) hashed password from [" << src << "] to [" << buf.str() << " ]";
 		dest.assign(buf.str());
 		return EVENT_ALLOW;
-		
+
 	}
 
 	EventReturn OnEncryptInPlace(std::string &buf)
@@ -310,14 +310,14 @@ class ESHA256 : public Module
 		return this->OnEncrypt(buf, buf);
 	}
 
-	EventReturn OnDecrypt(const std::string &hashm, std::string &src, std::string &dest) 
+	EventReturn OnDecrypt(const std::string &hashm, std::string &src, std::string &dest)
 	{
 		if (hashm != "sha256")
 			return EVENT_CONTINUE;
 		return EVENT_STOP;
 	}
 
-	EventReturn OnCheckPassword(const std::string &hashm, std::string &plaintext, std::string &password) 
+	EventReturn OnCheckPassword(const std::string &hashm, std::string &plaintext, std::string &password)
 	{
 		if (hashm != "sha256")
 			return EVENT_CONTINUE;
@@ -329,10 +329,10 @@ class ESHA256 : public Module
 
 		if(!password.compare(buf))
 		{
-			/* if we are NOT the first module in the list, 
+			/* if we are NOT the first module in the list,
 			 * we want to re-encrypt the pass with the new encryption
 			 */
-			if (Config.EncModuleList.front().compare(this->name))
+			if (Config.EncModuleList.front() == this->name)
 			{
 				enc_encrypt(plaintext, password );
 			}
diff --git a/src/core/ns_group.cpp b/src/core/ns_group.cpp
index ffb94296b..cc5da7860 100644
--- a/src/core/ns_group.cpp
+++ b/src/core/ns_group.cpp
@@ -27,7 +27,7 @@ class CommandNSGroup : public Command
 		NickAlias *na, *target;
 		const char *nick = params[0].c_str();
 		std::string pass = params[1].c_str();
-		std::list<std::pair<std::string, std::string> >::iterator it;
+		std::list<std::pair<ci::string, ci::string> >::iterator it;
 
 		if (Config.NSEmailReg && findrequestnick(u->nick))
 		{
@@ -51,7 +51,7 @@ class CommandNSGroup : public Command
 		{
 			for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it)
 			{
-				if (!is_oper(u) && u->nick.find(it->first) != std::string::npos)
+				if (!is_oper(u) && u->nick.find(it->first.c_str()) != std::string::npos)
 				{
 					notice_lang(Config.s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str());
 					return MOD_CONT;
@@ -183,7 +183,7 @@ class CommandNSUngroup : public Command
 			{
 				oldcore->aliases.erase(it);
 			}
-			
+
 			if (!stricmp(oldcore->display, na->nick))
 			{
 				change_core_display(oldcore);
@@ -255,7 +255,7 @@ class CommandNSGList : public Command
 			for (std::list<NickAlias *>::iterator it = nc->aliases.begin(); it != nc->aliases.end(); ++it)
 			{
 				NickAlias *na2 = *it;
-				
+
 				if (!(wont_expire = na2->HasFlag(NS_NO_EXPIRE)))
 				{
 					expt = na2->last_seen + Config.NSExpire;
diff --git a/src/core/ns_register.cpp b/src/core/ns_register.cpp
index f8bf1691f..26b8976b1 100644
--- a/src/core/ns_register.cpp
+++ b/src/core/ns_register.cpp
@@ -85,7 +85,7 @@ class CommandNSConfirm : public Command
 				validate_user(user);
 			}
 		}
-		
+
 		FOREACH_MOD(I_OnNickRegister, OnNickRegister(na));
 
 		return MOD_CONT;
@@ -196,7 +196,7 @@ class CommandNSRegister : public CommandNSConfirm
 				'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
 				'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
 			};
-		std::list<std::pair<std::string, std::string> >::iterator it;
+		std::list<std::pair<ci::string, ci::string> >::iterator it;
 
 		if (readonly)
 		{
@@ -237,7 +237,7 @@ class CommandNSRegister : public CommandNSConfirm
 		{
 			for (it = Config.Opers.begin(); it != Config.Opers.end(); ++it)
 			{
-				std::string nick = it->first;
+				ci::string nick = it->first;
 
 				if (stristr(u->nick.c_str(), nick.c_str()) && !is_oper(u))
 				{
diff --git a/src/core/os_staff.cpp b/src/core/os_staff.cpp
index 930f8db7b..842791187 100644
--- a/src/core/os_staff.cpp
+++ b/src/core/os_staff.cpp
@@ -25,10 +25,10 @@ class CommandOSStaff : public Command
 	{
 		notice_lang(Config.s_OperServ, u, OPER_STAFF_LIST_HEADER);
 
-		for (std::list<std::pair<std::string, std::string> >::iterator it = Config.Opers.begin(); it != Config.Opers.end(); ++it)
+		for (std::list<std::pair<ci::string, ci::string> >::iterator it = Config.Opers.begin(); it != Config.Opers.end(); ++it)
 		{
 			int found = 0;
-			std::string nick = it->first, type = it->second;
+			ci::string nick = it->first, type = it->second;
 
 			NickAlias *na = findnick(nick);
 			if (na)