From 011137bd4d5ef75cfb832f82a0cb47b06124a022 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 May 2013 15:19:22 +0000 Subject: words of wisdom were well received now the shortened types are called ptrA, ptrT & ptrW respectively git-svn-id: http://svn.miranda-ng.org/main/trunk@4682 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdauth/authdialogs.cpp | 10 +++++----- src/core/stdfile/filerecvdlg.cpp | 4 ++-- src/modules/clist/movetogroup.cpp | 2 +- src/modules/extraicons/extraicons.cpp | 2 +- src/modules/options/options.cpp | 4 ++-- src/modules/plugins/pluginopts.cpp | 10 +++++----- src/modules/protocols/protocols.cpp | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp index 72b8064114..2d265591f7 100644 --- a/src/core/stdauth/authdialogs.cpp +++ b/src/core/stdauth/authdialogs.cpp @@ -179,11 +179,11 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP PROTOACCOUNT* acc = ProtoGetAccount(dbei.szModule); - MTBuf lastT(dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2t(last)); - MTBuf firstT(dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2t(first)); - MTBuf nickT(dbei.flags & DBEF_UTF ? Utf8DecodeT(nick) : mir_a2t(nick)); - MTBuf emailT(dbei.flags & DBEF_UTF ? Utf8DecodeT(email) : mir_a2t(email)); - MTBuf reasonT(dbei.flags & DBEF_UTF ? Utf8DecodeT(reason) : mir_a2t(reason)); + ptrT lastT(dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2t(last)); + ptrT firstT(dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2t(first)); + ptrT nickT(dbei.flags & DBEF_UTF ? Utf8DecodeT(nick) : mir_a2t(nick)); + ptrT emailT(dbei.flags & DBEF_UTF ? Utf8DecodeT(email) : mir_a2t(email)); + ptrT reasonT(dbei.flags & DBEF_UTF ? Utf8DecodeT(reason) : mir_a2t(reason)); TCHAR name[128] = _T(""); int off = 0; diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp index ae42779071..476ae54918 100644 --- a/src/core/stdfile/filerecvdlg.cpp +++ b/src/core/stdfile/filerecvdlg.cpp @@ -258,13 +258,13 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l dat->fs = cle->lParam ? (HANDLE)cle->lParam : (HANDLE)*(PDWORD)dbei.pBlob; char *str = (char*)dbei.pBlob + 4; - MTBuf ptszFileName( DbGetEventStringT(&dbei, str)); + ptrT ptszFileName( DbGetEventStringT(&dbei, str)); SetDlgItemText(hwndDlg, IDC_FILENAMES, ptszFileName); unsigned len = (unsigned)strlen(str) + 1; if (len + 4 < dbei.cbBlob) { str += len; - MTBuf ptszDescription( DbGetEventStringT(&dbei, str)); + ptrT ptszDescription( DbGetEventStringT(&dbei, str)); SetDlgItemText(hwndDlg, IDC_MSG, ptszDescription); } } diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp index d994e30592..8351010ac5 100644 --- a/src/modules/clist/movetogroup.cpp +++ b/src/modules/clist/movetogroup.cpp @@ -100,7 +100,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)lphGroupsItems[i], 0); lphGroupsItems.destroy(); - MTBuf szContactGroup( db_get_tsa((HANDLE)wParam, "CList", "Group")); + ptrT szContactGroup( db_get_tsa((HANDLE)wParam, "CList", "Group")); int pos = 1000; diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index fb06bb4ee4..1a34874b83 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -363,7 +363,7 @@ INT_PTR ExtraIcon_Register(WPARAM wParam, LPARAM lParam) if (ei->type == EXTRAICON_TYPE_CALLBACK && (ei->ApplyIcon == NULL || ei->RebuildIcons == NULL)) return 0; - MTBuf tszDesc( mir_a2t(ei->description)); + ptrT tszDesc( mir_a2t(ei->description)); TCHAR *desc = TranslateTH(lParam, tszDesc); BaseExtraIcon *extra = GetExtraIconByName(ei->name); diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index d47ad558c0..5d995447bb 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -1256,10 +1256,10 @@ static void OpenOptionsNow(int hLangpack, const char *pszGroup, const char *pszP ShowWindow(hwndOptions, SW_RESTORE); SetForegroundWindow(hwndOptions); if (pszPage != NULL) { - MTBuf ptszPage( mir_a2t(pszPage)); + ptrT ptszPage( mir_a2t(pszPage)); HTREEITEM hItem = NULL; if (pszGroup != NULL) { - MTBuf ptszGroup( mir_a2t(pszGroup)); + ptrT ptszGroup( mir_a2t(pszGroup)); hItem = FindNamedTreeItemAtRoot( GetDlgItem(hwndOptions, IDC_PAGETREE), TranslateTH(hLangpack, ptszGroup)); if (hItem != NULL) hItem = FindNamedTreeItemAtChildren( GetDlgItem(hwndOptions, IDC_PAGETREE), hItem, TranslateTH(hLangpack, ptszPage)); diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp index a424516d5f..c985d44a6e 100644 --- a/src/modules/plugins/pluginopts.cpp +++ b/src/modules/plugins/pluginopts.cpp @@ -366,19 +366,19 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar ListView_GetItemText(hwndList, hdr->iItem, 1, buf, SIZEOF(buf)); SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGININFOFRAME), sel ? buf : _T("")); - MTBuf tszAuthor( latin2t(sel ? dat->author : NULL)); + ptrT tszAuthor( latin2t(sel ? dat->author : NULL)); SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINAUTHOR), tszAuthor); - MTBuf tszEmail( latin2t(sel ? dat->authorEmail : NULL)); + ptrT tszEmail( latin2t(sel ? dat->authorEmail : NULL)); SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINEMAIL), tszEmail); - MTBuf p( Langpack_PcharToTchar(dat->description)); + ptrT p( Langpack_PcharToTchar(dat->description)); SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINLONGINFO), sel ? (TCHAR*)p : _T("")); - MTBuf tszCopyright( latin2t(sel ? dat->copyright : NULL)); + ptrT tszCopyright( latin2t(sel ? dat->copyright : NULL)); SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINCPYR), tszCopyright); - MTBuf tszUrl( latin2t(sel ? dat->homepage : NULL)); + ptrT tszUrl( latin2t(sel ? dat->homepage : NULL)); SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINURL), tszUrl); if ( !equalUUID(miid_last, dat->uuid)) { diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index 9eba7673ee..ef2a4b7eac 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.cpp @@ -165,7 +165,7 @@ static INT_PTR Proto_RecvMessage(WPARAM, LPARAM lParam) if (pre->szMessage == NULL) return NULL; - MCBuf pszTemp; + ptrA pszTemp; DBEVENTINFO dbei = { 0 }; dbei.cbSize = sizeof(dbei); -- cgit v1.2.3