From ddd1af0fdf37364c9472faedad941b4cc5f1b465 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jul 2016 11:50:07 +0000 Subject: removed from git-svn-id: http://svn.miranda-ng.org/main/trunk@17136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WebView/src/main.cpp | 4 ++-- plugins/WebView/src/webview.cpp | 6 +++--- plugins/WebView/src/webview_alerts.cpp | 12 +++++------ plugins/WebView/src/webview_datawnd.cpp | 4 ++-- plugins/WebView/src/webview_opts.cpp | 38 ++++++++++++++++----------------- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'plugins/WebView/src') diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp index 802227954d..7bc2acf7a3 100644 --- a/plugins/WebView/src/main.cpp +++ b/plugins/WebView/src/main.cpp @@ -164,7 +164,7 @@ extern "C" int __declspec(dllexport) Load() InitServices(); //add sound event to options - SkinAddNewSoundExT("webviewalert", _T(MODULENAME), LPGENW("Alert event")); + SkinAddNewSoundExT("webviewalert", MODULENAMEW, LPGENW("Alert event")); //value is 1 if menu is disabled db_set_b(NULL, MODULENAME, MENU_IS_DISABLED_KEY, 1); @@ -175,7 +175,7 @@ extern "C" int __declspec(dllexport) Load() //value is 0 if menu is enabled db_set_b(NULL, MODULENAME, MENU_IS_DISABLED_KEY, 0); - mi.root = Menu_CreateRoot(MO_MAIN, _T(MODULENAME), 20200001); + mi.root = Menu_CreateRoot(MO_MAIN, MODULENAMEW, 20200001); Menu_ConfigureItem(mi.root, MCI_OPT_UID, "403BE07B-7954-4F3E-B318-4301571776B8"); /*DISABLE WEBVIEW*/ diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp index 78721ee7e5..3abb94ffb6 100644 --- a/plugins/WebView/src/webview.cpp +++ b/plugins/WebView/src/webview.cpp @@ -295,10 +295,10 @@ static int OptInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT); - odp.pwszGroup = LPGENW("Network"); - odp.pwszTitle = _T(MODULENAME); + odp.pszGroup = LPGEN("Network"); + odp.pszTitle = MODULENAME; odp.pfnDlgProc = DlgProcOpt; - odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; + odp.flags = ODPF_BOLDGROUPS; Options_AddPage(wParam, &odp); // if popup service exists diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp index 8c909b50d0..65987f66f9 100644 --- a/plugins/WebView/src/webview_alerts.cpp +++ b/plugins/WebView/src/webview_alerts.cpp @@ -119,7 +119,7 @@ int PopupAlert(WPARAM wParam, LPARAM lParam) mir_tstrncpy(ppd.lptzContactName, dbv.ptszVal, _countof(ppd.lptzContactName)); db_free(&dbv); } - else mir_tstrcpy(ppd.lptzContactName, _T(MODULENAME)); + else mir_tstrcpy(ppd.lptzContactName, MODULENAMEW); ppd.lchContact = wParam; ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE)); @@ -340,7 +340,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn SetDlgItemText(hwndDlg, IDC_STATUSBAR, TranslateT("Start/end strings not found or strings not set.")); } - else MessageBox(NULL, TranslateT("Start/end strings not found or strings not set."), _T(MODULENAME), MB_OK); + else MessageBox(NULL, TranslateT("Start/end strings not found or strings not set."), MODULENAMEW, MB_OK); } if (eventIndex == 0) { // string present @@ -413,7 +413,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn HWND hwndDlg = WindowList_Find(hWindowList, hContact); SetDlgItemText(hwndDlg, IDC_STATUSBAR, TranslateT("Download successful; about to process data...")); } - else MessageBox(NULL, TranslateT("Unknown alert type."), _T(MODULENAME), MB_OK); + else MessageBox(NULL, TranslateT("Unknown alert type."), MODULENAMEW, MB_OK); } } } @@ -508,7 +508,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0)) db_set_s(hContact, "CList", "MyHandle", tstr); } - else MessageBox(NULL, TranslateT("Unknown alert type."), _T(MODULENAME), MB_OK); + else MessageBox(NULL, TranslateT("Unknown alert type."), MODULENAMEW, MB_OK); } } } @@ -624,7 +624,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn HWND hwndDlg = (WindowList_Find(hWindowList, hContact)); SetDlgItemText(hwndDlg, IDC_STATUSBAR, TranslateT("Alert start/end strings not found or strings not set.")); } - else MessageBox(NULL, TranslateT("Alert start/end strings not found or strings not set."), _T(MODULENAME), MB_OK); + else MessageBox(NULL, TranslateT("Alert start/end strings not found or strings not set."), MODULENAMEW, MB_OK); db_set_w(hContact, MODULENAME, "Status", ID_STATUS_AWAY); } @@ -718,7 +718,7 @@ int ProcessAlerts(MCONTACT hContact, char *truncated, char *tstr, char *contactn if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0)) db_set_s(hContact, "CList", "MyHandle", tstr); } - else MessageBox(NULL, TranslateT("Unknown alert type."), _T(MODULENAME), MB_OK); + else MessageBox(NULL, TranslateT("Unknown alert type."), MODULENAMEW, MB_OK); } } } diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp index 57d59b4bba..acd228eb6d 100644 --- a/plugins/WebView/src/webview_datawnd.cpp +++ b/plugins/WebView/src/webview_datawnd.cpp @@ -78,7 +78,7 @@ INT_PTR CALLBACK DlgProcFind(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara mir_strcpy(Searchstr, NewSearchstr); - if (!(startposition > mir_strlen(buff))) + if (!(startposition > (int)mir_strlen(buff))) location = (strstr(buff + startposition, NewSearchstr)) - buff; oldloc = loc; @@ -135,7 +135,7 @@ static MCONTACT FindContactByUrl(HWND hwndDlg) if (!mir_tstrcmp(urltext, db1) && !mir_tstrcmp(titlebartxt, db2)) { contactcount++; if (contactcount > 1) { - MessageBox(NULL, TranslateT("ERROR: You have two or more Webview contacts with the same URL and contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("ERROR: You have two or more Webview contacts with the same URL and contact name."), MODULENAMEW, MB_OK); return NULL; } res = hContact; diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp index 206334e5e1..a833fed559 100644 --- a/plugins/WebView/src/webview_opts.cpp +++ b/plugins/WebView/src/webview_opts.cpp @@ -206,7 +206,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) TextColour = TextClr; } ppd.lchContact = NULL; - mir_tstrcpy(ppd.lptzContactName, _T(MODULENAME)); + mir_tstrcpy(ppd.lptzContactName, MODULENAMEW); ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE)); mir_tstrcpy(ppd.lptzText, TranslateT("This is a preview popup.")); ppd.colorBack = BGColour; @@ -715,18 +715,18 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l if (eventIndex == 0) // string present if (!(GetWindowTextLength(GetDlgItem(hwndDlg, IDC_ALERT_STRING)))) if (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ALERTS)) { - MessageBox(NULL, TranslateT("You need to supply a search string."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply a search string."), MODULENAMEW, MB_OK); break; } if (eventIndex == 2) // part of web page changed if (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ALERTS)) { if (!(GetWindowTextLength(GetDlgItem(hwndDlg, IDC_START2)))) { - MessageBox(NULL, TranslateT("You need to supply a start string."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply a start string."), MODULENAMEW, MB_OK); break; } if (!(GetWindowTextLength(GetDlgItem(hwndDlg, IDC_END2)))) { - MessageBox(NULL, TranslateT("You need to supply an end string."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply an end string."), MODULENAMEW, MB_OK); break; } } @@ -734,14 +734,14 @@ INT_PTR CALLBACK DlgProcAlertOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l if (alertIndex == 1) // log to file if (!(GetWindowTextLength(GetDlgItem(hwndDlg, IDC_FILENAME)))) if (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ALERTS)) { - MessageBox(NULL, TranslateT("You need to supply a file name and path."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply a file name and path."), MODULENAMEW, MB_OK); break; } if (IsDlgButtonChecked(hwndDlg, IDC_ALWAYS_LOG)) if (!(GetWindowTextLength(GetDlgItem(hwndDlg, IDC_FILENAME)))) if (IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ALERTS)) { - MessageBox(NULL, TranslateT("You need to supply a file name and path."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply a file name and path."), MODULENAMEW, MB_OK); break; } @@ -952,61 +952,61 @@ INT_PTR CALLBACK DlgProcContactOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM { wchar_t str[128], contactname[128]; if (!GetWindowTextLength(GetDlgItem(hwndDlg, IDC_URL))) { - MessageBox(NULL, TranslateT("You need to supply a URL."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply a URL."), MODULENAMEW, MB_OK); break; } if (!GetWindowTextLength(GetDlgItem(hwndDlg, IDC_START))) { if (IsDlgButtonChecked(hwndDlg, IDC_U_SE_STRINGS)) { - MessageBox(NULL, TranslateT("You need to supply a start string."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply a start string."), MODULENAMEW, MB_OK); break; } } if (!GetWindowTextLength(GetDlgItem(hwndDlg, IDC_END))) { if (IsDlgButtonChecked(hwndDlg, IDC_U_SE_STRINGS)) { - MessageBox(NULL, TranslateT("You need to supply an end string."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply an end string."), MODULENAMEW, MB_OK); break; } } if (!GetWindowTextLength(GetDlgItem(hwndDlg, IDC_SITE_NAME))) { - MessageBox(NULL, TranslateT("You need to supply a name for the contact."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("You need to supply a name for the contact."), MODULENAMEW, MB_OK); break; } GetDlgItemText(hwndDlg, IDC_SITE_NAME, contactname, _countof(contactname)); if (wcschr(contactname, '\\') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } if (wcschr(contactname, '/') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } if (wcschr(contactname, ':') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } if (wcschr(contactname, '*') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } if (wcschr(contactname, '?') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } if (wcschr(contactname, '\"') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } if (wcschr(contactname, '<') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } if (wcschr(contactname, '>') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } if (wcschr(contactname, '|') != NULL) { - MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), _T(MODULENAME), MB_OK); + MessageBox(NULL, TranslateT("Invalid symbol present in contact name."), MODULENAMEW, MB_OK); break; } -- cgit v1.2.3