summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-05-16 15:08:49 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-05-16 15:08:49 +0000
commit2e4abd268c71f15bcf73c49a5005f128ffd8ee96 (patch)
tree92624c24bafa4a02eb7e7fd2501a988e385ffab3 /src/modules
parent769714b0aa9606e0d94a9d88c7c3ee3064792e4a (diff)
shortened typedefs for string buffers:
MCBuf -> mir_ptr<char> MTBuf -> mir_ptr<TCHAR> MWBuf -> mir_ptr<WCHAR> git-svn-id: http://svn.miranda-ng.org/main/trunk@4680 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/clist/movetogroup.cpp2
-rw-r--r--src/modules/extraicons/extraicons.cpp2
-rw-r--r--src/modules/options/options.cpp4
-rw-r--r--src/modules/plugins/pluginopts.cpp10
-rw-r--r--src/modules/protocols/protocols.cpp2
5 files changed, 10 insertions, 10 deletions
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);