From 5975b2d0903bd5df128d55e20cd27d7c13b4e46c Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Sat, 16 Jun 2012 17:42:08 +0000
Subject: another portion of "#ifdef Unicode" removal

git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SpellChecker/spellchecker.cpp | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

(limited to 'plugins/SpellChecker/spellchecker.cpp')

diff --git a/plugins/SpellChecker/spellchecker.cpp b/plugins/SpellChecker/spellchecker.cpp
index fdccd20b49..7207f4a71a 100644
--- a/plugins/SpellChecker/spellchecker.cpp
+++ b/plugins/SpellChecker/spellchecker.cpp
@@ -129,13 +129,11 @@ DEFINE_GUIDXXX(IID_ITextDocument,0x8CC497C0,0xA1DF,0x11CE,0x80,0x98,
 
 HICON IcoLib_LoadIcon(Dictionary *dict, BOOL copy)
 {
-#ifdef UNICODE
+
 	char lang[32];
 	WideCharToMultiByte(CP_ACP, 0, dict->language, -1, lang, sizeof(lang), NULL, NULL);
 	return IcoLib_LoadIcon(lang, copy);
-#else
-	return IcoLib_LoadIcon(dict->language, copy);
-#endif
+
 }
 
 
@@ -212,14 +210,10 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 		upd.szBetaUpdateURL = "http://pescuma.googlecode.com/files/spellchecker64.%VERSION%.zip";
 //		upd.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=";
 		upd.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Spell Checker (x64) ";
-#elif UNICODE
+#else
 		upd.szBetaUpdateURL = "http://pescuma.googlecode.com/files/spellcheckerW.%VERSION%.zip";
 		upd.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=3691";
 		upd.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Spell Checker (Unicode) ";
-#else
-		upd.szBetaUpdateURL = "http://pescuma.googlecode.com/files/spellchecker.%VERSION%.zip";
-		upd.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=3690";
-		upd.pbVersionPrefix = (BYTE *)"<span class=\"fileNameHeader\">Spell Checker (Ansi) ";
 #endif
 		upd.cpbVersionPrefix = (int)strlen((char *)upd.pbVersionPrefix);
 
@@ -291,13 +285,11 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 		for(int i = 0; i < languages.getCount(); i++)
 		{
 			sid.ptszDescription = languages[i]->full_name;
-#ifdef UNICODE
+
 			char lang[32];
 			mir_snprintf(lang, MAX_REGS(lang), "%S", languages[i]->language);
 			sid.pszName = lang;
-#else
-			sid.pszName = languages[i]->language;
-#endif
+
 
 			HICON hFlag = IcoLib_LoadIcon(sid.pszName);
 			if (hFlag != NULL)
@@ -2273,7 +2265,7 @@ TCHAR *lstrtrim(TCHAR *str)
 
 BOOL lstreq(TCHAR *a, TCHAR *b, size_t len)
 {
-#ifdef UNICODE
+
 	a = CharLower(_tcsdup(a));
 	b = CharLower(_tcsdup(b));
 	BOOL ret;
@@ -2284,12 +2276,7 @@ BOOL lstreq(TCHAR *a, TCHAR *b, size_t len)
 	free(a);
 	free(b);
 	return ret;
-#else
-	if (len > 0)
-		return !_tcsnicmp(a, b, len);
-	else
-		return !_tcsicmp(a, b);
-#endif
+
 }
 
 
-- 
cgit v1.2.3