summaryrefslogtreecommitdiff
path: root/plugins/MirOTR/src/utils.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2016-07-25 10:31:04 +0000
committerGeorge Hazan <george.hazan@gmail.com>2016-07-25 10:31:04 +0000
commit8ae3679aa1339ce9abee53adb69902bd6b7513dc (patch)
tree94ef8927e12043ed6dcc15e1e640d68a8add520e /plugins/MirOTR/src/utils.cpp
parent1e273e28d89b5838e3d0f0cafac9676577cb71ce (diff)
hello, Unix.
phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR/src/utils.cpp')
-rw-r--r--plugins/MirOTR/src/utils.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/MirOTR/src/utils.cpp b/plugins/MirOTR/src/utils.cpp
index 9d2d30a9ac..0fc9e6a450 100644
--- a/plugins/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/src/utils.cpp
@@ -81,7 +81,7 @@ void otrl_privkey_hash_to_humanT(TCHAR human[45], const unsigned char hash[20])
for(word=0; word<5; ++word) {
for(byte=0; byte<4; ++byte) {
- _stprintf(p, _T("%02X"), hash[word*4+byte]); //!!!!!!!!!!!!!!
+ _stprintf(p, L"%02X", hash[word*4+byte]); //!!!!!!!!!!!!!!
p += 2;
}
*(p++) = ' ';
@@ -107,7 +107,7 @@ __inline const TCHAR* contact_get_nameT(MCONTACT hContact) {
TCHAR* ProtoGetNickname(const char* proto)
{
TCHAR *p = Contact_GetInfo(CNF_NICK, NULL, proto);
- return (p != NULL) ? p : mir_tstrdup(_T(""));
+ return (p != NULL) ? p : mir_tstrdup(L"");
}
void ShowPopup(const TCHAR* line1, const TCHAR* line2, int timeout, const MCONTACT hContact) {
@@ -115,12 +115,12 @@ void ShowPopup(const TCHAR* line1, const TCHAR* line2, int timeout, const MCONTA
if ( !options.bHavePopups) {
TCHAR title[256];
- mir_sntprintf(title, _T("%s Message"), _T(MODULENAME));
+ mir_sntprintf(title, L"%s Message", _T(MODULENAME));
if(line1 && line2) {
int size = int(mir_tstrlen(line1) + mir_tstrlen(line2) + 3);
TCHAR *message = new TCHAR[size]; // newline and null terminator
- mir_sntprintf(message, size, _T("%s\r\n%s"), line1, line2);
+ mir_sntprintf(message, size, L"%s\r\n%s", line1, line2);
MessageBox( NULL, message, title, MB_OK | MB_ICONINFORMATION );
delete[] message;
} else if(line1) {
@@ -165,7 +165,7 @@ void ShowWarning(TCHAR *msg) {
if(disp == ED_POP && !options.bHavePopups) disp = ED_BAL;
if(disp == ED_BAL && !ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) disp = ED_MB;
- mir_sntprintf(buffer, _T("%s Warning"), _T(MODULENAME));
+ mir_sntprintf(buffer, L"%s Warning", _T(MODULENAME));
switch(disp) {
@@ -173,7 +173,7 @@ void ShowWarning(TCHAR *msg) {
{
int size = int(mir_tstrlen(msg) + 515);
TCHAR *message = new TCHAR[size]; // newline and null terminator
- mir_sntprintf(message, size, _T("%s\r\n%s"), buffer, msg);
+ mir_sntprintf(message, size, L"%s\r\n%s", buffer, msg);
PUShowMessageT(message, SM_WARNING);
delete[] message;
}
@@ -211,7 +211,7 @@ void ShowError(TCHAR *msg) {
if(disp == ED_POP && !options.bHavePopups) disp = ED_BAL;
if(disp == ED_BAL && !ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) disp = ED_MB;
- mir_sntprintf(buffer, _T("%s Error"), _T(MODULENAME));
+ mir_sntprintf(buffer, L"%s Error", _T(MODULENAME));
TCHAR *message;
@@ -220,7 +220,7 @@ void ShowError(TCHAR *msg) {
{
int size = int(mir_tstrlen(msg) + 515);
message = new TCHAR[size]; // newline and null terminator
- mir_sntprintf(message, size, _T("%s\r\n%s"), buffer, msg);
+ mir_sntprintf(message, size, L"%s\r\n%s", buffer, msg);
PUShowMessageT(message, SM_WARNING);
delete[] message;
}
@@ -269,7 +269,7 @@ void ShowErrorUtf(char* msg) {
void ShowMessageInline(const MCONTACT hContact, const TCHAR *msg) {
TCHAR buff[1024];
- mir_sntprintf(buff, _T("%s%s"), _T(LANG_INLINE_PREFIX), msg);
+ mir_sntprintf(buff, L"%s%s", _T(LANG_INLINE_PREFIX), msg);
T2Utf utf(buff);
PROTORECVEVENT pre = {0};