From 688f55ba998c19304a29727c910504903f4cc49a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Nov 2014 18:51:36 +0000 Subject: lstr* replacements git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CSList/src/cslist.cpp | 16 ++++++++-------- plugins/CSList/src/cslist.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins/CSList') diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 32bc9c85d3..7926bf6af7 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -263,14 +263,14 @@ void importCustomStatuses(CSWindow* csw, int result) mir_snprintf(bufTitle, 32, "XStatus%dName", i); if ( !db_get_ts( NULL, protoName, bufTitle, &dbv )) { - lstrcpy(si->m_tszTitle, dbv.ptszVal); + mir_tstrcpy(si->m_tszTitle, dbv.ptszVal); db_free(&dbv); } else si->m_tszTitle[0] = 0; mir_snprintf(bufMessage, 32, "XStatus%dMsg", i); if ( !db_get_ts( NULL, protoName, bufMessage, &dbv )) { - lstrcpy(si->m_tszMessage, dbv.ptszVal); + mir_tstrcpy(si->m_tszMessage, dbv.ptszVal); db_free(&dbv); } else si->m_tszMessage[0] = 0; @@ -392,10 +392,10 @@ BOOL CSWindow::itemPassedFilter( ListItem< StatusItem >* li ) TCHAR filter[MAX_PATH]; GetDlgItemText( m_handle, IDC_FILTER_FIELD, filter, SIZEOF(filter) ); - if ( lstrlen( filter )) + if ( mir_tstrlen( filter )) { TCHAR title[EXTRASTATUS_TITLE_LIMIT], message[EXTRASTATUS_MESSAGE_LIMIT]; - lstrcpy( title, li->m_item->m_tszTitle ); lstrcpy( message, li->m_item->m_tszMessage ); + mir_tstrcpy( title, li->m_item->m_tszTitle ); mir_tstrcpy( message, li->m_item->m_tszMessage ); if ( strpos( _tcslwr( title ), _tcslwr( filter )) == -1 ) if ( strpos( _tcslwr( message ), _tcslwr( filter )) == -1 ) return FALSE; @@ -580,10 +580,10 @@ void CSAMWindow::checkItemValidity() cs.ptszName = tszTitle; cs.wParam = &i; if ( CallProtoService(pdescr->szModuleName, PS_GETCUSTOMSTATUSEX, 0, (LPARAM)&cs) == 0) - lstrcpyn(m_item->m_tszTitle, TranslateTS(tszTitle), SIZEOF(m_item->m_tszTitle)); + mir_tstrncpy(m_item->m_tszTitle, TranslateTS(tszTitle), SIZEOF(m_item->m_tszTitle)); if ( lstrcmp(m_item->m_tszMessage, tszInputMessage)) - lstrcpy( m_item->m_tszMessage, tszInputMessage), m_bChanged = true; + mir_tstrcpy( m_item->m_tszMessage, tszInputMessage), m_bChanged = true; } CSListView::CSListView(HWND hwnd, CSWindow* parent) @@ -754,14 +754,14 @@ void CSItemsList::loadItems(char *protoName) mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_Item%dTitle", protoName, i); if ( !getTString(dbSetting, &dbv)) { - lstrcpy(item->m_tszTitle, dbv.ptszVal); + mir_tstrcpy(item->m_tszTitle, dbv.ptszVal); db_free(&dbv); } else item->m_tszTitle[0] = 0; mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_Item%dMessage", protoName, i); if ( !getTString(dbSetting, &dbv)) { - lstrcpy(item->m_tszMessage, dbv.ptszVal); + mir_tstrcpy(item->m_tszMessage, dbv.ptszVal); db_free(&dbv); } else item->m_tszMessage[0] = 0; diff --git a/plugins/CSList/src/cslist.h b/plugins/CSList/src/cslist.h index b359367fcf..e7ea295437 100644 --- a/plugins/CSList/src/cslist.h +++ b/plugins/CSList/src/cslist.h @@ -116,16 +116,16 @@ struct StatusItem // list item structure StatusItem() { m_iIcon = 0; - lstrcpy(m_tszTitle, _T("")); - lstrcpy(m_tszMessage, _T("")); + mir_tstrcpy(m_tszTitle, _T("")); + mir_tstrcpy(m_tszMessage, _T("")); m_bFavourite = FALSE; } StatusItem( const StatusItem& p ) { m_iIcon = p.m_iIcon; - lstrcpy( m_tszTitle, p.m_tszTitle ); - lstrcpy( m_tszMessage, p.m_tszMessage ); + mir_tstrcpy( m_tszTitle, p.m_tszTitle ); + mir_tstrcpy( m_tszMessage, p.m_tszMessage ); m_bFavourite = p.m_bFavourite; } -- cgit v1.2.3