- Another portion of _T replacement and fixes of previous commits (patch from person)

git-svn-id: http://svn.miranda-ng.org/main/trunk@3173 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 23 insertions, 23 deletions

diff --git a/plugins/SpellChecker/src/dictionary.cpp b/plugins/SpellChecker/src/dictionary.cpp
index b6bf37a655..88ffde5215 100644
--- a/plugins/SpellChecker/src/dictionary.cpp
+++ b/plugins/SpellChecker/src/dictionary.cpp
@@ -56,9 +56,9 @@ protected:
 	void loadCustomDict()

 	{

 		TCHAR filename[1024];

-		mir_sntprintf(filename, SIZEOF(filename), L"%s\\%s.cdic", userPath, language);

+		mir_sntprintf(filename, SIZEOF(filename), _T("%s\\%s.cdic"), userPath, language);

 

-		FILE *file = _tfopen(filename, L"rb");

+		FILE *file = _tfopen(filename, _T("rb"));

 		if (file != NULL) 

 		{

 			char tmp[1024];

@@ -91,9 +91,9 @@ protected:
 		CreateDirectoryTreeT(userPath);

 

 		TCHAR filename[1024];

-		mir_sntprintf(filename, SIZEOF(filename), L"%s\\%s.cdic", userPath, language);

+		mir_sntprintf(filename, SIZEOF(filename), _T("%s\\%s.cdic"), userPath, language);

 

-		FILE *file = _tfopen(filename, L"ab");

+		FILE *file = _tfopen(filename, _T("ab"));

 		if (file != NULL) 

 		{

 			char tmp[1024];

@@ -458,7 +458,7 @@ BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString)
 	GetLocaleInfo(MAKELCID(langID, 0), LOCALE_SISO3166CTRYNAME, end, SIZEOF(end));

 

 	TCHAR name[64];

-	mir_sntprintf(name, SIZEOF(name), L"%s_%s", ini, end);

+	mir_sntprintf(name, SIZEOF(name), _T("%s_%s"), ini, end);

 

 	for(int i = 0; i < tmp_dicts->getCount(); i++)

 	{

@@ -482,7 +482,7 @@ BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString)
 

 				TCHAR name[1024];

 				if (country[0] != 0)

-					mir_sntprintf(name, SIZEOF(name), L"%s (%s)", dict->english_name, country);

+					mir_sntprintf(name, SIZEOF(name), _T("%s (%s)"), dict->english_name, country);

 				else

 					lstrcpyn(name, dict->english_name, SIZEOF(name));

 

@@ -491,7 +491,7 @@ BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString)
 

 			if (dict->localized_name[0] != 0)

 			{

-				mir_sntprintf(dict->full_name, SIZEOF(dict->full_name), L"%s [%s]", dict->localized_name, dict->language);

+				mir_sntprintf(dict->full_name, SIZEOF(dict->full_name), _T("%s [%s]"), dict->localized_name, dict->language);

 			}

 			break;

 		}

@@ -537,7 +537,7 @@ void GetDictsInfo(LIST<Dictionary> &dicts)
 

 			if (dict->localized_name[0] != _T('\0'))

 			{

-				mir_sntprintf(dict->full_name, SIZEOF(dict->full_name), L"%s [%s]", dict->localized_name, dict->language);

+				mir_sntprintf(dict->full_name, SIZEOF(dict->full_name), _T("%s [%s]"), dict->localized_name, dict->language);

 			}

 			else

 			{

@@ -552,7 +552,7 @@ void GetHunspellDictionariesFromFolder(LIST<Dictionary> &dicts, TCHAR *path, TCH
 {

 	// Load the language files and create an array with then

 	TCHAR file[1024];

-	mir_sntprintf(file, SIZEOF(file), L"%s\\*.dic", path);

+	mir_sntprintf(file, SIZEOF(file), _T("%s\\*.dic"), path);

 

 	BOOL found = FALSE;

 

@@ -562,7 +562,7 @@ void GetHunspellDictionariesFromFolder(LIST<Dictionary> &dicts, TCHAR *path, TCH
 	{

 		do

 		{

-			mir_sntprintf(file, SIZEOF(file), L"%s\\%s", path, ffd.cFileName);

+			mir_sntprintf(file, SIZEOF(file), _T("%s\\%s"), path, ffd.cFileName);

 

 			// Check .dic

 			DWORD attrib = GetFileAttributes(file);

@@ -570,7 +570,7 @@ void GetHunspellDictionariesFromFolder(LIST<Dictionary> &dicts, TCHAR *path, TCH
 				continue;

 

 			// See if .aff exists too

-			lstrcpy(&file[lstrlen(file) - 4], L".aff");

+			lstrcpy(&file[lstrlen(file) - 4], _T(".aff"));

 			attrib = GetFileAttributes(file);

 			if (attrib == 0xFFFFFFFF || (attrib & FILE_ATTRIBUTE_DIRECTORY))

 				continue;

@@ -613,11 +613,11 @@ void GetAvaibleDictionaries(LIST<Dictionary> &dicts, TCHAR *path, TCHAR *user_pa
 

 	if (opts.use_other_apps_dicts)

 	{

-		TCHAR *otherHunspellApps[] = { L"Thunderbird", L"thunderbird.exe", 

-									   L"Firefox", L"firefox.exe" };

+		TCHAR *otherHunspellApps[] = { _T("Thunderbird"), _T("thunderbird.exe"),

+									   _T("Firefox"), _T("firefox.exe") };

 

-#define APPPATH  L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s"

-#define MUICACHE L"Software\\Microsoft\\Windows\\ShellNoRoam\\MUICache"

+#define APPPATH  _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s")

+#define MUICACHE _T("Software\\Microsoft\\Windows\\ShellNoRoam\\MUICache")

 

 		// Get other apps dicts

 		for (int i = 0; i < SIZEOF(otherHunspellApps); i += 2)

@@ -630,7 +630,7 @@ void GetAvaibleDictionaries(LIST<Dictionary> &dicts, TCHAR *path, TCHAR *user_pa
 			if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE, key, 0, KEY_QUERY_VALUE, &hKey))

 			{

 				DWORD size = SIZEOF(key);

-				lResult = RegQueryValueEx(hKey, L"Path", NULL, NULL, (LPBYTE)key, &size);

+				lResult = RegQueryValueEx(hKey, _T("Path"), NULL, NULL, (LPBYTE)key, &size);

 				RegCloseKey(hKey);

 			}

 			else 

@@ -668,7 +668,7 @@ void GetAvaibleDictionaries(LIST<Dictionary> &dicts, TCHAR *path, TCHAR *user_pa
 			if (ERROR_SUCCESS == lResult)

 			{

 				TCHAR folder[1024];

-				mir_sntprintf(folder, SIZEOF(folder), L"%s\\Dictionaries", key);

+				mir_sntprintf(folder, SIZEOF(folder), _T("%s\\Dictionaries"), key);

 

 				GetHunspellDictionariesFromFolder(languages, folder, user_path, otherHunspellApps[i]);

 			}       

diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp
index fa3fee8bad..e4a6ec0855 100644
--- a/plugins/SpellChecker/src/spellchecker.cpp
+++ b/plugins/SpellChecker/src/spellchecker.cpp
@@ -127,17 +127,17 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 		hDictionariesFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Dictionaries"), DICTIONARIES_FOLDER);
 
 		dictionariesFolder = (TCHAR *) mir_alloc(sizeof(TCHAR) * MAX_PATH);
-		FoldersGetCustomPathT(hDictionariesFolder, dictionariesFolder, MAX_PATH, L".");
+		FoldersGetCustomPathT(hDictionariesFolder, dictionariesFolder, MAX_PATH, _T("."));
 
 		hCustomDictionariesFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Custom Dictionaries"), CUSTOM_DICTIONARIES_FOLDER);
 
 		customDictionariesFolder = (TCHAR *) mir_alloc(sizeof(TCHAR) * MAX_PATH);
-		FoldersGetCustomPathT(hCustomDictionariesFolder, customDictionariesFolder, MAX_PATH, L".");
+		FoldersGetCustomPathT(hCustomDictionariesFolder, customDictionariesFolder, MAX_PATH, _T("."));
 		
 		hFlagsDllFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Flags DLL"), FLAGS_DLL_FOLDER);
 
 		flagsDllFolder = (TCHAR *) mir_alloc(sizeof(TCHAR) * MAX_PATH);
-		FoldersGetCustomPathT(hFlagsDllFolder, flagsDllFolder, MAX_PATH, L".");
+		FoldersGetCustomPathT(hFlagsDllFolder, flagsDllFolder, MAX_PATH, _T("."));
 	}
 	else {
 		dictionariesFolder = Utils_ReplaceVarsT(DICTIONARIES_FOLDER);
@@ -154,7 +154,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	if (opts.use_flags) {
 		// Load flags dll
 		TCHAR flag_file[MAX_PATH];
-		mir_sntprintf(flag_file, SIZEOF(flag_file), L"%s\\flags_icons.dll", flagsDllFolder);
+		mir_sntprintf(flag_file, SIZEOF(flag_file), _T("%s\\flags_icons.dll"), flagsDllFolder);
 		HMODULE hFlagsDll = LoadLibraryEx(flag_file, NULL, LOAD_LIBRARY_AS_DATAFILE);
 
 		TCHAR path[MAX_PATH];
@@ -162,7 +162,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 
 		SKINICONDESC sid = { sizeof(sid) };
 		sid.flags = SIDF_ALL_TCHAR | SIDF_SORTED;
-		sid.ptszSection = L"Spell Checker/Flags";
+		sid.ptszSection = _T("Spell Checker/Flags");
 
 		// Get language flags
 		for(int i = 0; i < languages.getCount(); i++) {
@@ -203,7 +203,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 		Dictionary *dict = languages[j];
 
 		TCHAR filename[MAX_PATH];
-		mir_sntprintf(filename, MAX_PATH, L"%s\\%s.ar", customDictionariesFolder, dict->language);
+		mir_sntprintf(filename, MAX_PATH, _T("%s\\%s.ar"), customDictionariesFolder, dict->language);
 		dict->autoReplace = new AutoReplaceMap(filename, dict);
 
 		if (lstrcmp(dict->language, opts.default_language) == 0)