summaryrefslogtreecommitdiff
path: root/protocols/JabberG/jabber_xml.cpp
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-14 16:22:13 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-14 16:22:13 +0000
commitd5d023f683b23fe26ddea93738cb721d532804f0 (patch)
tree21e7398686c7a5d1604d58bfb71ca4329c84be66 /protocols/JabberG/jabber_xml.cpp
parente58823d961a630eb62e60d2ccb443761ba5f1704 (diff)
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/jabber_xml.cpp')
-rw-r--r--protocols/JabberG/jabber_xml.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/protocols/JabberG/jabber_xml.cpp b/protocols/JabberG/jabber_xml.cpp
index 33a5ddad21..70898199c9 100644
--- a/protocols/JabberG/jabber_xml.cpp
+++ b/protocols/JabberG/jabber_xml.cpp
@@ -30,29 +30,7 @@ Last change by : $Author: george.hazan $
#define TAG_MAX_LEN 128
#define ATTR_MAX_LEN 8192
-#if defined( _UNICODE )
- #define T2UTF(A) A
-#else
-
-struct T2UTF
-{
- T2UTF( const TCHAR* str ) :
- m_text( mir_utf8encodeT( str ))
- {}
-
- ~T2UTF()
- { mir_free( m_text );
- }
-
- __inline operator TCHAR*() const
- { return m_text;
- }
-
-private:
- TCHAR* m_text;
-};
-
-#endif
+#define T2UTF(A) A
/////////////////////////////////////////////////////////////////////////////////////////
// XmlNodeIq class members
@@ -240,7 +218,6 @@ HXML __fastcall xmlGetChild( HXML hXml, LPCTSTR key )
return xi.getNthChild( hXml, key, 0 );
}
-#if defined( _UNICODE )
HXML __fastcall xmlGetChild( HXML hXml, LPCSTR key )
{
LPTSTR wszKey = mir_a2t( key );
@@ -253,7 +230,6 @@ HXML __fastcall xmlGetChildByTag( HXML hXml, LPCTSTR key, LPCTSTR attrName, LPCT
{
return xi.getChildByAttrValue( hXml, key, attrName, attrValue );
}
-#endif
HXML __fastcall xmlGetChildByTag( HXML hXml, LPCSTR key, LPCSTR attrName, LPCTSTR attrValue )
{