summaryrefslogtreecommitdiff
path: root/plugins/ModernOpt
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2016-07-25 10:31:04 +0000
committerGeorge Hazan <george.hazan@gmail.com>2016-07-25 10:31:04 +0000
commit8ae3679aa1339ce9abee53adb69902bd6b7513dc (patch)
tree94ef8927e12043ed6dcc15e1e640d68a8add520e /plugins/ModernOpt
parent1e273e28d89b5838e3d0f0cafac9676577cb71ce (diff)
hello, Unix.
phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/ModernOpt')
-rw-r--r--plugins/ModernOpt/src/modernopt.cpp32
-rw-r--r--plugins/ModernOpt/src/mopt_selector.cpp10
2 files changed, 21 insertions, 21 deletions
diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp
index 2f033d63a0..8eb3a1b369 100644
--- a/plugins/ModernOpt/src/modernopt.cpp
+++ b/plugins/ModernOpt/src/modernopt.cpp
@@ -239,7 +239,7 @@ static INT_PTR CALLBACK ModernOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_BTN_APPLY))) {
int idResult = MessageBox(hwndDlg,
TranslateT("You have some unsaved changes here.\n Do you wish to apply settings before switching?"),
- _T("Miranda NG"), MB_ICONQUESTION | MB_YESNOCANCEL);
+ L"Miranda NG", MB_ICONQUESTION | MB_YESNOCANCEL);
if (idResult == IDCANCEL) break;
sttNotifyPages(dat, (idResult == IDYES) ? PSN_APPLY : PSN_RESET);
}
@@ -597,31 +597,31 @@ static int hookModernOpt_Initialize(WPARAM wParam, LPARAM)
#if defined(_DEBUG) && defined(MOPT_SAMPLE_PAGES)
obj.iSection = MODERNOPT_PAGE_ADVANCED;
obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;
- obj.lptzSubsection = _T("Page 1");
+ obj.lptzSubsection = L"Page 1";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- obj.lptzSubsection = _T("Page 2");
+ obj.lptzSubsection = L"Page 2";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- obj.lptzSubsection = _T("Page 3");
+ obj.lptzSubsection = L"Page 3";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
obj.iType = MODERNOPT_TYPE_IGNOREOBJECT;
obj.hIcon = Skin_LoadIcon(SKINICON_EVENT_FILE);
- obj.lptzSubsection = _T("Files");
+ obj.lptzSubsection = L"Files";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
obj.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
- obj.lptzSubsection = _T("Messages");
+ obj.lptzSubsection = L"Messages";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
obj.hIcon = Skin_LoadIcon(SKINICON_EVENT_URL);
- obj.lptzSubsection = _T("URL events");
+ obj.lptzSubsection = L"URL events";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_TYPING);
- obj.lptzSubsection = _T("Typing notifications");
+ obj.lptzSubsection = L"Typing notifications";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_ADDCONTACT);
- obj.lptzSubsection = _T("Added notifications");
+ obj.lptzSubsection = L"Added notifications";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
- obj.lptzSubsection = _T("Auth requests");
+ obj.lptzSubsection = L"Auth requests";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
obj.iSection = MODERNOPT_PAGE_SKINS;
@@ -649,20 +649,20 @@ static int hookModernOpt_Initialize(WPARAM wParam, LPARAM)
obj.iSection = MODERNOPT_PAGE_ADVANCED;
obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;
- obj.lptzSubsection = _T("Page 1");
+ obj.lptzSubsection = L"Page 1";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- obj.lptzSubsection = _T("Page 2");
+ obj.lptzSubsection = L"Page 2";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- obj.lptzSubsection = _T("Page 3");
+ obj.lptzSubsection = L"Page 3";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
obj.iSection = MODERNOPT_PAGE_MODULES;
obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;
- obj.lptzSubsection = _T("Configure");
+ obj.lptzSubsection = L"Configure";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- obj.lptzSubsection = _T("Update");
+ obj.lptzSubsection = L"Update";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- obj.lptzSubsection = _T("Download");
+ obj.lptzSubsection = L"Download";
CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
#endif
diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp
index 071e560cea..7c669dd656 100644
--- a/plugins/ModernOpt/src/mopt_selector.cpp
+++ b/plugins/ModernOpt/src/mopt_selector.cpp
@@ -46,7 +46,7 @@ static void sttPreviewSkin(MODERNOPTOBJECT *obj, TCHAR *fn, LPDRAWITEMSTRUCT lps
return;
}
- HBITMAP hbmPreview = Bitmap_Load(CMString(fn) + _T(".png"));
+ HBITMAP hbmPreview = Bitmap_Load(CMString(fn) + L".png");
if (!hbmPreview)
return;
@@ -93,7 +93,7 @@ struct TSkinListItem
size_t length = mir_tstrlen(curPath) + mir_tstrlen(fn) + 2;
filename = (TCHAR *)mir_alloc(length * sizeof(TCHAR));
- mir_sntprintf(filename, length, _T("%s\\%s"), curPath, fn);
+ mir_sntprintf(filename, length, L"%s\\%s", curPath, fn);
}
~TSkinListItem()
@@ -140,16 +140,16 @@ static void BuildSkinList(HWND hwndList, TCHAR *szExt, int nExtLength = -1, bool
}
WIN32_FIND_DATA ffd = { 0 };
- HANDLE h = FindFirstFile(_T("*.*"), &ffd);
+ HANDLE h = FindFirstFile(L"*.*", &ffd);
if (h != INVALID_HANDLE_VALUE) {
do {
- if (!mir_tstrcmp(ffd.cFileName, _T("")) || !mir_tstrcmp(ffd.cFileName, _T(".")) || !mir_tstrcmp(ffd.cFileName, _T("..")))
+ if (!mir_tstrcmp(ffd.cFileName, L"") || !mir_tstrcmp(ffd.cFileName, L".") || !mir_tstrcmp(ffd.cFileName, L".."))
continue;
if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
SetCurrentDirectory(ffd.cFileName);
BuildSkinList(hwndList, szExt, nExtLength, false);
- SetCurrentDirectory(_T(".."));
+ SetCurrentDirectory(L"..");
}
else {
if (CheckExt(ffd.cFileName, szExt, nExtLength)) {