summaryrefslogtreecommitdiffstats
path: root/src/kvilib/core
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:20 -0600
commitc6611272c2bc4a42580848946c8c5d81bb0409c7 (patch)
tree0fd5b58844663dfcd00fb2b79cf67dd0fd429c62 /src/kvilib/core
parent805c2821ceaddada48b346c6d11bd0dc1351a539 (diff)
downloadkvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.tar.gz
kvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.
Diffstat (limited to 'src/kvilib/core')
-rw-r--r--src/kvilib/core/kvi_pointerhashtable.h10
-rw-r--r--src/kvilib/core/kvi_qstring.cpp162
-rw-r--r--src/kvilib/core/kvi_string.cpp18
-rw-r--r--src/kvilib/core/kvi_string.h4
4 files changed, 97 insertions, 97 deletions
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h
index 99e513f3..1c2bcab3 100644
--- a/src/kvilib/core/kvi_pointerhashtable.h
+++ b/src/kvilib/core/kvi_pointerhashtable.h
@@ -236,18 +236,18 @@ inline unsigned int kvi_hash_hash(const TQString &szKey,bool bCaseSensitive)
if(!p)return 0;
if(bCaseSensitive)
{
- while(p->unicode())
+ while(p->tqunicode())
{
- uResult += p->unicode();
+ uResult += p->tqunicode();
p++;
}
} else {
- while(p->unicode())
+ while(p->tqunicode())
{
#ifdef COMPILE_USE_QT4
- uResult += p->toLower().unicode();
+ uResult += p->toLower().tqunicode();
#else
- uResult += p->lower().unicode();
+ uResult += p->lower().tqunicode();
#endif
p++;
}
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index 84beaa07..3b564c17 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -54,8 +54,8 @@ namespace KviTQString
bool equalCSN(const TQString &sz1,const TQString &sz2,unsigned int len)
{
if(len == 0)return true; // assume equal
- const TQChar * c1 = sz1.unicode();
- const TQChar * c2 = sz2.unicode();
+ const TQChar * c1 = sz1.tqunicode();
+ const TQChar * c2 = sz2.tqunicode();
unsigned int lmin = MY_MIN(sz1.length(),sz2.length());
if(lmin < len)return false;
const TQChar * c1e = c1 + len;
@@ -64,7 +64,7 @@ namespace KviTQString
while(c1 < c1e)
{
- if(c1->unicode() != c2->unicode())return false;
+ if(c1->tqunicode() != c2->tqunicode())return false;
c1++;
c2++;
}
@@ -74,8 +74,8 @@ namespace KviTQString
bool equalCIN(const TQString &sz1,const TQString &sz2,unsigned int len)
{
if(len == 0)return true; // assume equal
- const TQChar * c1 = sz1.unicode();
- const TQChar * c2 = sz2.unicode();
+ const TQChar * c1 = sz1.tqunicode();
+ const TQChar * c2 = sz2.tqunicode();
unsigned int lmin = MY_MIN(sz1.length(),sz2.length());
if(lmin < len)return false;
const TQChar * c1e = c1 + len;
@@ -85,9 +85,9 @@ namespace KviTQString
while(c1 < c1e)
{
#ifdef COMPILE_USE_QT4
- if(c1->toLower().unicode() != c2->toLower().unicode())return false;
+ if(c1->toLower().tqunicode() != c2->toLower().tqunicode())return false;
#else
- if(c1->lower().unicode() != c2->lower().unicode())return false;
+ if(c1->lower().tqunicode() != c2->lower().tqunicode())return false;
#endif
c1++;
c2++;
@@ -98,7 +98,7 @@ namespace KviTQString
bool equalCSN(const TQString &sz1,const char * sz2,unsigned int len)
{
if(len == 0)return true; // assume equal
- const TQChar * c1 = sz1.unicode();
+ const TQChar * c1 = sz1.tqunicode();
if(sz1.length() < len)return false;
const TQChar * c1e = c1 + len;
@@ -107,7 +107,7 @@ namespace KviTQString
while((c1 < c1e) && (*sz2))
{
- if(c1->unicode() != *sz2)return false;
+ if(c1->tqunicode() != *sz2)return false;
c1++;
sz2++;
}
@@ -117,7 +117,7 @@ namespace KviTQString
bool equalCIN(const TQString &sz1,const char * sz2,unsigned int len)
{
if(len == 0)return true; // assume equal
- const TQChar * c1 = sz1.unicode();
+ const TQChar * c1 = sz1.tqunicode();
if(sz1.length() < len)return false;
const TQChar * c1e = c1 + len;
@@ -127,9 +127,9 @@ namespace KviTQString
while((c1 < c1e) && (*sz2))
{
#ifdef COMPILE_USE_QT4
- if(c1->toLower().unicode() != tolower(*sz2))return false;
+ if(c1->toLower().tqunicode() != tolower(*sz2))return false;
#else
- if(c1->lower().unicode() != tolower(*sz2))return false;
+ if(c1->lower().tqunicode() != tolower(*sz2))return false;
#endif
c1++;
sz2++;
@@ -141,19 +141,19 @@ namespace KviTQString
bool equalCIN(const TQString &sz1,const TQChar *sz2,unsigned int len)
{
if(len == 0)return true; // assume equal
- const TQChar * c1 = sz1.unicode();
+ const TQChar * c1 = sz1.tqunicode();
if(sz1.length() < len)return false;
const TQChar * c1e = c1 + len;
if(!sz2)return !c1;
- if(!c1)return !(sz2->unicode());
+ if(!c1)return !(sz2->tqunicode());
- while((c1 < c1e) && (sz2->unicode()))
+ while((c1 < c1e) && (sz2->tqunicode()))
{
#ifdef COMPILE_USE_QT4
- if(c1->toLower().unicode() != sz2->toLower().unicode())return false;
+ if(c1->toLower().tqunicode() != sz2->toLower().tqunicode())return false;
#else
- if(c1->lower().unicode() != sz2->lower().unicode())return false;
+ if(c1->lower().tqunicode() != sz2->lower().tqunicode())return false;
#endif
c1++;
sz2++;
@@ -165,39 +165,39 @@ namespace KviTQString
{
double size = bytes;
if(size<900)
- return TQString(__tr2qs("%1 bytes")).arg(size,0,'f',3);
+ return TQString(__tr2qs("%1 bytes")).tqarg(size,0,'f',3);
size/=1024;
if(size<900)
- return TQString(__tr2qs("%1 KB")).arg(size,0,'f',3);
+ return TQString(__tr2qs("%1 KB")).tqarg(size,0,'f',3);
size/=1024;
if(size<900)
- return TQString(__tr2qs("%1 MB")).arg(size,0,'f',3);
+ return TQString(__tr2qs("%1 MB")).tqarg(size,0,'f',3);
//Pirated DVD?;)
size/=1024;
if(size<900)
- return TQString(__tr2qs("%1 GB")).arg(size,0,'f',3);
+ return TQString(__tr2qs("%1 GB")).tqarg(size,0,'f',3);
//Uhm.. We are downloading a whole internet:)))
size/=1024;
- return TQString(__tr2qs("%1 TB")).arg(size,0,'f',3);
+ return TQString(__tr2qs("%1 TB")).tqarg(size,0,'f',3);
}
bool equalCS(const TQString &sz1,const TQString &sz2)
{
if(sz1.length() != sz2.length())return false;
- const TQChar * c1 = sz1.unicode();
- const TQChar * c2 = sz2.unicode();
+ const TQChar * c1 = sz1.tqunicode();
+ const TQChar * c2 = sz2.tqunicode();
const TQChar * c1e = c1 + sz1.length();
if(!c1 || !c2)return (c1 == c2);
while(c1 < c1e)
{
- if(c1->unicode() != c2->unicode())return false;
+ if(c1->tqunicode() != c2->tqunicode())return false;
c1++;
c2++;
}
@@ -208,8 +208,8 @@ namespace KviTQString
{
if(sz1.length() != sz2.length())return false;
- const TQChar * c1 = sz1.unicode();
- const TQChar * c2 = sz2.unicode();
+ const TQChar * c1 = sz1.tqunicode();
+ const TQChar * c2 = sz2.tqunicode();
const TQChar * c1e = c1 + sz1.length();
if(!c1 || !c2)return (c1 == c2);
@@ -217,9 +217,9 @@ namespace KviTQString
while(c1 < c1e)
{
#ifdef COMPILE_USE_QT4
- if(c1->toLower().unicode() != c2->toLower().unicode())return false;
+ if(c1->toLower().tqunicode() != c2->toLower().tqunicode())return false;
#else
- if(c1->lower().unicode() != c2->lower().unicode())return false;
+ if(c1->lower().tqunicode() != c2->lower().tqunicode())return false;
#endif
c1++;
c2++;
@@ -230,35 +230,35 @@ namespace KviTQString
// sz2 is assumed to be null terminated, sz1 is not!
bool equalCI(const TQString &sz1,const TQChar *sz2)
{
- const TQChar * c1 = sz1.unicode();
+ const TQChar * c1 = sz1.tqunicode();
const TQChar * c1e = c1 + sz1.length();
if(!c1 || !sz2)return (c1 == sz2);
while(c1 < c1e)
{
- if(!sz2->unicode())return false; // sz1 has at least another character
+ if(!sz2->tqunicode())return false; // sz1 has at least another character
#ifdef COMPILE_USE_QT4
- if(c1->toLower().unicode() != sz2->toLower().unicode())return false;
+ if(c1->toLower().tqunicode() != sz2->toLower().tqunicode())return false;
#else
- if(c1->lower().unicode() != sz2->lower().unicode())return false;
+ if(c1->lower().tqunicode() != sz2->lower().tqunicode())return false;
#endif
c1++;
sz2++;
}
- return (c1 == c1e) && (!sz2->unicode());
+ return (c1 == c1e) && (!sz2->tqunicode());
}
bool equalCS(const TQString &sz1,const char * sz2)
{
- const TQChar * c1 = sz1.unicode();
+ const TQChar * c1 = sz1.tqunicode();
const TQChar * c1e = c1 + sz1.length();
if(!c1)return !sz2;
while((c1 < c1e) && (*sz2))
{
- if(c1->unicode() != *sz2)return false;
+ if(c1->tqunicode() != *sz2)return false;
c1++;
sz2++;
}
@@ -267,7 +267,7 @@ namespace KviTQString
bool equalCI(const TQString &sz1,const char * sz2)
{
- const TQChar * c1 = sz1.unicode();
+ const TQChar * c1 = sz1.tqunicode();
const TQChar * c1e = c1 + sz1.length();
if(!c1)return !sz2;
@@ -275,9 +275,9 @@ namespace KviTQString
while((c1 < c1e) && (*sz2))
{
#ifdef COMPILE_USE_QT4
- if(c1->toLower().unicode() != tolower(*sz2))return false;
+ if(c1->toLower().tqunicode() != tolower(*sz2))return false;
#else
- if(c1->lower().unicode() != tolower(*sz2))return false;
+ if(c1->lower().tqunicode() != tolower(*sz2))return false;
#endif
c1++;
sz2++;
@@ -287,8 +287,8 @@ namespace KviTQString
int cmpCS(const TQString &sz1,const TQString &sz2)
{
- const TQChar * c1 = sz1.unicode();
- const TQChar * c2 = sz2.unicode();
+ const TQChar * c1 = sz1.tqunicode();
+ const TQChar * c2 = sz2.tqunicode();
const TQChar * c1e = c1 + sz1.length();
const TQChar * c2e = c2 + sz2.length();
@@ -304,12 +304,12 @@ namespace KviTQString
{
if(c1 >= c1e)
{
- if(c2 < c2e)return /* 0 */ - (c2->unicode());
+ if(c2 < c2e)return /* 0 */ - (c2->tqunicode());
return 0;
}
- if(c2 >= c2e)return c1->unicode() /* - 0 */;
+ if(c2 >= c2e)return c1->tqunicode() /* - 0 */;
- int diff = c1->unicode() - c2->unicode();
+ int diff = c1->tqunicode() - c2->tqunicode();
if(diff)return diff;
c1++;
@@ -321,8 +321,8 @@ namespace KviTQString
int cmpCI(const TQString &sz1,const TQString &sz2)
{
- const TQChar * c1 = sz1.unicode();
- const TQChar * c2 = sz2.unicode();
+ const TQChar * c1 = sz1.tqunicode();
+ const TQChar * c2 = sz2.tqunicode();
const TQChar * c1e = c1 + sz1.length();
const TQChar * c2e = c2 + sz2.length();
@@ -338,22 +338,22 @@ namespace KviTQString
if(c1 >= c1e)
{
#ifdef COMPILE_USE_QT4
- if(c2 < c2e)return /* 0 */ - (c2->toLower().unicode());
+ if(c2 < c2e)return /* 0 */ - (c2->toLower().tqunicode());
#else
- if(c2 < c2e)return /* 0 */ - (c2->lower().unicode());
+ if(c2 < c2e)return /* 0 */ - (c2->lower().tqunicode());
#endif
return 0;
}
#ifdef COMPILE_USE_QT4
- if(c2 >= c2e)return c1->toLower().unicode() /* - 0 */;
+ if(c2 >= c2e)return c1->toLower().tqunicode() /* - 0 */;
#else
- if(c2 >= c2e)return c1->lower().unicode() /* - 0 */;
+ if(c2 >= c2e)return c1->lower().tqunicode() /* - 0 */;
#endif
#ifdef COMPILE_USE_QT4
- int diff = c1->toLower().unicode() - c2->toLower().unicode();
+ int diff = c1->toLower().tqunicode() - c2->toLower().tqunicode();
#else
- int diff = c1->lower().unicode() - c2->lower().unicode();
+ int diff = c1->lower().tqunicode() - c2->lower().tqunicode();
#endif
if(diff)return diff;
@@ -370,8 +370,8 @@ namespace KviTQString
unsigned int l1 = MY_MIN(len,sz1.length());
unsigned int l = MY_MIN(l1,sz2.length()); // FIXME: THIS IS NOT OK
- const TQChar * c1 = sz1.unicode();
- const TQChar * c2 = sz2.unicode();
+ const TQChar * c1 = sz1.tqunicode();
+ const TQChar * c2 = sz2.tqunicode();
const TQChar * c1e = c1 + l;
if(!c1)
@@ -384,9 +384,9 @@ namespace KviTQString
int diff = 0;
#ifdef COMPILE_USE_QT4
- while((c1 < c1e) && !(diff = (c1->toLower().unicode() - c2->toLower().unicode())))
+ while((c1 < c1e) && !(diff = (c1->toLower().tqunicode() - c2->toLower().tqunicode())))
#else
- while((c1 < c1e) && !(diff = (c1->lower().unicode() - c2->lower().unicode())))
+ while((c1 < c1e) && !(diff = (c1->lower().tqunicode() - c2->lower().tqunicode())))
#endif
{
c1++;
@@ -533,7 +533,7 @@ namespace KviTQString
}
TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize);
- //TQChar * p = (TQChar *)s.unicode();
+ //TQChar * p = (TQChar *)s.tqunicode();
char *argString;
long argValue;
@@ -561,12 +561,12 @@ namespace KviTQString
}
- for(; fmt->unicode() ; ++fmt)
+ for(; fmt->tqunicode() ; ++fmt)
{
if(reallen == allocsize)INCREMENT_MEM
//copy up to a '%'
- if(fmt->unicode() != '%')
+ if(fmt->tqunicode() != '%')
{
*p++ = *fmt;
reallen++;
@@ -574,7 +574,7 @@ namespace KviTQString
}
++fmt; //skip this '%'
- switch(fmt->unicode())
+ switch(fmt->tqunicode())
{
case 's': // char * string
{
@@ -583,7 +583,7 @@ namespace KviTQString
TQString str(argString);
if(str.isEmpty())continue;
int len = str.length();
- const TQChar * ch = str.unicode();
+ const TQChar * ch = str.tqunicode();
if(!ch)continue;
if((allocsize - reallen) < len)INCREMENT_MEM_BY(len)
while(len--)*p++ = *ch++;
@@ -606,7 +606,7 @@ namespace KviTQString
if(!str)continue;
if(str->isEmpty())continue;
int len = str->length();
- const TQChar * ch = str->unicode();
+ const TQChar * ch = str->tqunicode();
if(!ch)continue;
if((allocsize - reallen) < len)INCREMENT_MEM_BY(len)
while(len--)*p++ = *ch++;
@@ -721,7 +721,7 @@ namespace KviTQString
{
*p++ = '%'; //write it
reallen++;
- if(fmt->unicode())
+ if(fmt->tqunicode())
{
if(reallen == allocsize)INCREMENT_MEM
*p++ = *fmt;
@@ -789,21 +789,21 @@ namespace KviTQString
const TQChar * m2 = (const TQChar *)szM2.ucs2();
#endif
- if(!(m1 && m2 && (m1->unicode())))return false;
+ if(!(m1 && m2 && (m1->tqunicode())))return false;
const TQChar * savePos1 = 0;
const TQChar * savePos2 = m2;
- while(m1->unicode())
+ while(m1->tqunicode())
{
//loop managed by m1 (initially first mask)
- if(m1->unicode()=='*')
+ if(m1->tqunicode()=='*')
{
//Found a wildcard in m1
savePos1 = ++m1; //move to the next char and save the position...this is our jolly
- if(!savePos1->unicode())return true; //last was a wildcard , matches everything ahead...
+ if(!savePos1->tqunicode())return true; //last was a wildcard , matches everything ahead...
savePos2 = m2+1; //next return state for the second string
continue; //and return
}
- if(!m2->unicode())return false; //m2 finished and we had something to match here!
+ if(!m2->tqunicode())return false; //m2 finished and we had something to match here!
#ifdef COMPILE_USE_QT4
if(m1->toLower()==m2->toLower())
#else
@@ -813,7 +813,7 @@ namespace KviTQString
//chars matched
m1++; //Go ahead in the two strings
m2++; //
- if((!(m1->unicode())) && m2->unicode() && savePos1)
+ if((!(m1->tqunicode())) && m2->tqunicode() && savePos1)
{
//m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)...
//retry matching the string following the * from the savePos2 (one char ahead last time)
@@ -822,7 +822,7 @@ namespace KviTQString
savePos2++; //next savePos2 will be next char
}
} else {
- if(m2->unicode() == '*')
+ if(m2->tqunicode() == '*')
{
//A wlidcard in the second string
//Invert the game : mask1 <-> mask2
@@ -835,11 +835,11 @@ namespace KviTQString
continue; //...and again
}
// m1 != m2 , m1 != * , m2 != *
- if((m1->unicode() == '?') || (m2->unicode() == '?'))
+ if((m1->tqunicode() == '?') || (m2->tqunicode() == '?'))
{
m1++;
m2++;
- if((!(m1->unicode())) && m2->unicode() && savePos1)
+ if((!(m1->tqunicode())) && m2->tqunicode() && savePos1)
{
//m1 finished , but m2 not yet and we have a savePosition for m1 (there was a wildcard)...
//retry matching the string following the * from the savePos2 (one char ahead last time)
@@ -858,7 +858,7 @@ namespace KviTQString
}
}
}
- return (!(m2->unicode())); //m1 surely finished , so for the match , m2 must be finished too
+ return (!(m2->tqunicode())); //m1 surely finished , so for the match , m2 must be finished too
}
bool matchStringCI(const TQString &szExp,const TQString &szStr,bool bIsRegExp,bool bExact)
@@ -870,9 +870,9 @@ namespace KviTQString
TQChar* ptr=(TQChar*)szExp.ucs2();
#endif
if(!ptr) return 0;
- while(ptr->unicode())
+ while(ptr->tqunicode())
{
- if((ptr->unicode()=='[') || (ptr->unicode()==']'))
+ if((ptr->tqunicode()=='[') || (ptr->tqunicode()==']'))
{
szWildcard.append("[");
szWildcard.append(*ptr);
@@ -904,9 +904,9 @@ namespace KviTQString
TQChar* ptr=(TQChar*)szExp.ucs2();
#endif
if(!ptr) return 0;
- while(ptr->unicode())
+ while(ptr->tqunicode())
{
- if((ptr->unicode()=='[')) // <-- hum ?
+ if((ptr->tqunicode()=='[')) // <-- hum ?
{
szWildcard.append("[");
szWildcard.append(*ptr);
@@ -1043,7 +1043,7 @@ namespace KviTQString
}
TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * szSrc.length());
TQChar * b = buffer;
- unsigned short us = c->unicode();
+ unsigned short us = c->tqunicode();
while(us)
{
if(us < 256)
@@ -1052,7 +1052,7 @@ namespace KviTQString
*b = *c;
c++;
b++;
- us = c->unicode();
+ us = c->tqunicode();
}
TQString ret(buffer,szSrc.length());
kvi_free(buffer);
@@ -1069,7 +1069,7 @@ namespace KviTQString
}
TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * szSrc.length());
TQChar * b = buffer;
- unsigned short us = c->unicode();
+ unsigned short us = c->tqunicode();
while(us)
{
if(us < 256)
@@ -1079,7 +1079,7 @@ namespace KviTQString
*b = *c;
c++;
b++;
- us = c->unicode();
+ us = c->tqunicode();
}
TQString ret(buffer,szSrc.length());
kvi_free(buffer);
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 54a1c4a6..525ad714 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->unicode(),pString->length()); \
+ _WSTRING_WMEMCPY(p,pString->tqunicode(),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.unicode();
- const TQChar * p2 = s2.unicode();
+ const TQChar * p1 = s1.tqunicode();
+ const TQChar * p2 = s2.tqunicode();
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 * unicode)
+KviStr::KviStr(const kvi_wchar_t * tqunicode)
{
- if(!unicode)
+ if(!tqunicode)
{
m_len = 0;
m_ptr = (char *)kvi_malloc(1);
*m_ptr = 0;
} else {
- m_len = kvi_wstrlen(unicode);
+ m_len = kvi_wstrlen(tqunicode);
m_ptr = (char *)kvi_malloc(m_len + 1);
register char * p = m_ptr;
- while(*unicode)*p++ = *unicode++;
+ while(*tqunicode)*p++ = *tqunicode++;
*p = 0;
}
}
-KviStr::KviStr(const kvi_wchar_t * unicode,int len)
+KviStr::KviStr(const kvi_wchar_t * tqunicode,int len)
{
m_len = len;
m_ptr = (char *)kvi_malloc(m_len + 1);
@@ -1165,7 +1165,7 @@ KviStr::KviStr(const kvi_wchar_t * unicode,int len)
char * end = p + len;
while(p != end)
{
- *p++ = *unicode++;
+ *p++ = *tqunicode++;
}
*p = 0;
}
diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h
index 9434e274..4e9a3acb 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/kvi_string.h
@@ -155,9 +155,9 @@ public:
// Creates a string long fillLen characters filled with character c.<br>
KviStr(char c,int fillLen = 1);
- KviStr(const kvi_wchar_t * unicode);
+ KviStr(const kvi_wchar_t * tqunicode);
- KviStr(const kvi_wchar_t * unicode,int len);
+ KviStr(const kvi_wchar_t * tqunicode,int len);
// just free(m_ptr)
~KviStr();