From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- plugins/DbEditorPP/src/watchedvars.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/DbEditorPP/src/watchedvars.cpp') diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp index a5ca3e7c0e..3c8ce19c50 100644 --- a/plugins/DbEditorPP/src/watchedvars.cpp +++ b/plugins/DbEditorPP/src/watchedvars.cpp @@ -7,11 +7,11 @@ static WatchListArrayStruct WatchListArray = {0}; static int lastColumn = -1; ColumnsSettings csWatchList[] = { - { LPGENT("Contact"), 0, "Watch0width", 100 }, - { LPGENT("Module"), 1, "Watch1width", 100 }, - { LPGENT("Setting"), 2, "Watch2width", 100 }, - { LPGENT("Value"), 3, "Watch3width", 200 }, - { LPGENT("Type"), 4, "Watch4width", 75 }, + { LPGENW("Contact"), 0, "Watch0width", 100 }, + { LPGENW("Module"), 1, "Watch1width", 100 }, + { LPGENW("Setting"), 2, "Watch2width", 100 }, + { LPGENW("Value"), 3, "Watch3width", 200 }, + { LPGENW("Type"), 4, "Watch4width", 75 }, {0} }; @@ -109,7 +109,7 @@ void addwatchtolist(HWND hwnd, struct DBsetting *lParam) if (db_get_s(lParam->hContact, lParam->module, lParam->setting, &(lParam->dbv), 0)) return; - TCHAR data[32], tmp[16], name[NAME_SIZE]; + wchar_t data[32], tmp[16], name[NAME_SIZE]; GetContactName(lParam->hContact, NULL, name, _countof(name)); lvItem.pszText = name; @@ -352,7 +352,7 @@ void popupWatchedVar(MCONTACT hContact, const char *module, const char *setting) COLORREF colorText = db_get_dw(NULL, modname, "PopupTextColour", RGB(0, 0, 0)); int timeout = db_get_b(NULL, modname, "PopupDelay", 3); - TCHAR name[NAME_SIZE], text[MAX_SECONDLINE], value[MAX_SECONDLINE]; + wchar_t name[NAME_SIZE], text[MAX_SECONDLINE], value[MAX_SECONDLINE]; GetContactName(hContact, NULL, name, _countof(name)); // 2nd line -- cgit v1.2.3