also wrtrim renamed, according to the standard, to rtrimw

git-svn-id: http://svn.miranda-ng.org/main/trunk@4516 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 20 insertions, 20 deletions

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index c36c5dd748..1e423ad091 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -1510,7 +1510,7 @@ int CJabberProto::JabberGcEventHook(WPARAM, LPARAM lParam)
 	switch (gch->pDest->iType) {

 	case GC_USER_MESSAGE:

 		if (gch->pszText && lstrlen(gch->ptszText) > 0) {

-			trtrim(gch->ptszText);

+			rtrimt(gch->ptszText);

 

 			if (m_bJabberOnline) {

 				TCHAR* buf = NEWTSTR_ALLOCA(gch->ptszText);

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 376dc3b7fc..a2a5745d28 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -296,7 +296,7 @@ LBL_Exit:
 			db_free(&dbv);

 		}

 

-		if (*trtrim(info->username) == '\0') {

+		if (*rtrimt(info->username) == '\0') {

 			DWORD dwSize = SIZEOF(info->username);

 			if (GetUserName(info->username, &dwSize))

 				JSetStringT(NULL, "LoginName", info->username);

@@ -304,7 +304,7 @@ LBL_Exit:
 				info->username[0] = 0;

 		}

 

-		if (*trtrim(info->username) == '\0') {

+		if (*rtrimt(info->username) == '\0') {

 			Log("Thread ended, login name is not configured");

 			JSendBroadcast(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_BADUSERID);

 LBL_FatalError:

diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp
index fc738af20d..1c78c2af7d 100644
--- a/protocols/MSN/src/msn_chat.cpp
+++ b/protocols/MSN/src/msn_chat.cpp
@@ -345,7 +345,7 @@ int CMsnProto::MSN_GCEventHook(WPARAM, LPARAM lParam)
 				ThreadData* thread = MSN_GetThreadByChatId(gch->pDest->ptszID);

 				if (thread)

 				{

-					trtrim(gch->ptszText); // remove the ending linebreak

+					rtrimt(gch->ptszText); // remove the ending linebreak

 					TCHAR* pszMsg = UnEscapeChatTags(NEWTSTR_ALLOCA(gch->ptszText));

 					thread->sendMessage('N', NULL, NETID_MSN, UTF8(pszMsg), 0);

 

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index fa11d889eb..cbd45e8f92 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -413,7 +413,7 @@ void CMsnProto::displayEmailCount(HANDLE hContact)
 	}

 	while (ch && !_istdigit(ch[1]));

 	if (ch) *ch = 0;

-	trtrim(name);

+	rtrimt(name);

 

 	TCHAR szNick[128];

 	mir_sntprintf(szNick, SIZEOF(szNick),

diff --git a/protocols/Xfire/src/Xfire_base.h b/protocols/Xfire/src/Xfire_base.h
index 248982b85f..451fa156d9 100644
--- a/protocols/Xfire/src/Xfire_base.h
+++ b/protocols/Xfire/src/Xfire_base.h
@@ -1,21 +1,21 @@
 /*

  *  Plugin of miranda IM(ICQ) for Communicating with users of the XFire Network. 

  *

- *  Copyright (C) 2010 by
- *          dufte <dufte@justmail.de>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  Copyright (C) 2010 by

+ *          dufte <dufte@justmail.de>

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License as published by

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA

  *

  *