- Another portion of _T replacement (patch from person)

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

4 files changed, 29 insertions, 28 deletions

diff --git a/plugins/HistoryLinkListPlus/src/language.h b/plugins/HistoryLinkListPlus/src/language.h
index 92eb5a6486..7fa3deb742 100644
--- a/plugins/HistoryLinkListPlus/src/language.h
+++ b/plugins/HistoryLinkListPlus/src/language.h
@@ -20,18 +20,19 @@
 #ifndef _LANGUAGE_H

 #define _LANGUAGE_H

 

-#define TXT_PLUGINNAME		"History Linklist"

-#define TXT_EMPTYHISTORY	"History is empty!"

-#define TXT_ERROR			"Error"

-#define TXT_INCOMING		"incoming"

-#define TXT_OUTGOING		"outgoing"

-#define TXT_FILTER			"Filter"

-#define TXT_NOFILTER		"no filter"

-#define TXT_URLSONLY		"Web addresses only"

-#define TXT_MAILSONLY		"Mail addresses only"

-#define TXT_SEARCH			"Search"

-#define TXT_SEARCHFILTER	"Search Filter"

-#define TXT_NOSETTING		"no settings"

-#define TXT_DATE			"Date"

+#define TXT_PLUGINNAME		TranslateT("History Linklist")

+#define TXT_EMPTYHISTORY	TranslateT("History is empty!")

+#define TXT_NOLINKINHISTORY TranslateT("There are no links in history!")

+#define TXT_ERROR			TranslateT("Error")

+#define TXT_INCOMING		TranslateT("incoming")

+#define TXT_OUTGOING		TranslateT("outgoing")

+#define TXT_FILTER			TranslateT("Filter")

+#define TXT_NOFILTER		TranslateT("no filter")

+#define TXT_URLSONLY		TranslateT("Web addresses only")

+#define TXT_MAILSONLY		TranslateT("Mail addresses only")

+#define TXT_SEARCH			TranslateT("Search")

+#define TXT_SEARCHFILTER	TranslateT("Search Filter")

+#define TXT_NOSETTING		TranslateT("no settings")

+#define TXT_DATE			TranslateT("Date")

 

 #endif // _LANGUAGE_H
\ No newline at end of file
diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp
index 4208fb0634..d087998374 100644
--- a/plugins/HistoryLinkListPlus/src/linklist.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist.cpp
@@ -164,7 +164,7 @@ static INT_PTR LinkList_Main(WPARAM wParam,LPARAM lParam)
 	hEvent = (HANDLE)CallService(MS_DB_EVENT_FINDFIRST, (WPARAM)hContact, 0);

 	if ( hEvent == NULL )

 	{

-		MessageBox(NULL, TranslateT(TXT_EMPTYHISTORY), TranslateT(TXT_PLUGINNAME), MB_OK | MB_ICONINFORMATION );

+		MessageBox(NULL, TXT_EMPTYHISTORY, TXT_PLUGINNAME, MB_OK | MB_ICONINFORMATION );

 		return 0;

 	}

 

@@ -219,7 +219,7 @@ static INT_PTR LinkList_Main(WPARAM wParam,LPARAM lParam)
 	SendMessage(hWndProgress, WM_CLOSE, 0, 0);

 	if ( ListCount(listStart) <= 0 ) {	

 		RemoveList(listStart);

-		MessageBox(NULL, TranslateT("There are no links in history!"), TranslateT(TXT_PLUGINNAME), MB_OK | MB_ICONINFORMATION);

+		MessageBox(NULL, TXT_NOLINKINHISTORY, TXT_PLUGINNAME, MB_OK | MB_ICONINFORMATION);

 		return 0;

 	}

 

diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
index 6e26d8538d..66892ef692 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
@@ -495,7 +495,7 @@ INT_PTR WINAPI SearchDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam
 		{

 			TranslateDialogDefault(hDlg);

 			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LPARAM)lParam);

-			SetWindowText(hDlg, TranslateT(TXT_SEARCH));

+			SetWindowText(hDlg, TXT_SEARCH);

 			SendDlgItemMessage(hDlg, IDC_DIR_ALL, BM_SETCHECK, BST_CHECKED, 0);

 			SendDlgItemMessage(hDlg, IDC_TYPE_ALL, BM_SETCHECK, BST_CHECKED, 0);

 			return TRUE;

@@ -545,7 +545,7 @@ INT_PTR WINAPI SearchDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam
 					WriteLinkList(hListDlg, flags, DlgParam->listStart, buffer, 0);

 					free(buffer);

 					

-					mir_sntprintf(filter, _countof(filter), _T("%s: %s"), TranslateT(TXT_FILTER), TranslateT(TXT_SEARCHFILTER));

+					mir_sntprintf(filter, _countof(filter), _T("%s: %s"), TXT_FILTER, TXT_SEARCHFILTER);

 					SetDlgItemText(hWndMain, IDC_STATUS, filter);

 				}

 				break;

@@ -749,7 +749,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 					mCol = GetMirandaColour(&colourSet);

 					if(mCol == 1)

 					{

-						MessageBox(NULL, TranslateT(TXT_NOSETTING), TranslateT(TXT_ERROR), MB_OK | MB_ICONEXCLAMATION);

+						MessageBox(NULL, TXT_NOSETTING, TXT_ERROR, MB_OK | MB_ICONEXCLAMATION);

 						SendDlgItemMessage(hDlg, IDC_CHECK1, BM_SETCHECK, BST_UNCHECKED, 0);

 						break;

 					}

diff --git a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
index ea039e276e..5dfb7c5236 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
@@ -601,7 +601,7 @@ int WriteOptionExample(HWND hDlg, DWORD InColourSel, DWORD OutColourSel, DWORD B
 	SendDlgItemMessage( hDlg, IDC_OPTIONS_RE, EM_SETCHARFORMAT, SCF_SELECTION | SCF_WORD, (LPARAM) &cf);

 

 	if(options->showDate == 1)

-		SendDlgItemMessage( hDlg, IDC_OPTIONS_RE, EM_REPLACESEL, FALSE, (LPARAM)TranslateT(TXT_DATE));

+		SendDlgItemMessage( hDlg, IDC_OPTIONS_RE, EM_REPLACESEL, FALSE, (LPARAM)TXT_DATE);

 	

 	SendDlgItemMessage( hDlg, IDC_OPTIONS_RE, EM_REPLACESEL, FALSE, (LPARAM) _T("\n"));

 

@@ -728,17 +728,17 @@ void GetFilterText(HMENU listMenu, LPTSTR filter, size_t max_len)
 		if ( GetMenuState(listMenu, IDM_DIR_IN, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//incoming URLs

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_INCOMING), TranslateT(TXT_URLSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_INCOMING, TXT_URLSONLY);

 		}

 		else if ( GetMenuState(listMenu, IDM_DIR_OUT, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//outgoing URLs

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_OUTGOING), TranslateT(TXT_URLSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_OUTGOING, TXT_URLSONLY);

 		}

 		else

 		{

 			// both directions (URL)

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), "", TranslateT(TXT_URLSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, "", TXT_URLSONLY);

 		}

 	}

 	else if ( GetMenuState(listMenu, IDM_TYPE_MAIL, MF_BYCOMMAND) == MF_CHECKED )

@@ -746,17 +746,17 @@ void GetFilterText(HMENU listMenu, LPTSTR filter, size_t max_len)
 		if ( GetMenuState(listMenu, IDM_DIR_IN, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//incoming mail

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_INCOMING), TranslateT(TXT_MAILSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_INCOMING, TXT_MAILSONLY);

 		}

 		else if ( GetMenuState(listMenu, IDM_DIR_OUT, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//outgoing mail

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_OUTGOING), TranslateT(TXT_MAILSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_OUTGOING, TXT_MAILSONLY);

 		}

 		else

 		{

 			// both directions (mail)

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), "", TranslateT(TXT_MAILSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, "", TXT_MAILSONLY);

 		}

 	}

 	else

@@ -764,17 +764,17 @@ void GetFilterText(HMENU listMenu, LPTSTR filter, size_t max_len)
 		if ( GetMenuState(listMenu, IDM_DIR_IN, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//incoming (both)

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_INCOMING), "");

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_INCOMING, "");

 		}

 		else if ( GetMenuState(listMenu, IDM_DIR_OUT, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//outgoing (both)

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_OUTGOING), "");

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_OUTGOING, "");

 		}

 		else

 		{

 			// no filter

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_NOFILTER), "");

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_NOFILTER, "");

 		}

 	}

 }