hello, Unix.

phase 1: removing _T()

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

6 files changed, 16 insertions, 16 deletions

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index b405abede2..dfd08a712c 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -70,7 +70,7 @@ static VOID NTAPI ShowContactMenu(ULONG_PTR wParam)
 // wParam = hContact

 {

 	POINT pt;

-	HWND hMenuWnd = CreateWindowEx(WS_EX_TOOLWINDOW, _T("static"), _T(MOD_NAME)_T("_MenuWindow"), 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, g_hInstance, NULL);

+	HWND hMenuWnd = CreateWindowEx(WS_EX_TOOLWINDOW, L"static", _T(MOD_NAME)L"_MenuWindow", 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, g_hInstance, NULL);

 	SetWindowLongPtr(hMenuWnd, GWLP_WNDPROC, (LONG_PTR)MenuWndProc);

 	HMENU hMenu = Menu_BuildContactMenu(wParam);

 	GetCursorPos(&pt);

@@ -189,7 +189,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 	SHOWPOPUP_DATA sd = {0};

 	char *szProto = GetContactProto(hContact);

 	if (g_PreviewOptPage)

-		sd.MirVer = _T("Miranda NG ICQ 0.93.5.3007");

+		sd.MirVer = L"Miranda NG ICQ 0.93.5.3007";

 	else {

 		if (!hContact) // exit if hContact == NULL and it's not a popup preview

 			return 0;

@@ -198,11 +198,11 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 		if (!strcmp(szProto, META_PROTO)) // workaround for metacontacts

 			return 0;

 

-		sd.MirVer = db_get_s(hContact, szProto, DB_MIRVER, _T(""));

+		sd.MirVer = db_get_s(hContact, szProto, DB_MIRVER, L"");

 		if (sd.MirVer.IsEmpty())

 			return 0;

 	}

-	sd.OldMirVer = db_get_s(hContact, MOD_NAME, DB_OLDMIRVER, _T(""));

+	sd.OldMirVer = db_get_s(hContact, MOD_NAME, DB_OLDMIRVER, L"");

 	db_set_ts(hContact, MOD_NAME, DB_OLDMIRVER, sd.MirVer); // we have to write it here, because we modify sd.OldMirVer and sd.MirVer to conform our settings later

 	if (sd.OldMirVer.IsEmpty())  // looks like it's the right way to do

 		return 0;

@@ -359,9 +359,9 @@ extern "C" int __declspec(dllexport) Load(void)
 

 	if (db_get_b(NULL, MOD_NAME, DB_SETTINGSVER, 0) < 1) {

 		TCString Str;

-		Str = db_get_s(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, _T(""));

+		Str = db_get_s(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, L"");

 		if (Str.GetLen()) // fix incorrect regexp from v0.1.1.0

-			db_set_ts(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, Str.Replace(_T("/Miranda[0-9A-F]{8}/"), _T("/[0-9A-F]{8}(\\W|$)/")));

+			db_set_ts(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, Str.Replace(L"/Miranda[0-9A-F]{8}/", L"/[0-9A-F]{8}(\\W|$)/"));

 

 		db_set_b(NULL, MOD_NAME, DB_SETTINGSVER, 1);

 	}

diff --git a/plugins/ClientChangeNotify/src/Misc.h b/plugins/ClientChangeNotify/src/Misc.h
index 29f1b72d0d..d490677750 100644
--- a/plugins/ClientChangeNotify/src/Misc.h
+++ b/plugins/ClientChangeNotify/src/Misc.h
@@ -20,7 +20,7 @@
 #include "stdafx.h"

 extern BOOL bPopupExists;

 

-__inline void ShowMsg(TCHAR *FirstLine, TCHAR *SecondLine = _T(""), bool IsErrorMsg = false, int Timeout = 0)

+__inline void ShowMsg(TCHAR *FirstLine, TCHAR *SecondLine = L"", bool IsErrorMsg = false, int Timeout = 0)

 {

 	if (bPopupExists)

 	{

@@ -40,7 +40,7 @@ __inline void ShowMsg(TCHAR *FirstLine, TCHAR *SecondLine = _T(""), bool IsError
 

 __inline void ShowLog(TCString &LogFilePath)

 {

-	INT_PTR Result = (INT_PTR)ShellExecute(NULL, _T("open"), LogFilePath, NULL, NULL, SW_SHOW);

+	INT_PTR Result = (INT_PTR)ShellExecute(NULL, L"open", LogFilePath, NULL, NULL, SW_SHOW);

 	if (Result <= 32) // Error

 	{

 		TCHAR szError[64];

@@ -52,10 +52,10 @@ __inline void ShowLog(TCString &LogFilePath)
 __inline void RecompileRegexps(TCString IgnoreSubstrings)

 {

 	FreePcreCompileData();

-	TCHAR *p = _tcstok(IgnoreSubstrings, _T(";"));

+	TCHAR *p = _tcstok(IgnoreSubstrings, L";");

 	while (p)

 	{

 		CompileRegexp(p, p[0] != '/');

-		p = _tcstok(NULL, _T(";"));

+		p = _tcstok(NULL, L";");

 	}

 }

diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp
index 1570f05678..4aefc4c519 100644
--- a/plugins/ClientChangeNotify/src/OptDlg.cpp
+++ b/plugins/ClientChangeNotify/src/OptDlg.cpp
@@ -197,6 +197,6 @@ void InitOptions()
 	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_DEFAULT, IDC_POPUPOPTDLG_POPUPNOTIFY));

 	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_INFINITE, IDC_POPUPOPTDLG_POPUPNOTIFY));

 	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_IGNORESTRINGS, IDC_POPUPOPTDLG_POPUPNOTIFY));

-	g_PopupOptPage.Items.AddElem(new COptItem_Edit(IDC_POPUPOPTDLG_IGNORESTRINGS, DB_IGNORESUBSTRINGS, IGNORESTRINGS_MAX_LEN, _T("gmail;skype;/Miranda[0-9A-F]{8}/"), IDC_POPUPOPTDLG_POPUPNOTIFY));

+	g_PopupOptPage.Items.AddElem(new COptItem_Edit(IDC_POPUPOPTDLG_IGNORESTRINGS, DB_IGNORESUBSTRINGS, IGNORESTRINGS_MAX_LEN, L"gmail;skype;/Miranda[0-9A-F]{8}/", IDC_POPUPOPTDLG_POPUPNOTIFY));

 	g_PopupOptPage.Items.AddElem(new COptItem_Generic(IDC_POPUPOPTDLG_STATIC_REGEXP, IDC_POPUPOPTDLG_POPUPNOTIFY));

 }

diff --git a/plugins/ClientChangeNotify/src/Options.cpp b/plugins/ClientChangeNotify/src/Options.cpp
index c6209078f9..aea2556676 100644
--- a/plugins/ClientChangeNotify/src/Options.cpp
+++ b/plugins/ClientChangeNotify/src/Options.cpp
@@ -283,7 +283,7 @@ int TreeReadEnum(const char *szSetting, LPARAM lParam)
 			pItem.ParentID = ParentID;

 			pItem.Flags = Flags;

 			pItem.hItem = NULL;

-			pItem.Title = db_get_s(NULL, pData->sModule, *pData->sDBSettingPrefix + szSetting, _T(""));

+			pItem.Title = db_get_s(NULL, pData->sModule, *pData->sDBSettingPrefix + szSetting, L"");

 			pItem.User_Str1 = (pData->TreeCtrl->User_Str1_DBName == NULL) ? NULL :

 				db_get_s(NULL, pData->sModule,

 				*pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + pData->TreeCtrl->User_Str1_DBName + (szSetting + Len), (TCHAR*)NULL);

@@ -660,7 +660,7 @@ int ListReadEnum(const char *szSetting, LPARAM lParam)
 	int Len = pData->sDBSettingPrefix.GetLen() + pData->ListCtrl->sDBSetting.GetLen() + _countof(LISTITEM_DBSTR_TEXT) - 1;

 	if (!strncmp(szSetting, pData->sDBSettingPrefix + pData->ListCtrl->sDBSetting + LISTITEM_DBSTR_TEXT, Len) && isdigit(szSetting[Len])) {

 		int ID = atol(szSetting + Len);

-		pData->ListCtrl->m_value.SetAtGrow(ID).Text = db_get_s(NULL, pData->sModule, *pData->sDBSettingPrefix + szSetting, _T(""));

+		pData->ListCtrl->m_value.SetAtGrow(ID).Text = db_get_s(NULL, pData->sModule, *pData->sDBSettingPrefix + szSetting, L"");

 	}

 	return 0;

 }

diff --git a/plugins/ClientChangeNotify/src/Options.h b/plugins/ClientChangeNotify/src/Options.h
index 4e4481da8b..b22a0b902b 100644
--- a/plugins/ClientChangeNotify/src/Options.h
+++ b/plugins/ClientChangeNotify/src/Options.h
@@ -406,7 +406,7 @@ public:
 	{

 		if (TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) {

 			_ASSERT(!RootItems.GetSize()); // there can't be any root items when the tree is a plain list

-			this->RootItems.AddElem(CTreeRootItem(_T(""), 0, TIF_EXPANDED)); // TODO??

+			this->RootItems.AddElem(CTreeRootItem(L"", 0, TIF_EXPANDED)); // TODO??

 			this->RootItems[0].hItem = TVI_ROOT;

 		}

 	}

diff --git a/plugins/ClientChangeNotify/src/pcre.cpp b/plugins/ClientChangeNotify/src/pcre.cpp
index a57c0587c5..259e9facdb 100644
--- a/plugins/ClientChangeNotify/src/pcre.cpp
+++ b/plugins/ClientChangeNotify/src/pcre.cpp
@@ -58,7 +58,7 @@ void FreePcreCompileData()
 

 TCString CompileRegexp(TCString Regexp, int bAddAsUsualSubstring, int ID)

 {

-	TCString Result(_T(""));

+	TCString Result(L"");

 	sPcreCompileData s = {0};

 	int NewID = PcreCompileData.AddElem(s);

 	PcreCompileData[NewID].ID = ID;

@@ -126,7 +126,7 @@ TCString CompileRegexp(TCString Regexp, int bAddAsUsualSubstring, int ID)
 			PcreCompileData[NewID].pExtra = pcre16_study(PcreCompileData[NewID].pPcre, 0, &Err);

 		} 

 		else {

-			// Result += LogMessage(TranslateT("Syntax error in regexp\n%s\nat offset %d: %s."), (TCHAR*)Regexp, ErrOffs, (TCHAR*)ANSI2TCHAR(Err)) + _T("\n\n");

+			// Result += LogMessage(TranslateT("Syntax error in regexp\n%s\nat offset %d: %s."), (TCHAR*)Regexp, ErrOffs, (TCHAR*)ANSI2TCHAR(Err)) + L"\n\n";

 			PcreCompileData[NewID].Pattern = Regexp;

 	 	}

 	}