diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdauth/authdialogs.cpp | 10 | ||||
| -rw-r--r-- | src/core/stdfile/filerecvdlg.cpp | 4 | ||||
| -rw-r--r-- | src/modules/clist/movetogroup.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extraicons/extraicons.cpp | 2 | ||||
| -rw-r--r-- | src/modules/options/options.cpp | 4 | ||||
| -rw-r--r-- | src/modules/plugins/pluginopts.cpp | 10 | ||||
| -rw-r--r-- | src/modules/protocols/protocols.cpp | 2 |
7 files changed, 17 insertions, 17 deletions
diff --git a/src/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp index 23586bf564..72b8064114 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);
- mir_ptr<TCHAR> lastT(dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2t(last));
- mir_ptr<TCHAR> firstT(dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2t(first));
- mir_ptr<TCHAR> nickT(dbei.flags & DBEF_UTF ? Utf8DecodeT(nick) : mir_a2t(nick));
- mir_ptr<TCHAR> emailT(dbei.flags & DBEF_UTF ? Utf8DecodeT(email) : mir_a2t(email));
- mir_ptr<TCHAR> reasonT(dbei.flags & DBEF_UTF ? Utf8DecodeT(reason) : mir_a2t(reason));
+ 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));
TCHAR name[128] = _T("");
int off = 0;
diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp index 5633073ac4..ae42779071 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;
- mir_ptr<TCHAR> ptszFileName( DbGetEventStringT(&dbei, str));
+ MTBuf ptszFileName( DbGetEventStringT(&dbei, str));
SetDlgItemText(hwndDlg, IDC_FILENAMES, ptszFileName);
unsigned len = (unsigned)strlen(str) + 1;
if (len + 4 < dbei.cbBlob) {
str += len;
- mir_ptr<TCHAR> ptszDescription( DbGetEventStringT(&dbei, str));
+ MTBuf ptszDescription( DbGetEventStringT(&dbei, str));
SetDlgItemText(hwndDlg, IDC_MSG, ptszDescription);
}
}
diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp index 97d8c745e9..d994e30592 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();
- mir_ptr<TCHAR> szContactGroup( db_get_tsa((HANDLE)wParam, "CList", "Group"));
+ MTBuf 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 79922167c4..fb06bb4ee4 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;
- mir_ptr<TCHAR> tszDesc( mir_a2t(ei->description));
+ MTBuf 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 9b0c4e0e11..d47ad558c0 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) {
- mir_ptr<TCHAR> ptszPage( mir_a2t(pszPage));
+ MTBuf ptszPage( mir_a2t(pszPage));
HTREEITEM hItem = NULL;
if (pszGroup != NULL) {
- mir_ptr<TCHAR> ptszGroup( mir_a2t(pszGroup));
+ MTBuf 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 564413c489..a424516d5f 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(""));
- mir_ptr<TCHAR> tszAuthor( latin2t(sel ? dat->author : NULL));
+ MTBuf tszAuthor( latin2t(sel ? dat->author : NULL));
SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINAUTHOR), tszAuthor);
- mir_ptr<TCHAR> tszEmail( latin2t(sel ? dat->authorEmail : NULL));
+ MTBuf tszEmail( latin2t(sel ? dat->authorEmail : NULL));
SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINEMAIL), tszEmail);
- mir_ptr<TCHAR> p( Langpack_PcharToTchar(dat->description));
+ MTBuf p( Langpack_PcharToTchar(dat->description));
SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINLONGINFO), sel ? (TCHAR*)p : _T(""));
- mir_ptr<TCHAR> tszCopyright( latin2t(sel ? dat->copyright : NULL));
+ MTBuf tszCopyright( latin2t(sel ? dat->copyright : NULL));
SetWindowText( GetDlgItem(hwndDlg, IDC_PLUGINCPYR), tszCopyright);
- mir_ptr<TCHAR> tszUrl( latin2t(sel ? dat->homepage : NULL));
+ MTBuf 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 ffc0247a12..9eba7673ee 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;
- mir_ptr<char> pszTemp;
+ MCBuf pszTemp;
DBEVENTINFO dbei = { 0 };
dbei.cbSize = sizeof(dbei);
|