From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 Jul 2016 09:20:25 +0000
Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT
 replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that
 improperly used _t functions; - TCHAR *t removed from MAllStrings; -
 ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MRA/src/MraAdvancedSearch.cpp | 56 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'protocols/MRA/src/MraAdvancedSearch.cpp')

diff --git a/protocols/MRA/src/MraAdvancedSearch.cpp b/protocols/MRA/src/MraAdvancedSearch.cpp
index 59e2da8242..fd0bd8ecb0 100644
--- a/protocols/MRA/src/MraAdvancedSearch.cpp
+++ b/protocols/MRA/src/MraAdvancedSearch.cpp
@@ -12,42 +12,42 @@ struct FieldNames
 
 static const FieldNames GenderField[] =
 {
-	{ 1, LPGENT("Male")         },
-	{ 2, LPGENT("Female")       },
+	{ 1, LPGENW("Male")         },
+	{ 2, LPGENW("Female")       },
 	{ 0, NULL                   }
 };
 
 static const FieldNames MonthField[] =
 {
-	{ 1,  LPGENT("January")     },
-	{ 2,  LPGENT("February")    },
-	{ 3,  LPGENT("March")       },
-	{ 4,  LPGENT("April")       },
-	{ 5,  LPGENT("May")         },
-	{ 6,  LPGENT("June")        },
-	{ 7,  LPGENT("July")        },
-	{ 8,  LPGENT("August")      },
-	{ 9,  LPGENT("September")   },
-	{ 10, LPGENT("October")     },
-	{ 11, LPGENT("November")    },
-	{ 12, LPGENT("December")    },
+	{ 1,  LPGENW("January")     },
+	{ 2,  LPGENW("February")    },
+	{ 3,  LPGENW("March")       },
+	{ 4,  LPGENW("April")       },
+	{ 5,  LPGENW("May")         },
+	{ 6,  LPGENW("June")        },
+	{ 7,  LPGENW("July")        },
+	{ 8,  LPGENW("August")      },
+	{ 9,  LPGENW("September")   },
+	{ 10, LPGENW("October")     },
+	{ 11, LPGENW("November")    },
+	{ 12, LPGENW("December")    },
 	{ 0,  NULL                  }
 };
 
 static const FieldNames ZodiakField[] =
 {
-	{ 1,  LPGENT("Aries")       },
-	{ 2,  LPGENT("Taurus")      },
-	{ 3,  LPGENT("Gemini")      },
-	{ 4,  LPGENT("Cancer")      },
-	{ 5,  LPGENT("Leo")         },
-	{ 6,  LPGENT("Virgo")       },
-	{ 7,  LPGENT("Libra")       },
-	{ 8,  LPGENT("Scorpio")     },
-	{ 9,  LPGENT("Sagittarius") },
-	{ 10, LPGENT("Capricorn")   },
-	{ 11, LPGENT("Aquarius")    },
-	{ 12, LPGENT("Pisces")      },
+	{ 1,  LPGENW("Aries")       },
+	{ 2,  LPGENW("Taurus")      },
+	{ 3,  LPGENW("Gemini")      },
+	{ 4,  LPGENW("Cancer")      },
+	{ 5,  LPGENW("Leo")         },
+	{ 6,  LPGENW("Virgo")       },
+	{ 7,  LPGENW("Libra")       },
+	{ 8,  LPGENW("Scorpio")     },
+	{ 9,  LPGENW("Sagittarius") },
+	{ 10, LPGENW("Capricorn")   },
+	{ 11, LPGENW("Aquarius")    },
+	{ 12, LPGENW("Pisces")      },
 	{ 0,  NULL                  }
 };
 
@@ -76,7 +76,7 @@ void InitComboBoxNumders(HWND hWndCombo, DWORD dwStart, DWORD dwEnd)
 	ResetComboBox(hWndCombo);
 
 	for (DWORD i = dwStart; i <= dwEnd; i++) {
-		TCHAR szBuff[MAX_PATH];
+		wchar_t szBuff[MAX_PATH];
 		mir_sntprintf(szBuff, L"%lu", i);
 		DWORD dwItem = SendMessage(hWndCombo, CB_ADDSTRING, 0, (LPARAM)szBuff);
 		SendMessage(hWndCombo, CB_SETITEMDATA, dwItem, i);
@@ -254,7 +254,7 @@ HWND CMraProto::SearchAdvanced(HWND hWndDlg)
 {
 	DWORD dwRequestFlags = 0;
 	char szUser[MAX_PATH], szDomain[MAX_PATH];
-	TCHAR wszNickName[MAX_PATH], wszFirstName[MAX_PATH], wszLastName[MAX_PATH];
+	wchar_t wszNickName[MAX_PATH], wszFirstName[MAX_PATH], wszLastName[MAX_PATH];
 
 	size_t dwUserSize = GetDlgItemTextA(hWndDlg, IDC_EMAIL_USER, szUser, _countof(szUser));
 	size_t dwDomainSize = GetDlgItemTextA(hWndDlg, IDC_EMAIL_DOMAIN, szDomain, _countof(szDomain));
-- 
cgit v1.2.3