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/Clist_nicer/src/clui.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'plugins/Clist_nicer/src/clui.cpp')

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 0b166c5937..c066d54371 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -2010,8 +2010,8 @@ static clistFontDescr[] = {
 void FS_RegisterFonts()
 {
 	FontIDT fid = { sizeof(fid) };
-	mir_tstrncpy(fid.group, LPGENT("Contact list"), SIZEOF(fid.group));
-	mir_strncpy(fid.dbSettingsGroup, "CLC", 5);
+	_tcsncpy(fid.group, LPGENT("Contact list"), SIZEOF(fid.group));
+	strncpy(fid.dbSettingsGroup, "CLC", 5);
 	fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS | FIDF_APPENDNAME | FIDF_SAVEPOINTSIZE;
 
 	HDC hdc = GetDC(NULL);
@@ -2028,11 +2028,11 @@ void FS_RegisterFonts()
 		fid.flags &= ~FIDF_CLASSMASK;
 		fid.flags |= clistFontDescr[i].iMask;
 
-		mir_tstrncpy(fid.name, clistFontDescr[i].tszName, SIZEOF(fid.name));
+		_tcsncpy(fid.name, clistFontDescr[i].tszName, SIZEOF(fid.name));
 		
 		char idstr[10];
 		mir_snprintf(idstr, SIZEOF(idstr), "Font%d", i);
-		mir_strncpy(fid.prefix, idstr, SIZEOF(fid.prefix));
+		strncpy(fid.prefix, idstr, SIZEOF(fid.prefix));
 		fid.order = i;
 		FontRegisterT(&fid);
 	}
@@ -2042,35 +2042,35 @@ void FS_RegisterFonts()
 	ColourIDT colourid = {0};
 	colourid.cbSize = sizeof(colourid);
 	colourid.order = 0;
-	mir_strncpy(colourid.dbSettingsGroup, "CLC", sizeof(colourid.dbSettingsGroup));
+	strncpy(colourid.dbSettingsGroup, "CLC", sizeof(colourid.dbSettingsGroup));
 
-	mir_strncpy(colourid.setting, "BkColour", sizeof(colourid.setting));
-	mir_tstrncpy(colourid.name, LPGENT("Background"), SIZEOF(colourid.name));
-	mir_tstrncpy(colourid.group, LPGENT("Contact list"), SIZEOF(colourid.group));
+	strncpy(colourid.setting, "BkColour", sizeof(colourid.setting));
+	_tcsncpy(colourid.name, LPGENT("Background"), SIZEOF(colourid.name));
+	_tcsncpy(colourid.group, LPGENT("Contact list"), SIZEOF(colourid.group));
 	colourid.defcolour = CLCDEFAULT_BKCOLOUR;
 	ColourRegisterT(&colourid);
 
-	mir_strncpy(colourid.setting, "SelTextColour", sizeof(colourid.setting));
-	mir_tstrncpy(colourid.name, LPGENT("Selected text"), SIZEOF(colourid.name));
+	strncpy(colourid.setting, "SelTextColour", sizeof(colourid.setting));
+	_tcsncpy(colourid.name, LPGENT("Selected text"), SIZEOF(colourid.name));
 	colourid.order = 1;
 	colourid.defcolour = CLCDEFAULT_SELTEXTCOLOUR;
 	ColourRegisterT(&colourid);
 
-	mir_strncpy(colourid.setting, "HotTextColour", sizeof(colourid.setting));
-	mir_tstrncpy(colourid.name, LPGENT("Hottrack text"), SIZEOF(colourid.name));
+	strncpy(colourid.setting, "HotTextColour", sizeof(colourid.setting));
+	_tcsncpy(colourid.name, LPGENT("Hottrack text"), SIZEOF(colourid.name));
 	colourid.order = 1;
 	colourid.defcolour = CLCDEFAULT_HOTTEXTCOLOUR;
 	ColourRegisterT(&colourid);
 
-	mir_strncpy(colourid.setting, "QuickSearchColour", sizeof(colourid.setting));
-	mir_tstrncpy(colourid.name, LPGENT("Quicksearch text"), SIZEOF(colourid.name));
+	strncpy(colourid.setting, "QuickSearchColour", sizeof(colourid.setting));
+	_tcsncpy(colourid.name, LPGENT("Quicksearch text"), SIZEOF(colourid.name));
 	colourid.order = 1;
 	colourid.defcolour = CLCDEFAULT_QUICKSEARCHCOLOUR;
 	ColourRegisterT(&colourid);
 
-	mir_strncpy(colourid.dbSettingsGroup, "CLUI", sizeof(colourid.dbSettingsGroup));
-	mir_strncpy(colourid.setting, "clr_frameborder", sizeof(colourid.setting));
-	mir_tstrncpy(colourid.name, LPGENT("Embedded frames border"), SIZEOF(colourid.name));
+	strncpy(colourid.dbSettingsGroup, "CLUI", sizeof(colourid.dbSettingsGroup));
+	strncpy(colourid.setting, "clr_frameborder", sizeof(colourid.setting));
+	_tcsncpy(colourid.name, LPGENT("Embedded frames border"), SIZEOF(colourid.name));
 	colourid.order = 1;
 	colourid.defcolour = RGB(40, 40, 40);
 	ColourRegisterT(&colourid);
-- 
cgit v1.2.3