TimeZone_ToStringT - obsolete macro removed

10 files changed, 13 insertions, 15 deletions

diff --git a/include/m_timezones.h b/include/m_timezones.h
index f9e3fb5b08..466774fd58 100644
--- a/include/m_timezones.h
+++ b/include/m_timezones.h
@@ -134,6 +134,4 @@ EXTERN_C MIR_CORE_DLL(uint32_t) TimeZone_ToLocal(uint32_t);
 EXTERN_C MIR_CORE_DLL(char*) TimeZone_ToString(mir_time timeVal, const char *szFormat, char *szDest, size_t cchDest);

 EXTERN_C MIR_CORE_DLL(wchar_t*) TimeZone_ToStringW(mir_time timeVal, const wchar_t *wszFormat, wchar_t *wszDest, size_t cchDest);

 

-#define TimeZone_ToStringT TimeZone_ToStringW

-

 #endif /* __M_TIMEZONES_H */

diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp
index 11da22cfb6..ef3548e0d0 100644
--- a/plugins/AvatarHistory/src/AvatarDlg.cpp
+++ b/plugins/AvatarHistory/src/AvatarDlg.cpp
@@ -420,7 +420,7 @@ int FillAvatarListFromDB(HWND list, MCONTACT hContact)
 

 		// Get time

 		wchar_t date[64];

-		TimeZone_ToStringT(dbei.timestamp, L"d s", date, _countof(date));

+		TimeZone_ToStringW(dbei.timestamp, L"d s", date, _countof(date));

 

 		// Get file in disk

 		wchar_t path[MAX_PATH];

diff --git a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
index 2977f5fedd..7d3b6d6f7f 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
@@ -147,7 +147,7 @@ int ExtractURI(DBEVENTINFO *dbei, MEVENT hEvent, LISTELEMENT *listStart)
 				wcsncpy_s(link, word, LINK_MAX);

 			}

 

-			TimeZone_ToStringT(dbei->timestamp, L"d-t", dbdate, _countof(dbdate));

+			TimeZone_ToStringW(dbei->timestamp, L"d-t", dbdate, _countof(dbdate));

 			date_ptr = wcstok_s(dbdate, L"-", &tok_ctx);

 			time_ptr = wcstok_s(nullptr, L"-", &tok_ctx);

 			wcsncpy_s(date, date_ptr, _TRUNCATE);

diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index eada37b35c..0c83b98d07 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -82,7 +82,7 @@ char *TemplateHTMLBuilder::timestampToString(uint32_t dwFlags, time_t check, int
 	wchar_t str[300];

 

 	if (mode) // time

-		TimeZone_ToStringT(check, (dwFlags & Options::LOG_SHOW_SECONDS) ? L"s" : L"t", str, _countof(str));

+		TimeZone_ToStringW(check, (dwFlags & Options::LOG_SHOW_SECONDS) ? L"s" : L"t", str, _countof(str));

 	else { // date

 		struct tm tm_now, tm_today;

 		time_t now = time(0);

@@ -96,7 +96,7 @@ char *TemplateHTMLBuilder::timestampToString(uint32_t dwFlags, time_t check, int
 		else if (dwFlags & Options::LOG_RELATIVE_DATE && check > (today - 86400))

 			wcsncpy(str, TranslateT("Yesterday"), _countof(str));

 		else

-			TimeZone_ToStringT(check, (dwFlags & Options::LOG_LONG_DATE) ? L"D" : L"d", str, _countof(str));

+			TimeZone_ToStringW(check, (dwFlags & Options::LOG_LONG_DATE) ? L"D" : L"d", str, _countof(str));

 	}

 

 	mir_strncpy(szResult, T2Utf(str), 500);

diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp
index 6663254e73..4d0e84718f 100644
--- a/plugins/ListeningTo/src/listeningto.cpp
+++ b/plugins/ListeningTo/src/listeningto.cpp
@@ -411,7 +411,7 @@ static void ReplaceVars(CMStringW &buffer, MCONTACT hContact, wchar_t **variable
 	buffer.Replace(L"%contact%", Clist_GetContactDisplayName(hContact));

 	

 	wchar_t tmp[128];

-	TimeZone_ToStringT(time(0), L"d s", tmp, _countof(tmp));

+	TimeZone_ToStringW(time(0), L"d s", tmp, _countof(tmp));

 	buffer.Replace(L"%date%", tmp);

 

 	for (int k = 0; k < numVariables; k += 2) {

diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 36c3f92d52..1c78003bea 100644
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -708,7 +708,7 @@ static bool ExportDBEventInfo(MCONTACT hContact, HANDLE hFile, const wstring &sF
 	// Get time stamp 

 	int nIndent = mir_snwprintf(szTemp, L"%-*s", (int)nFirstColumnWidth, dbei.flags & DBEF_SENT ? sLocalUser.c_str() : sRemoteUser.c_str());

 

-	TimeZone_ToStringT(dbei.timestamp, g_sTimeFormat.c_str(), &szTemp[nIndent], _countof(szTemp) - nIndent - 2);

+	TimeZone_ToStringW(dbei.timestamp, g_sTimeFormat.c_str(), &szTemp[nIndent], _countof(szTemp) - nIndent - 2);

 

 	nIndent = (int)mir_wstrlen(szTemp);

 	szTemp[nIndent++] = ' ';

diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index a4c1b103bf..e02ab97999 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -718,7 +718,7 @@ void PopupWnd2::updateData(POPUPDATA2 *ppd)
 

 	if (m_options->bDisplayTime) {

 		if (ppd->dwTimestamp)

-			TimeZone_ToStringT(ppd->dwTimestamp, L"t", m_time, _countof(m_time));

+			TimeZone_ToStringW(ppd->dwTimestamp, L"t", m_time, _countof(m_time));

 		else

 			GetTimeFormat(LOCALE_USER_DEFAULT, 0, nullptr, L"HH':'mm", m_time, _countof(m_time));

 	}

diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp
index e2ffcdba4e..035e90cff6 100644
--- a/plugins/TipperYM/src/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
@@ -135,7 +135,7 @@ void FormatTimestamp(uint32_t ts, char *szFormat, wchar_t *buff, int bufflen)
 {
 	wchar_t swzForm[16];
 	a2t(szFormat, swzForm, 16);
-	TimeZone_ToStringT(ts, swzForm, buff, bufflen);
+	TimeZone_ToStringW(ts, swzForm, buff, bufflen);
 }
 
 bool Uid(MCONTACT hContact, char *szProto, wchar_t *buff, int bufflen)
diff --git a/plugins/TipperYM/src/translations.cpp b/plugins/TipperYM/src/translations.cpp
index 3e457337bf..aeba35e523 100644
--- a/plugins/TipperYM/src/translations.cpp
+++ b/plugins/TipperYM/src/translations.cpp
@@ -160,7 +160,7 @@ wchar_t* TimestampToShortDate(MCONTACT hContact, const char *szModuleName, const
 	if (ts == 0)

 		return nullptr;

 

-	return TimeZone_ToStringT(ts, L"d", buff, bufflen);

+	return TimeZone_ToStringW(ts, L"d", buff, bufflen);

 }

 

 wchar_t* TimestampToLongDate(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen)

@@ -169,7 +169,7 @@ wchar_t* TimestampToLongDate(MCONTACT hContact, const char *szModuleName, const
 	if (ts == 0)

 		return nullptr;

 

-	return TimeZone_ToStringT(ts, L"D", buff, bufflen);

+	return TimeZone_ToStringW(ts, L"D", buff, bufflen);

 }

 

 wchar_t* TimestampToTime(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen)

@@ -178,7 +178,7 @@ wchar_t* TimestampToTime(MCONTACT hContact, const char *szModuleName, const char
 	if (ts == 0)

 		return nullptr;

 

-	return TimeZone_ToStringT(ts, L"s", buff, bufflen);

+	return TimeZone_ToStringW(ts, L"s", buff, bufflen);

 }

 

 wchar_t* TimestampToTimeNoSecs(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen)

@@ -187,7 +187,7 @@ wchar_t* TimestampToTimeNoSecs(MCONTACT hContact, const char *szModuleName, cons
 	if (ts == 0)

 		return nullptr;

 

-	return TimeZone_ToStringT(ts, L"t", buff, bufflen);

+	return TimeZone_ToStringW(ts, L"t", buff, bufflen);

 }

 

 wchar_t* TimestampToTimeDifference(MCONTACT hContact, const char *szModuleName, const char *szSettingName, wchar_t *buff, int bufflen)

diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index 1a754bc4d8..7c15c9cc83 100644
--- a/plugins/Variables/src/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
@@ -606,7 +606,7 @@ static wchar_t* parseMirDateString(ARGUMENTSINFO *ai)
 	ai->flags |= AIF_DONTPARSE;

 

 	wchar_t ret[128];

-	return mir_wstrdup(TimeZone_ToStringT(time(0), L"d s", ret, _countof(ret)));

+	return mir_wstrdup(TimeZone_ToStringW(time(0), L"d s", ret, _countof(ret)));

 }

 

 static wchar_t* parseMirandaCoreVar(ARGUMENTSINFO *ai)