diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-06-23 21:06:11 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-06-23 21:06:11 +0000 |
| commit | 5b3b0020dd6b3797a5808c7362e358df48bd4e49 (patch) | |
| tree | 9ee3e4de8b8f04a8faf4186ae2e1f84c3ef21b17 /plugins/Scriver/chat/options.cpp | |
| parent | 449553a9543c7ecc601f74c4abccc07d13521b15 (diff) | |
Scriver:
plusified
git-svn-id: http://svn.miranda-ng.org/main/trunk@591 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/chat/options.cpp')
| -rw-r--r-- | plugins/Scriver/chat/options.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/plugins/Scriver/chat/options.cpp b/plugins/Scriver/chat/options.cpp index f030359ee6..29bb385db0 100644 --- a/plugins/Scriver/chat/options.cpp +++ b/plugins/Scriver/chat/options.cpp @@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define UM_CHECKSTATECHANGE (WM_USER+100)
-extern HANDLE g_hInst;
extern HBRUSH hListBkgBrush;
extern HBRUSH hListSelectedBkgBrush;
extern FONTINFO aFonts[OPTIONS_FONTCOUNT];
@@ -340,7 +339,7 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_GROUP));
if(iLen > 0)
{
- pszText = mir_realloc(pszText, iLen+1);
+ pszText = (char *)mir_realloc(pszText, iLen+1);
GetDlgItemTextA(hwndDlg, IDC_CHAT_GROUP, pszText,iLen+1);
DBWriteContactSettingString(NULL, "Chat", "AddToGroup", pszText);
}
@@ -499,8 +498,8 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam CallService(MS_UTILS_PATHTORELATIVET, (WPARAM)tszDirectory, (LPARAM)tszTemp );
SetWindowText(GetDlgItem(hwndDlg, IDC_CHAT_LOGDIRECTORY), lstrlen(tszTemp) > 1?tszTemp:DEFLOGFILENAME);
}
- psMalloc->lpVtbl->Free(psMalloc,idList);
- psMalloc->lpVtbl->Release(psMalloc);
+ psMalloc->Free(idList);
+ psMalloc->Release();
}
break;
}
@@ -553,7 +552,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_HIGHLIGHTWORDS));
if ( iLen > 0 ) {
- TCHAR *ptszText = mir_alloc((iLen+2) * sizeof(TCHAR));
+ TCHAR *ptszText = (TCHAR *)mir_alloc((iLen+2) * sizeof(TCHAR));
TCHAR *p2 = NULL;
if(ptszText) {
@@ -571,7 +570,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_LOGDIRECTORY));
if ( iLen > 0 ) {
- TCHAR *pszText1 = malloc(iLen*sizeof(TCHAR) + 2);
+ TCHAR *pszText1 = (TCHAR *)malloc(iLen*sizeof(TCHAR) + 2);
GetDlgItemText(hwndDlg, IDC_CHAT_LOGDIRECTORY, pszText1, iLen + 1);
DBWriteContactSettingTString(NULL, "Chat", "LogDirectory", pszText1);
CallService(MS_UTILS_PATHTOABSOLUTET, (WPARAM)pszText1, (LPARAM)g_Settings.pszLogDir);
@@ -584,7 +583,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_LOGTIMESTAMP));
if ( iLen > 0 ) {
- pszText = mir_realloc(pszText, iLen+1);
+ pszText = (char *)mir_realloc(pszText, iLen+1);
GetDlgItemTextA(hwndDlg, IDC_CHAT_LOGTIMESTAMP, pszText,iLen+1);
DBWriteContactSettingString(NULL, "Chat", "LogTimestamp", pszText);
}
@@ -592,7 +591,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_TIMESTAMP));
if ( iLen > 0 ) {
- pszText = mir_realloc(pszText, iLen+1);
+ pszText = (char *)mir_realloc(pszText, iLen+1);
GetDlgItemTextA(hwndDlg, IDC_CHAT_TIMESTAMP, pszText,iLen+1);
DBWriteContactSettingString(NULL, "Chat", "HeaderTime", pszText);
}
@@ -600,7 +599,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_INSTAMP));
if ( iLen > 0 ) {
- pszText = mir_realloc(pszText, iLen+1);
+ pszText = (char *)mir_realloc(pszText, iLen+1);
GetDlgItemTextA(hwndDlg, IDC_CHAT_INSTAMP, pszText,iLen+1);
DBWriteContactSettingString(NULL, "Chat", "HeaderIncoming", pszText);
}
@@ -608,7 +607,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_OUTSTAMP));
if ( iLen > 0 ) {
- pszText = mir_realloc(pszText, iLen+1);
+ pszText = (char *)mir_realloc(pszText, iLen+1);
GetDlgItemTextA(hwndDlg, IDC_CHAT_OUTSTAMP, pszText,iLen+1);
DBWriteContactSettingString(NULL, "Chat", "HeaderOutgoing", pszText);
}
|