<tchar.h> removed from <m_system.h>

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

3 files changed, 4 insertions, 7 deletions

diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index ddaaeef100..b914945698 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -206,7 +206,7 @@ tstring CAppletManager::TranslateString(wchar_t *szString, ...)
 
 	va_list body;
 	va_start(body, szString);
-	_vstprintf_s(out, _countof(out), szTranslatedString, body);
+	vswprintf_s(out, _countof(out), szTranslatedString, body);
 	va_end(body);
 	return out;
 }
diff --git a/plugins/MirandaG15/src/LCDFramework/misc.cpp b/plugins/MirandaG15/src/LCDFramework/misc.cpp
index 339b88e393..d71597c745 100644
--- a/plugins/MirandaG15/src/LCDFramework/misc.cpp
+++ b/plugins/MirandaG15/src/LCDFramework/misc.cpp
@@ -8,7 +8,7 @@ tstring tstringprintf(tstring strFormat,...) {
 	

 	int mlen = (int)strFormat.length()+128;

 	wchar_t *text = (wchar_t*)malloc(mlen*sizeof(wchar_t));

-	_vsntprintf(text,mlen,strFormat.c_str(),vlist);

+	_vsnwprintf(text,mlen,strFormat.c_str(),vlist);

 	va_end(vlist);

 

 	strFormat = text;

@@ -92,10 +92,7 @@ tstring toLower(const tstring &i_str)
   tstring str(i_str);

   for (size_t i = 0; i < str.size(); ++ i)

   {

-    if (_istlead(str[i]))

-      ++ i;

-    else

-      str[i] = tolower(str[i]);

+    str[i] = tolower(str[i]);

   }

   return str;

 }

diff --git a/plugins/MirandaG15/src/Miranda.cpp b/plugins/MirandaG15/src/Miranda.cpp
index 03d98766bf..39a13343fd 100644
--- a/plugins/MirandaG15/src/Miranda.cpp
+++ b/plugins/MirandaG15/src/Miranda.cpp
@@ -162,7 +162,7 @@ int Init(WPARAM, LPARAM)
 	{

 		if(CConfig::GetBoolSetting(SKIP_DRIVER_ERROR)) {

 			tstring text = L"Failed to initialize the LCD connection\n Make sure you have the newest Logitech drivers installed (>=1.03).\n";

-			tstring title = _T(APP_SHORTNAME);

+			tstring title = _A2W(APP_SHORTNAME);

 			MessageBox(NULL, text.c_str(), title.c_str(), MB_OK | MB_ICONEXCLAMATION);

 		}