summaryrefslogtreecommitdiffstats
path: root/src/kvilib/core/kvi_string.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvilib/core/kvi_string.cpp')
-rw-r--r--src/kvilib/core/kvi_string.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 525ad714..54a1c4a6 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -109,7 +109,7 @@ kvi_wslen_t kvi_wstrlen(const kvi_wchar_t * str)
if(pString->length() > 0) \
{ \
if(len <= ((int)(pString->length())))return (-1); \
- _WSTRING_WMEMCPY(p,pString->tqunicode(),pString->length()); \
+ _WSTRING_WMEMCPY(p,pString->unicode(),pString->length()); \
p += pString->length(); \
len -= pString->length(); \
} \
@@ -192,8 +192,8 @@ int kvi_wvsnprintf(kvi_wchar_t *buffer,kvi_wslen_t len,const kvi_wchar_t *fmt,kv
bool kvi_qstringEqualCI(const TQString &s1,const TQString &s2)
{
- const TQChar * p1 = s1.tqunicode();
- const TQChar * p2 = s2.tqunicode();
+ const TQChar * p1 = s1.unicode();
+ const TQChar * p2 = s2.unicode();
int l = s1.length() < s2.length() ? s1.length() : s2.length();
#ifdef COMPILE_USE_QT4
while(l-- && (p1->toLower() == p2->toLower()))p1++,p2++;
@@ -1141,23 +1141,23 @@ KviStr::KviStr(char c,int fillLen)
}
-KviStr::KviStr(const kvi_wchar_t * tqunicode)
+KviStr::KviStr(const kvi_wchar_t * unicode)
{
- if(!tqunicode)
+ if(!unicode)
{
m_len = 0;
m_ptr = (char *)kvi_malloc(1);
*m_ptr = 0;
} else {
- m_len = kvi_wstrlen(tqunicode);
+ m_len = kvi_wstrlen(unicode);
m_ptr = (char *)kvi_malloc(m_len + 1);
register char * p = m_ptr;
- while(*tqunicode)*p++ = *tqunicode++;
+ while(*unicode)*p++ = *unicode++;
*p = 0;
}
}
-KviStr::KviStr(const kvi_wchar_t * tqunicode,int len)
+KviStr::KviStr(const kvi_wchar_t * unicode,int len)
{
m_len = len;
m_ptr = (char *)kvi_malloc(m_len + 1);
@@ -1165,7 +1165,7 @@ KviStr::KviStr(const kvi_wchar_t * tqunicode,int len)
char * end = p + len;
while(p != end)
{
- *p++ = *tqunicode++;
+ *p++ = *unicode++;
}
*p = 0;
}