From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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
---
 protocols/Omegle/src/chat.cpp          | 10 +++++-----
 protocols/Omegle/src/communication.cpp |  8 ++++----
 protocols/Omegle/src/proto.cpp         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'protocols/Omegle')

diff --git a/protocols/Omegle/src/chat.cpp b/protocols/Omegle/src/chat.cpp
index f82ff24fdc..6fe46e57b4 100644
--- a/protocols/Omegle/src/chat.cpp
+++ b/protocols/Omegle/src/chat.cpp
@@ -25,7 +25,7 @@ void OmegleProto::UpdateChat(const TCHAR *name, const TCHAR *message, bool addto
 {
 	// replace % to %% to not interfere with chat color codes
 	std::tstring smessage = message;
-	utils::text::treplace_all(&smessage, _T("%"), _T("%%"));
+	utils::text::treplace_all(&smessage, L"%", L"%%");
 
 	GCDEST gcd = { m_szModuleName, m_tszUserName, GC_EVENT_MESSAGE };
 	GCEVENT gce = { sizeof(gce), &gcd };
@@ -241,9 +241,9 @@ void OmegleProto::AddChatContact(const TCHAR *name)
 		gce.bIsMe = mir_tstrcmp(name, this->facy.nick_);
 
 	if (gce.bIsMe)
-		gce.ptszStatus = _T("Admin");
+		gce.ptszStatus = L"Admin";
 	else
-		gce.ptszStatus = _T("Normal");
+		gce.ptszStatus = L"Normal";
 
 	CallServiceSync(MS_GC_EVENT, 0, reinterpret_cast<LPARAM>(&gce));
 }
@@ -281,10 +281,10 @@ INT_PTR OmegleProto::OnJoinChat(WPARAM, LPARAM suppress)
 	GCDEST gcd = { m_szModuleName, m_tszUserName, GC_EVENT_ADDGROUP };
 	GCEVENT gce = { sizeof(gce), &gcd };
 
-	gce.ptszStatus = _T("Admin");
+	gce.ptszStatus = L"Admin";
 	CallServiceSync(MS_GC_EVENT, NULL, reinterpret_cast<LPARAM>(&gce));
 
-	gce.ptszStatus = _T("Normal");
+	gce.ptszStatus = L"Normal";
 	CallServiceSync(MS_GC_EVENT, NULL, reinterpret_cast<LPARAM>(&gce));
 
 	SetTopic();
diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp
index 2db3c5255b..db1391ba82 100644
--- a/protocols/Omegle/src/communication.cpp
+++ b/protocols/Omegle/src/communication.cpp
@@ -538,10 +538,10 @@ bool Omegle_client::events()
 				for (size_t i = 0; i < size; i++) {
 					likes += ptrT(json_as_string(json_at(items, i)));
 					if (i < size - 1)
-						likes += _T(", ");
+						likes += L", ";
 				}
 				
-				parent->debugLog(_T("Got common likes: '%s'"), likes.c_str());
+				parent->debugLog(L"Got common likes: '%s'", likes.c_str());
 				parent->SetTopic(likes.c_str());
 			}
 			else if (name == "question") {
@@ -556,7 +556,7 @@ bool Omegle_client::events()
 				st.cbSize = sizeof(st);
 				st.hIcon = IcoLib_GetIconByHandle(GetIconHandle("typing_on"));
 
-				ptrT who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_tstrdup(_T("Stranger")));
+				ptrT who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_tstrdup(L"Stranger"));
 				mir_sntprintf(st.tszText, TranslateT("%s is typing."), TranslateTS(who));
 
 				CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)parent->GetChatHandle(), (LPARAM)&st);
@@ -569,7 +569,7 @@ bool Omegle_client::events()
 				st.cbSize = sizeof(st);
 				st.hIcon = IcoLib_GetIconByHandle(GetIconHandle("typing_off"));
 
-				ptrT who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_tstrdup(_T("Stranger")));
+				ptrT who(name == "spyTyping" ? json_as_string(json_at(item, 1)) : mir_tstrdup(L"Stranger"));
 				mir_sntprintf(st.tszText, TranslateT("%s stopped typing."), TranslateTS(who));
 
 				CallService(MS_MSG_SETSTATUSTEXT, (WPARAM)parent->GetChatHandle(), (LPARAM)&st);
diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp
index 3f464a4322..42d0249c1d 100644
--- a/protocols/Omegle/src/proto.cpp
+++ b/protocols/Omegle/src/proto.cpp
@@ -52,7 +52,7 @@ PROTO<OmegleProto>(proto_name, username)
 	if (m_hNetlibUser == NULL) {
 		TCHAR error[200];
 		mir_sntprintf(error, TranslateT("Unable to initialize Netlib for %s."), m_tszUserName);
-		MessageBox(NULL, error, _T("Miranda NG"), MB_OK | MB_ICONERROR);
+		MessageBox(NULL, error, L"Miranda NG", MB_OK | MB_ICONERROR);
 	}
 
 	facy.set_handle(m_hNetlibUser);
-- 
cgit v1.2.3