hello, Unix.

phase 1: removing _T()

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

5 files changed, 15 insertions, 15 deletions

diff --git a/plugins/YAPP/src/message_pump.cpp b/plugins/YAPP/src/message_pump.cpp
index 34ff5cc468..000144acc3 100644
--- a/plugins/YAPP/src/message_pump.cpp
+++ b/plugins/YAPP/src/message_pump.cpp
@@ -30,8 +30,8 @@ unsigned __stdcall MessagePumpThread(void* param)
 

 				PopupData *pd = (PopupData*)hwndMsg.lParam;

 				if (enabled && num_popups < MAX_POPUPS) {

-					//HWND hwnd = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_TOPMOST, POP_WIN_CLASS, _T("Popup"), WS_POPUP, 0, 0, 0, 0, GetDesktopWindow(), 0, hInst, (LPVOID)hwndMsg.lParam);

-					HWND hwnd = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_TOPMOST, POP_WIN_CLASS, _T("Popup"), WS_POPUP, 0, 0, 0, 0, 0, 0, hInst, (LPVOID)hwndMsg.lParam);

+					//HWND hwnd = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_TOPMOST, POP_WIN_CLASS, L"Popup", WS_POPUP, 0, 0, 0, 0, GetDesktopWindow(), 0, hInst, (LPVOID)hwndMsg.lParam);

+					HWND hwnd = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_TOPMOST, POP_WIN_CLASS, L"Popup", WS_POPUP, 0, 0, 0, 0, 0, 0, hInst, (LPVOID)hwndMsg.lParam);

 					num_popups++;

 					if (hwndMsg.wParam) // set notifyer handle

 						SendMessage(hwnd, PUM_SETNOTIFYH, hwndMsg.wParam, 0);

diff --git a/plugins/YAPP/src/popwin.h b/plugins/YAPP/src/popwin.h
index c206ea2176..4087ffb322 100644
--- a/plugins/YAPP/src/popwin.h
+++ b/plugins/YAPP/src/popwin.h
@@ -1,7 +1,7 @@
 #ifndef _POPWIN_INC

 #define _POPWIN_INC

 

-#define POP_WIN_CLASS        _T(MODULE) _T("YAPPWindowClass")

+#define POP_WIN_CLASS        _T(MODULE) L"YAPPWindowClass"

 

 #define PUM_SETTEXT          (WM_USER + 0x020)

 #define PUM_GETCONTACT       (WM_USER + 0x021)

diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp
index 88f6a65cfe..c77273cb5b 100644
--- a/plugins/YAPP/src/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -289,7 +289,7 @@ static INT_PTR ShowMessage(WPARAM wParam, LPARAM lParam)
 

 	if (db_get_b(0, "Popup", "ModuleIsEnabled", 1)) {

 		POPUPDATAT pd = {0};

-		mir_tstrcpy(pd.lptzContactName, lParam == SM_WARNING ? _T("Warning") : _T("Notification"));

+		mir_tstrcpy(pd.lptzContactName, lParam == SM_WARNING ? L"Warning" : L"Notification");

 		pd.lchIcon = LoadIcon(0, lParam == SM_WARNING ? IDI_WARNING : IDI_INFORMATION);

 		_tcsncpy(pd.lptzText, _A2T((char *)wParam), MAX_SECONDLINE); pd.lptzText[MAX_SECONDLINE-1] = 0;

 		CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&pd, 0);

diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp
index 3068d68baa..9b64c9803b 100644
--- a/plugins/YAPP/src/yapp.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -98,8 +98,8 @@ static void InitFonts()
 	mir_tstrcpy(font_id_firstline.name, LPGENT("First line"));

 	mir_strcpy(font_id_firstline.dbSettingsGroup, MODULE);

 	mir_strcpy(font_id_firstline.prefix, "FontFirst");

-	mir_tstrcpy(font_id_firstline.backgroundGroup, _T("Popups"));

-	mir_tstrcpy(font_id_firstline.backgroundName, _T("Background"));

+	mir_tstrcpy(font_id_firstline.backgroundGroup, L"Popups");

+	mir_tstrcpy(font_id_firstline.backgroundName, L"Background");

 	font_id_firstline.order = 0;

 	FontRegisterT(&font_id_firstline);

 

@@ -109,8 +109,8 @@ static void InitFonts()
 	mir_tstrcpy(font_id_secondline.name, LPGENT("Second line"));

 	mir_strcpy(font_id_secondline.dbSettingsGroup, MODULE);

 	mir_strcpy(font_id_secondline.prefix, "FontSecond");

-	mir_tstrcpy(font_id_secondline.backgroundGroup, _T("Popups"));

-	mir_tstrcpy(font_id_secondline.backgroundName, _T("Background"));

+	mir_tstrcpy(font_id_secondline.backgroundGroup, L"Popups");

+	mir_tstrcpy(font_id_secondline.backgroundName, L"Background");

 	font_id_secondline.order = 1;

 	FontRegisterT(&font_id_secondline);

 

@@ -120,8 +120,8 @@ static void InitFonts()
 	mir_tstrcpy(font_id_time.name, LPGENT("Time"));

 	mir_strcpy(font_id_time.dbSettingsGroup, MODULE);

 	mir_strcpy(font_id_time.prefix, "FontTime");

-	mir_tstrcpy(font_id_time.backgroundGroup, _T("Popups"));

-	mir_tstrcpy(font_id_time.backgroundName, _T("Background"));

+	mir_tstrcpy(font_id_time.backgroundGroup, L"Popups");

+	mir_tstrcpy(font_id_time.backgroundName, L"Background");

 	font_id_time.order = 2;

 	FontRegisterT(&font_id_time);

 

@@ -200,7 +200,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 

 	LoadModuleDependentOptions(); 

 

-	if (GetModuleHandle(_T("neweventnotify")))

+	if (GetModuleHandle(L"neweventnotify"))

 		ignore_gpd_passed_addy = true;

 

 	return 0;

diff --git a/plugins/YAPP/src/yapp_history_dlg.cpp b/plugins/YAPP/src/yapp_history_dlg.cpp
index 33cb01c1a2..67a1fcaa14 100644
--- a/plugins/YAPP/src/yapp_history_dlg.cpp
+++ b/plugins/YAPP/src/yapp_history_dlg.cpp
@@ -16,7 +16,7 @@
 HWND hHistoryWindow = 0; //the history window

 PopupHistoryList lstPopupHistory; //defined in main.cpp

 

-const TCHAR *szHistoryColumns[] = {_T("Title"), _T("Message"), _T("Timestamp")}; //need to make sure that the string and size vectors have the same number of elements

+const TCHAR *szHistoryColumns[] = {L"Title", L"Message", L"Timestamp"}; //need to make sure that the string and size vectors have the same number of elements

 const int cxHistoryColumns[] = {100, 450, 115};

 const int cHistoryColumns = sizeof(szHistoryColumns) / sizeof(szHistoryColumns[0]);

 

@@ -134,7 +134,7 @@ int MatchesFilterCS(const TCHAR *filter, const PopupHistoryData *popupItem) //ca
 	{

 		TCHAR buffer[1024];

 		struct tm *myTime = localtime(&popupItem->timestamp);

-		_tcsftime(buffer, 1024, _T("%c"), myTime);

+		_tcsftime(buffer, 1024, L"%c", myTime);

 		match = (_tcsstr(buffer, filter)) ? 1 : match;

 	}

 	

@@ -169,7 +169,7 @@ int MatchesFilterCI(const TCHAR *filterS, const PopupHistoryData *popupItem)
 	if (!match) //if no match has been found yet try to match the timestamp

 	{

 		struct tm *myTime = localtime(&popupItem->timestamp);

-		_tcsftime(buffer, 1024, _T("%c"), myTime);

+		_tcsftime(buffer, 1024, L"%c", myTime);

 		match = (_tcsstr(buffer, filterI)) ? 1 : match;

 	}

 	

@@ -423,7 +423,7 @@ void AddEventsDefault(HWND hWnd, int, TCHAR *filter, SIG_MATCHESFILTER MatchesFi
 			ListView_InsertItem(hHistoryList, &item);

 			ListView_SetItemText(hHistoryList, lIndex, 1, popupItem->messageT);

 			myTime = localtime(&popupItem->timestamp);

-			_tcsftime(buffer, 1024, _T("%c"), myTime);

+			_tcsftime(buffer, 1024, L"%c", myTime);

 			ListView_SetItemText(hHistoryList, lIndex++, 2, buffer);

 		}

 	}