From 2a815f8820ca402626bd283dd5b75744ddeb9812 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 23 May 2015 18:55:59 +0000
Subject: mir_tstrncpy <> _tcsncpy

git-svn-id: http://svn.miranda-ng.org/main/trunk@13791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/NotesAndReminders/src/options.cpp   | 26 +++++++++++++-------------
 plugins/NotesAndReminders/src/reminders.cpp |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'plugins/NotesAndReminders')

diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 5cf90eee22..20ac2bab12 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -230,9 +230,9 @@ void RegisterFontServiceFonts()
 	FontIDT fontid = {0};
 	fontid.cbSize = sizeof(FontIDT);
 
-    mir_tstrncpy(fontid.group, _T(SECTIONNAME), SIZEOF(fontid.group));
-    mir_tstrncpy(fontid.backgroundGroup, _T(SECTIONNAME), SIZEOF(fontid.backgroundGroup) );
-	mir_strncpy(fontid.dbSettingsGroup, MODULENAME, SIZEOF(fontid.dbSettingsGroup));
+    _tcsncpy(fontid.group, _T(SECTIONNAME), SIZEOF(fontid.group));
+    _tcsncpy(fontid.backgroundGroup, _T(SECTIONNAME), SIZEOF(fontid.backgroundGroup) );
+	strncpy(fontid.dbSettingsGroup, MODULENAME, SIZEOF(fontid.dbSettingsGroup));
 	fontid.flags = FIDF_ALLOWREREGISTER | FIDF_DEFAULTVALID | FIDF_SAVEPOINTSIZE;
 
 	HDC hDC = GetDC(NULL);
@@ -243,8 +243,8 @@ void RegisterFontServiceFonts()
 	{
 		fontid.order = i;
 		mir_snprintf(szTemp, SIZEOF(szTemp), "Font%d", i);
-		mir_strncpy(fontid.prefix, szTemp, SIZEOF(fontid.prefix));
-		mir_tstrncpy(fontid.name, fontOptionsList[i].szDescr, SIZEOF(fontid.name));
+		strncpy(fontid.prefix, szTemp, SIZEOF(fontid.prefix));
+		_tcsncpy(fontid.name, fontOptionsList[i].szDescr, SIZEOF(fontid.name));
 		fontid.deffontsettings.colour = fontOptionsList[i].defColour;
 
 		fontid.deffontsettings.size = (char)-MulDiv(fontOptionsList[i].defSize, nFontScale, 72);
@@ -252,8 +252,8 @@ void RegisterFontServiceFonts()
 
 		fontid.deffontsettings.style = fontOptionsList[i].defStyle;
 		fontid.deffontsettings.charset = MsgDlgGetFontDefaultCharset(fontOptionsList[i].szDefFace);
-		mir_tstrncpy(fontid.deffontsettings.szFace, fontOptionsList[i].szDefFace, SIZEOF(fontid.deffontsettings.szFace));
-		mir_tstrncpy(fontid.backgroundName, fontOptionsList[i].szBkgName, SIZEOF(fontid.backgroundName));
+		_tcsncpy(fontid.deffontsettings.szFace, fontOptionsList[i].szDefFace, SIZEOF(fontid.deffontsettings.szFace));
+		_tcsncpy(fontid.backgroundName, fontOptionsList[i].szBkgName, SIZEOF(fontid.backgroundName));
 
 		FontRegisterT(&fontid);
 	}
@@ -261,16 +261,16 @@ void RegisterFontServiceFonts()
 	ColourIDT colorid = {0};
 	colorid.cbSize = sizeof(ColourIDT);
 
-	mir_tstrncpy(colorid.group, _T(SECTIONNAME), SIZEOF(colorid.group));
-	mir_strncpy(colorid.dbSettingsGroup, MODULENAME, SIZEOF(fontid.dbSettingsGroup));
+	_tcsncpy(colorid.group, _T(SECTIONNAME), SIZEOF(colorid.group));
+	strncpy(colorid.dbSettingsGroup, MODULENAME, SIZEOF(fontid.dbSettingsGroup));
 	colorid.flags = 0;
 
 	for (int i = 0; i < SIZEOF(colourOptionsList); i++)
 	{
 		colorid.order = i;
-		mir_tstrncpy(colorid.name, colourOptionsList[i].szName, SIZEOF(colorid.name));
+		_tcsncpy(colorid.name, colourOptionsList[i].szName, SIZEOF(colorid.name));
 		colorid.defcolour = colourOptionsList[i].defColour;
-		mir_strncpy(colorid.setting, colourOptionsList[i].szSettingName, SIZEOF(colorid.setting));
+		strncpy(colorid.setting, colourOptionsList[i].szSettingName, SIZEOF(colorid.setting));
 
 		ColourRegisterT(&colorid);
 	}
@@ -284,8 +284,8 @@ void LoadNRFont(int i, LOGFONT *lf, COLORREF *colour)
     FontIDT fontid = {0};
 
     fontid.cbSize = sizeof(fontid);
-    mir_tstrncpy(fontid.group, LPGENT(SECTIONNAME), SIZEOF(fontid.group));
-    mir_tstrncpy(fontid.name, fontOptionsList[i].szDescr, SIZEOF(fontid.name));
+    _tcsncpy(fontid.group, LPGENT(SECTIONNAME), SIZEOF(fontid.group));
+    _tcsncpy(fontid.name, fontOptionsList[i].szDescr, SIZEOF(fontid.name));
 
     COLORREF col = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf);
 
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 8af81e76ec..49a8530db7 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -801,7 +801,7 @@ BOOL CheckRemindersAndStart(void)
 					char* S2 = strchr(g_RemindSMS, '@');
 					char* S1 = (char*)malloc(S2 - g_RemindSMS);
 
-					mir_strncpy(S1, g_RemindSMS, S2 - g_RemindSMS);
+					strncpy(S1, g_RemindSMS, S2 - g_RemindSMS);
 					S1[S2 - g_RemindSMS]= 0x0;
 					S2++;
 					Send(S1, S2, pReminder->Reminder ? pReminder->Reminder : "", NULL);
-- 
cgit v1.2.3