From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Jul 2016 10:31:04 +0000 Subject: hello, Unix. phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp') diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp index 38daccc7bf..2c0a0bd866 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp @@ -11,7 +11,7 @@ CLCDLabel::CLCDLabel() : m_bCutOff(true), m_bWordWrap(false), m_iCutOffIndex(0), m_iLineCount(0) { - m_strText = _T(""); + m_strText = L""; } //************************************************************************ @@ -124,7 +124,7 @@ void CLCDLabel::UpdateCutOffIndex() if(iLen <= 0) { - m_strCutOff = _T(""); + m_strCutOff = L""; m_iCutOffIndex = 0; return; } @@ -162,7 +162,7 @@ void CLCDLabel::UpdateCutOffIndex() if(m_strText[i] == '\n' || m_strText[i] == ' ') i++; - pos = m_strText.find(_T("\n"),i); + pos = m_strText.find(L"\n",i); // check for linebreaks if(pos != tstring::npos && pos != i && pos >= i && pos != i+iMaxChars) iMaxChars = 1 + (int)pos - i; @@ -170,7 +170,7 @@ void CLCDLabel::UpdateCutOffIndex() else if(iMaxChars < iLen - i || sizeLine.cx >= GetWidth()) { // find the last space in the line ( substract -1 from offset to ignore spaces as last chars ) - pos = m_strText.rfind(_T(" "),i + iMaxChars -1 ); + pos = m_strText.rfind(L" ",i + iMaxChars -1 ); if(pos != tstring::npos && pos != i && pos >= i && pos != i+iMaxChars) iMaxChars = 1 + (int)pos - i; } @@ -188,7 +188,7 @@ void CLCDLabel::UpdateCutOffIndex() // calculate the cutoff position - GetTextExtentPoint(hDC,_T("..."),3,&sizeCutOff); + GetTextExtentPoint(hDC,L"...",3,&sizeCutOff); int *piWidths = new int[(*--m_vLines.end()).length()]; int iMaxChars = 0; @@ -202,7 +202,7 @@ void CLCDLabel::UpdateCutOffIndex() if(piWidths[iMaxChars] + sizeCutOff.cx <= iWidth) break; } - (*--m_vLines.end()) = (*--m_vLines.end()).substr(0,iMaxChars) + _T("..."); + (*--m_vLines.end()) = (*--m_vLines.end()).substr(0,iMaxChars) + L"..."; } delete[] piWidths; -- cgit v1.2.3