timezone api migrated to mir_core

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

4 files changed, 10 insertions, 13 deletions

diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index a676957105..87d62a98b8 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -40,8 +40,6 @@ CLIST_INTERFACE corecli = { 0 };
 CLUIDATA g_CluiData = { 0 };

 int hLangpack;

 

-TIME_API tmi;

-

 static HRESULT SubclassClistInterface();

 static HRESULT CreateHookableEvents();

 int EventArea_UnloadModule();

@@ -77,7 +75,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 extern "C" __declspec(dllexport) int CListInitialise()

 {

 	mir_getLP(&pluginInfo);

-	mir_getTMI(&tmi);

 

 	g_dwMainThreadID = GetCurrentThreadId();

 	g_hMirApp = GetModuleHandleA("mir_app.dll");

diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index 218618edc2..f5128356ef 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -58,7 +58,7 @@ void Cache_GetTimezone(ClcData *dat, MCONTACT hContact)
 
 	if (dat && dat->hWnd == pcli->hwndContactTree) {
 		DWORD flags = dat->contact_time_show_only_if_different ? TZF_DIFONLY : 0;
-		pdnce->hTimeZone = tmi.createByContact(hContact, 0, flags);
+		pdnce->hTimeZone = TimeZone_CreateByContact(hContact, 0, flags);
 	}
 }
 
@@ -496,7 +496,7 @@ int Cache_GetLineText(
 		if (pdnce->hTimeZone) {
 			// Get pdnce time
 			text[0] = 0;
-			tmi.printDateTime(pdnce->hTimeZone, _T("t"), text, text_size, 0);
+			TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), text, text_size, 0);
 		}
 
 		return TEXT_CONTACT_TIME;
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 7c707492fe..a621838d29 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -1108,7 +1108,7 @@ void CLCPaint::_PaintRowItemsEx(HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact
 						TCHAR buf[70] = _T("");

 						mir_free_and_nil(pdnce->szSecondLineText);

 

-						tmi.printDateTime(pdnce->hTimeZone, _T("t"), buf, SIZEOF(buf), 0);

+						TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), buf, SIZEOF(buf), 0);

 						pdnce->szSecondLineText = mir_tstrdup(buf);

 					}

 

@@ -1136,7 +1136,7 @@ void CLCPaint::_PaintRowItemsEx(HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact
 						TCHAR buf[70] = _T("");

 						mir_free(pdnce->szThirdLineText);

 

-						tmi.printDateTime(pdnce->hTimeZone, _T("t"), buf, SIZEOF(buf), 0);

+						TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), buf, SIZEOF(buf), 0);

 						pdnce->szThirdLineText = mir_tstrdup(buf);

 					}

 

@@ -1417,7 +1417,7 @@ void CLCPaint::_PaintRowItemsEx(HWND hwnd, HDC hdcMem, ClcData *dat, ClcContact
 

 			case TC_TIME:

 				TCHAR szResult[80];

-				if (!tmi.printDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {

+				if (!TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {

 					// Select font

 					ChangeToFont(hdcMem, dat, FONTID_CONTACT_TIME, NULL);

 					ske_DrawText(hdcMem, szResult, (int)mir_tstrlen(szResult), &p_rect, DT_NOPREFIX | DT_SINGLELINE | (dat->text_rtl ? DT_RTLREADING : 0));

@@ -2163,7 +2163,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 				if (Drawing->type == CLCIT_CONTACT && dat->contact_time_show && pdnce->hTimeZone) {

 					TCHAR szResult[80];

 

-					if (!tmi.printDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {

+					if (!TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {

 						SIZE text_size;

 						RECT rc;

 

@@ -2351,7 +2351,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 				if (dat->second_line_type == TEXT_CONTACT_TIME && pdnce->hTimeZone) {

 					// Get contact time

 					TCHAR buf[70] = _T("");

-					tmi.printDateTime(pdnce->hTimeZone, _T("t"), buf, SIZEOF(buf), 0);

+					TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), buf, SIZEOF(buf), 0);

 					mir_free(pdnce->szSecondLineText);

 					pdnce->szSecondLineText = mir_tstrdup(buf);

 				}

@@ -2385,7 +2385,7 @@ void CLCPaint::_CalcItemsPos(HDC hdcMem, ClcData *dat, ClcContact *Drawing, RECT
 				if (dat->third_line_type == TEXT_CONTACT_TIME && pdnce->hTimeZone) {

 					// Get contact time

 					TCHAR buf[70] = _T("");

-					tmi.printDateTime(pdnce->hTimeZone, _T("t"), buf, SIZEOF(buf), 0);

+					TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), buf, SIZEOF(buf), 0);

 					mir_free(pdnce->szThirdLineText);

 					pdnce->szThirdLineText = mir_tstrdup(buf);

 				}

@@ -2818,7 +2818,7 @@ void CLCPaint::_DrawContactTime(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
 	if (!pdnce)

 		return;

 

-	if (!tmi.printDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {

+	if (!TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {

 		// Select font

 		ChangeToFont(hdcMem, dat, FONTID_CONTACT_TIME, NULL);

 		ske_DrawText(hdcMem, szResult, (int)mir_tstrlen(szResult), prcItem, DT_NOPREFIX | DT_SINGLELINE);

diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
index bc2aee1df6..5766aa8e08 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
@@ -288,7 +288,7 @@ int mod_CalcRowHeight_worker(ClcData *dat, HWND hwnd, ClcContact *contact, int i
 					if (item == -1) {

 						TCHAR szResult[80];

 

-						if (!tmi.printDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {

+						if (!TimeZone_PrintDateTime(pdnce->hTimeZone, _T("t"), szResult, SIZEOF(szResult), 0)) {

 							SIZE text_size = { 0 };

 							RECT rc = { 0 };

 							// Select font