From d9ecab2dcd4ca334e1923d8c9beadeb3e231a4b8 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 18 Dec 2014 15:45:33 +0000
Subject: various calls of setlocale removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@11513 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/AdvaImg/src/LibJPEG/rdjpgcom.c | 10 ----------
plugins/Boltun/src/Engine/Mind.cpp | 1 -
plugins/BuddyExpectator/src/BuddyExpectator.cpp | 2 --
plugins/Clist_modern/src/modern_clui.cpp | 2 --
plugins/HistoryStats/src/utils.cpp | 2 --
plugins/MirOTR/libgpg-error-1.9/gpg-error.c | 9 ---------
plugins/MirandaG15/src/CAppletManager.cpp | 1 -
plugins/Spamotron/src/utils.cpp | 4 ++--
plugins/WebView/src/webview_alerts.cpp | 2 --
plugins/WebView/src/webview_getdata.cpp | 2 --
plugins/WhoUsesMyFiles/src/wumfplug.cpp | 2 --
11 files changed, 2 insertions(+), 35 deletions(-)
(limited to 'plugins')
diff --git a/plugins/AdvaImg/src/LibJPEG/rdjpgcom.c b/plugins/AdvaImg/src/LibJPEG/rdjpgcom.c
index ab09b443ff..3d72e38142 100644
--- a/plugins/AdvaImg/src/LibJPEG/rdjpgcom.c
+++ b/plugins/AdvaImg/src/LibJPEG/rdjpgcom.c
@@ -228,11 +228,6 @@ process_COM (int raw)
int ch;
int lastch = 0;
- /* Bill Allombert: set locale properly for isprint */
-#ifdef HAVE_LOCALE_H
- setlocale(LC_CTYPE, "");
-#endif
-
/* Get the marker parameter length count */
length = read_2_bytes();
/* Length includes itself, so must be at least 2 */
@@ -265,11 +260,6 @@ process_COM (int raw)
length--;
}
printf("\n");
-
- /* Bill Allombert: revert to C locale */
-#ifdef HAVE_LOCALE_H
- setlocale(LC_CTYPE, "C");
-#endif
}
diff --git a/plugins/Boltun/src/Engine/Mind.cpp b/plugins/Boltun/src/Engine/Mind.cpp
index d497da606d..1067711bdf 100644
--- a/plugins/Boltun/src/Engine/Mind.cpp
+++ b/plugins/Boltun/src/Engine/Mind.cpp
@@ -97,7 +97,6 @@ vector<tstring> Mind::Parse(tstring s)
void Mind::Load(tstring filename)
{
basic_ifstream<TCHAR, char_traits<TCHAR> > file;
- setlocale(LC_ALL, "");
locale ulocale(locale(), new MyCodeCvt);
file.imbue(ulocale);
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index 63bc61d4b8..ded191b288 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -670,8 +670,6 @@ extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);
- setlocale(LC_ALL, "English"); // Set English locale
-
InitOptions();
hContactReturnedAction = CreateServiceFunction("BuddyExpectator/actionReturned", ContactReturnedAction);
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index f06f9347bc..65b79e2627 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -163,8 +163,6 @@ void CLUI::cliOnCreateClc(void)
int CLUI::OnEvent_ModulesLoaded(WPARAM, LPARAM)
{
- setlocale(LC_ALL, ""); //fix for case insensitive comparing
-
cliCluiProtocolStatusChanged(0, 0);
SleepEx(0, TRUE);
g_flag_bOnModulesLoadedCalled = TRUE;
diff --git a/plugins/HistoryStats/src/utils.cpp b/plugins/HistoryStats/src/utils.cpp
index 0d7d617a34..7bf6146b8c 100644
--- a/plugins/HistoryStats/src/utils.cpp
+++ b/plugins/HistoryStats/src/utils.cpp
@@ -974,8 +974,6 @@ OS OS::m_Data;
void Locale::init()
{
- setlocale(LC_ALL, "");
-
m_Data.m_ThousandSep = utils::fromA(localeconv()->thousands_sep).c_str()[0];
m_Data.m_DecimalPoint = utils::fromA(localeconv()->decimal_point).c_str()[0];
m_Data.m_Grouping = localeconv()->grouping;
diff --git a/plugins/MirOTR/libgpg-error-1.9/gpg-error.c b/plugins/MirOTR/libgpg-error-1.9/gpg-error.c
index bed784994d..9cddb3d463 100644
--- a/plugins/MirOTR/libgpg-error-1.9/gpg-error.c
+++ b/plugins/MirOTR/libgpg-error-1.9/gpg-error.c
@@ -67,15 +67,6 @@ i18n_init (void)
#ifdef ENABLE_NLS
char *locale_dir;
-#ifdef HAVE_LC_MESSAGES
- setlocale (LC_TIME, "");
- setlocale (LC_MESSAGES, "");
-#else
-# ifndef HAVE_W32_SYSTEM
- setlocale (LC_ALL, "" );
-# endif
-#endif
-
/* Note that for this program we would only need the textdomain call
because libgpg-error already initializes itself to its locale dir
(via gpg_err_init or a constructor). However this is only done
diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index 7ba8bc566c..a6456866f8 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -544,7 +544,6 @@ tstring CAppletManager::GetFormattedTimestamp(tm *tm_time)
localtime_s(&tm_now,&now);
TCHAR buffer[128];
- setlocale( LC_ALL, "" );
if(tm_time->tm_mday != tm_now.tm_mday || tm_time->tm_mon != tm_now.tm_mon)
{
diff --git a/plugins/Spamotron/src/utils.cpp b/plugins/Spamotron/src/utils.cpp
index 7d70522e45..345f3316ce 100644
--- a/plugins/Spamotron/src/utils.cpp
+++ b/plugins/Spamotron/src/utils.cpp
@@ -6,7 +6,7 @@ TCHAR *_tcstolower(TCHAR *dst)
{
if (dst == NULL)
return NULL;
- setlocale(LC_ALL, "");
+
SIZE_T dst_len = _tcslen(dst);
for (SIZE_T i = 0; i < dst_len; i ++)
dst[i] = _totlower(dst[i]);
@@ -17,7 +17,7 @@ TCHAR *_tcstoupper(TCHAR *dst)
{
if (dst == NULL)
return NULL;
- setlocale(LC_ALL, "");
+
SIZE_T dst_len = _tcslen(dst);
for (SIZE_T i = 0; i < dst_len; i ++)
dst[i] = _totupper(dst[i]);
diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index e583c4ed4e..8592a9ac9c 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -234,8 +234,6 @@ void SaveToFile(MCONTACT hContact, char *truncated)
char timestring[128], timeprefix[32];
char temptime1[32], temptime2[32];
- setlocale(LC_ALL, "");
-
time_t ftime = time(NULL);
struct tm *nTime = localtime(&ftime);
diff --git a/plugins/WebView/src/webview_getdata.cpp b/plugins/WebView/src/webview_getdata.cpp
index 3b5fe09db2..c53d01f15d 100644
--- a/plugins/WebView/src/webview_getdata.cpp
+++ b/plugins/WebView/src/webview_getdata.cpp
@@ -274,8 +274,6 @@ void GetData(void *param)
time_t ftime;
struct tm *nTime;
- setlocale(LC_ALL, "");
-
if (!db_get_s(hContact, MODULENAME, PRESERVE_NAME_KEY, &dbv)) {
memset(&temptime, 0, sizeof(temptime));
memset(&tstr, 0, sizeof(tstr));
diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
index 5f0d3d405e..f2daa8b25f 100644
--- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp
+++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp
@@ -520,8 +520,6 @@ extern "C" __declspec(dllexport) int Load(void)
HookEvent(ME_OPT_INITIALISE,OptionsInit);
HookEvent(ME_TTB_MODULELOADED, InitTopToolbar);
- setlocale( LC_ALL, ".ACP");
-
if (IsUserAnAdmin())
SetTimer(NULL, 777, TIME, TimerProc);
else
--
cgit v1.2.3