From f019523879b2d8efd15ba9dec70e610b8bf95e1a Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Thu, 25 Oct 2007 20:26:44 +0000
Subject: [PATCH] Use boost for case insensitive comparison.

---
 src/core/common/avatarmanager.cpp | 17 ++++++-----------
 src/net/common/ircthread.cpp      | 10 ++--------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp
index a6e7669a..ab701767 100644
--- a/src/core/common/avatarmanager.cpp
+++ b/src/core/common/avatarmanager.cpp
@@ -18,12 +18,13 @@
  ***************************************************************************/
 
 #include "avatarmanager.h"
+#include <net/socket_msg.h>
+#include <core/loghelper.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/lambda/lambda.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 #include <openssl/md5.h>
-#include <net/socket_msg.h>
-#include <core/loghelper.h>
 
 #include <fstream>
 #include <cstring>
@@ -37,12 +38,6 @@
 #define GIF_HEADER_SIZE (sizeof(GIF_HEADER_1) - 1)
 #define MAX_HEADER_SIZE PNG_HEADER_SIZE
 
-// Not using boost::algorithm here because of STL issues.
-#ifdef _MSC_VER
-#define STRCASECMP _stricmp
-#else
-#define STRCASECMP strcasecmp
-#endif
 
 using namespace std;
 using namespace boost::filesystem;
@@ -100,11 +95,11 @@ AvatarManager::OpenAvatarFileForChunkRead(const std::string &fileName, unsigned
 	{
 		path filePath(fileName);
 		string ext(extension(filePath));
-		if (STRCASECMP(ext.c_str(), ".png") == 0)
+		if (boost::algorithm::iequals(ext, ".png") == 0)
 			outFileType = AVATAR_FILE_TYPE_PNG;
-		else if (STRCASECMP(ext.c_str(), ".jpg") == 0 || STRCASECMP(ext.c_str(), ".jpeg") == 0)
+		else if (boost::algorithm::iequals(ext, ".jpg") == 0 || boost::algorithm::iequals(ext, ".jpeg") == 0)
 			outFileType = AVATAR_FILE_TYPE_JPG;
-		else if (STRCASECMP(ext.c_str(), ".gif") == 0)
+		else if (boost::algorithm::iequals(ext, ".gif") == 0)
 			outFileType = AVATAR_FILE_TYPE_GIF;
 		boost::shared_ptr<AvatarFileState> fileState(new AvatarFileState);
 		fileState->inputStream.open(fileName.c_str(), ios_base::in | ios_base::binary);
diff --git a/src/net/common/ircthread.cpp b/src/net/common/ircthread.cpp
index 3f837039..3ba2c862 100644
--- a/src/net/common/ircthread.cpp
+++ b/src/net/common/ircthread.cpp
@@ -22,6 +22,7 @@
 #include <net/socket_helper.h>
 #include <net/socket_msg.h>
 #include <libircclient.h>
+#include <boost/algorithm/string/predicate.hpp>
 #include <sstream>
 #include <cctype>
 #include <cstring>
@@ -30,13 +31,6 @@ using namespace std;
 
 #define IRC_WAIT_TERMINATION_MSEC 500
 
-// Not using boost::algorithm here because of STL issues.
-#ifdef _MSC_VER
-#define STRCASECMP _stricmp
-#else
-#define STRCASECMP strcasecmp
-#endif
-
 
 struct IrcContext
 {
@@ -163,7 +157,7 @@ irc_event_channel(irc_session_t *session, const char * /*irc_event*/, const char
 {
 	IrcContext *context = (IrcContext *) irc_get_ctx(session);
 
-	if (count >= 2 && STRCASECMP(context->channel.c_str(),params[0]) == 0) // check whether this message is for our channel
+	if (count >= 2 && boost::algorithm::iequals(context->channel, params[0]) == 0) // check whether this message is for our channel
 	{
 		// Signal the message (if any) to GUI.
 		if (*params[1] != 0)