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/CLCDInput.cpp | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp') diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp index 547216ac09..1ca9bd4378 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp @@ -298,9 +298,9 @@ LRESULT CLCDInput::ProcessKeyEvent(int Code, WPARAM wParam, LPARAM lParam) /* if(bKeyDown) - TRACE(_T("Key pressed: %i\n"),key->vkCode); + TRACE(L"Key pressed: %i\n",key->vkCode); else - TRACE(_T("Key released: %i\n"),key->vkCode); + TRACE(L"Key released: %i\n",key->vkCode); */ // Only handle Keyup if(bKeyDown) @@ -310,7 +310,7 @@ LRESULT CLCDInput::ProcessKeyEvent(int Code, WPARAM wParam, LPARAM lParam) && m_acKeyboardState[VK_SHIFT] & 0x80) { ActivateKeyboardLayout((HKL)HKL_NEXT,0);//KLF_SETFORPROCESS); - TRACE(_T("Keyboardlayout switched!\n")); + TRACE(L"Keyboardlayout switched!\n"); return 1; } @@ -566,7 +566,7 @@ void CLCDInput::Reset() memset(&m_Marker[0], 0, sizeof(SMarker)); - m_strText = _T(""); + m_strText = L""; m_vLineOffsets.clear(); m_iLinePosition = 0; SLineEntry offset; @@ -623,7 +623,7 @@ void CLCDInput::UpdateOffsets(int iModified) bool bLineClosed = false; - // TRACE(_T("InputText: Begin Update at #%i\n"),iLine); + // TRACE(L"InputText: Begin Update at #%i\n",iLine); for(;iLine iLen) { - // TRACE(_T("InputText: Deleted offset #%i\n"),iLine); + // TRACE(L"InputText: Deleted offset #%i\n",iLine); m_vLineOffsets.erase(m_vLineOffsets.begin()+iLine); continue; } @@ -647,7 +647,7 @@ void CLCDInput::UpdateOffsets(int iModified) iWordOffset= iChar; GetTextExtentExPoint(hDC,pszText+iChar,iLen-iChar,GetWidth(),&iMaxChars,piWidths,&sizeLine); - pos = m_strText.find(_T("\n"),iChar); + pos = m_strText.find(L"\n",iChar); // check for linebreaks if(pos != tstring::npos && pos >= iChar && pos <= iChar + iMaxChars) { @@ -658,7 +658,7 @@ void CLCDInput::UpdateOffsets(int iModified) else { // find the last space in the line - pos = m_strText.rfind(_T(" "),iChar + iMaxChars); + pos = m_strText.rfind(L" ",iChar + iMaxChars); if(pos != tstring::npos && pos >= iChar) iWordOffset = (int)pos +1; else @@ -701,7 +701,7 @@ void CLCDInput::UpdateOffsets(int iModified) // if there are other offsets in front of this one, delete them if(iLine2 != iLine + 1 ) { - // TRACE(_T("InputText: Deleted offsets #%i to #%i\n"),iLine+1,iLine2-1); + // TRACE(L"InputText: Deleted offsets #%i to #%i\n",iLine+1,iLine2-1); m_vLineOffsets.erase(m_vLineOffsets.begin()+iLine+1,m_vLineOffsets.begin()+iLine2); } break; @@ -724,7 +724,7 @@ void CLCDInput::UpdateOffsets(int iModified) else m_vLineOffsets[iLine].iWidth = 0; - // TRACE(_T("InputText: shifted offsets #%i to end %i position(s)\n"),iLine+1,iDistance); + // TRACE(L"InputText: shifted offsets #%i to end %i position(s)\n",iLine+1,iDistance); for(iLine++;iLine