TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of old tq methods that are no longer tq specific

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 918c3ff077
commit 805c2821ce
287 changed files with 1579 additions and 1579 deletions
Show Stats Download Patch File Download Diff File

2
data/deftheme/silverirc/themedata.kvc
Unescape View File

@ -163,7 +163,7 @@ iccolor1=0,0,0
mirccolor12=15,15,255
mirccolor5=150,0,0
msgtypeChanAdmin=242,3,100,1,1
msgtypeGenerictqStatus=133,14,100,1,1
msgtypeGenericStatus=133,14,100,1,1
msgtypeHalfOp=174,3,100,1,1
msgtypeDevoice=63,3,100,1,1
msgtypeJoin=39,14,100,1,2

2
data/doctemplates/rfc2812.template
Unescape View File

@ -23,7 +23,7 @@ Category: Informational
[/td][/tr]
[tr][td]
[b]tqStatus of this Memo[/b]
[b]Status of this Memo[/b]
[/td][/tr]
[tr][td]

2
src/kvilib/config/kvi_wincfg.h
Unescape View File

@ -132,7 +132,7 @@
/* define this if you are on a big endian machine */
/* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */
/* define this if you want to use the tqunicode-local 8bit charset translation */
/* define this if you want to use the unicode-local 8bit charset translation */
/* #undef COMPILE_USE_LOCAL_8BIT */
/* define this if you want to disable the inter-process communication support */

10
src/kvilib/core/kvi_pointerhashtable.h
Unescape View File

@ -236,18 +236,18 @@ inline unsigned int kvi_hash_hash(const TQString &szKey,bool bCaseSensitive)
if(!p)return 0;
if(bCaseSensitive)
{
while(p->tqunicode())
while(p->unicode())
{
uResult += p->tqunicode();
uResult += p->unicode();
p++;
}
} else {
while(p->tqunicode())
while(p->unicode())
{
#ifdef COMPILE_USE_QT4
uResult += p->toLower().tqunicode();
uResult += p->toLower().unicode();
#else
uResult += p->lower().tqunicode();
uResult += p->lower().unicode();
#endif
p++;
}

162
src/kvilib/core/kvi_qstring.cpp
Unescape View File

@ -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.tqunicode();
const TQChar * c2 = sz2.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c2 = sz2.unicode();
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->tqunicode() != c2->tqunicode())return false;
if(c1->unicode() != c2->unicode())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.tqunicode();
const TQChar * c2 = sz2.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c2 = sz2.unicode();
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().tqunicode() != c2->toLower().tqunicode())return false;
if(c1->toLower().unicode() != c2->toLower().unicode())return false;
#else
if(c1->lower().tqunicode() != c2->lower().tqunicode())return false;
if(c1->lower().unicode() != c2->lower().unicode())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.tqunicode();
const TQChar * c1 = sz1.unicode();
if(sz1.length() < len)return false;
const TQChar * c1e = c1 + len;
@ -107,7 +107,7 @@ namespace KviTQString
while((c1 < c1e) && (*sz2))
{
if(c1->tqunicode() != *sz2)return false;
if(c1->unicode() != *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.tqunicode();
const TQChar * c1 = sz1.unicode();
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().tqunicode() != tolower(*sz2))return false;
if(c1->toLower().unicode() != tolower(*sz2))return false;
#else
if(c1->lower().tqunicode() != tolower(*sz2))return false;
if(c1->lower().unicode() != 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.tqunicode();
const TQChar * c1 = sz1.unicode();
if(sz1.length() < len)return false;
const TQChar * c1e = c1 + len;
if(!sz2)return !c1;
if(!c1)return !(sz2->tqunicode());
if(!c1)return !(sz2->unicode());
while((c1 < c1e) && (sz2->tqunicode()))
while((c1 < c1e) && (sz2->unicode()))
{
#ifdef COMPILE_USE_QT4
if(c1->toLower().tqunicode() != sz2->toLower().tqunicode())return false;
if(c1->toLower().unicode() != sz2->toLower().unicode())return false;
#else
if(c1->lower().tqunicode() != sz2->lower().tqunicode())return false;
if(c1->lower().unicode() != sz2->lower().unicode())return false;
#endif
c1++;
sz2++;
@ -165,39 +165,39 @@ namespace KviTQString
{
double size = bytes;
if(size<900)
return TQString(__tr2qs("%1 bytes")).tqarg(size,0,'f',3);
return TQString(__tr2qs("%1 bytes")).arg(size,0,'f',3);
size/=1024;
if(size<900)
return TQString(__tr2qs("%1 KB")).tqarg(size,0,'f',3);
return TQString(__tr2qs("%1 KB")).arg(size,0,'f',3);
size/=1024;
if(size<900)
return TQString(__tr2qs("%1 MB")).tqarg(size,0,'f',3);
return TQString(__tr2qs("%1 MB")).arg(size,0,'f',3);
//Pirated DVD?;)
size/=1024;
if(size<900)
return TQString(__tr2qs("%1 GB")).tqarg(size,0,'f',3);
return TQString(__tr2qs("%1 GB")).arg(size,0,'f',3);
//Uhm.. We are downloading a whole internet:)))
size/=1024;
return TQString(__tr2qs("%1 TB")).tqarg(size,0,'f',3);
return TQString(__tr2qs("%1 TB")).arg(size,0,'f',3);
}
bool equalCS(const TQString &sz1,const TQString &sz2)
{
if(sz1.length() != sz2.length())return false;
const TQChar * c1 = sz1.tqunicode();
const TQChar * c2 = sz2.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c2 = sz2.unicode();
const TQChar * c1e = c1 + sz1.length();
if(!c1 || !c2)return (c1 == c2);
while(c1 < c1e)
{
if(c1->tqunicode() != c2->tqunicode())return false;
if(c1->unicode() != c2->unicode())return false;
c1++;
c2++;
}
@ -208,8 +208,8 @@ namespace KviTQString
{
if(sz1.length() != sz2.length())return false;
const TQChar * c1 = sz1.tqunicode();
const TQChar * c2 = sz2.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c2 = sz2.unicode();
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().tqunicode() != c2->toLower().tqunicode())return false;
if(c1->toLower().unicode() != c2->toLower().unicode())return false;
#else
if(c1->lower().tqunicode() != c2->lower().tqunicode())return false;
if(c1->lower().unicode() != c2->lower().unicode())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.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c1e = c1 + sz1.length();
if(!c1 || !sz2)return (c1 == sz2);
while(c1 < c1e)
{
if(!sz2->tqunicode())return false; // sz1 has at least another character
if(!sz2->unicode())return false; // sz1 has at least another character
#ifdef COMPILE_USE_QT4
if(c1->toLower().tqunicode() != sz2->toLower().tqunicode())return false;
if(c1->toLower().unicode() != sz2->toLower().unicode())return false;
#else
if(c1->lower().tqunicode() != sz2->lower().tqunicode())return false;
if(c1->lower().unicode() != sz2->lower().unicode())return false;
#endif
c1++;
sz2++;
}
return (c1 == c1e) && (!sz2->tqunicode());
return (c1 == c1e) && (!sz2->unicode());
}
bool equalCS(const TQString &sz1,const char * sz2)
{
const TQChar * c1 = sz1.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c1e = c1 + sz1.length();
if(!c1)return !sz2;
while((c1 < c1e) && (*sz2))
{
if(c1->tqunicode() != *sz2)return false;
if(c1->unicode() != *sz2)return false;
c1++;
sz2++;
}
@ -267,7 +267,7 @@ namespace KviTQString
bool equalCI(const TQString &sz1,const char * sz2)
{
const TQChar * c1 = sz1.tqunicode();
const TQChar * c1 = sz1.unicode();
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().tqunicode() != tolower(*sz2))return false;
if(c1->toLower().unicode() != tolower(*sz2))return false;
#else
if(c1->lower().tqunicode() != tolower(*sz2))return false;
if(c1->lower().unicode() != 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.tqunicode();
const TQChar * c2 = sz2.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c2 = sz2.unicode();
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->tqunicode());
if(c2 < c2e)return /* 0 */ - (c2->unicode());
return 0;
}
if(c2 >= c2e)return c1->tqunicode() /* - 0 */;
if(c2 >= c2e)return c1->unicode() /* - 0 */;
int diff = c1->tqunicode() - c2->tqunicode();
int diff = c1->unicode() - c2->unicode();
if(diff)return diff;
c1++;
@ -321,8 +321,8 @@ namespace KviTQString
int cmpCI(const TQString &sz1,const TQString &sz2)
{
const TQChar * c1 = sz1.tqunicode();
const TQChar * c2 = sz2.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c2 = sz2.unicode();
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().tqunicode());
if(c2 < c2e)return /* 0 */ - (c2->toLower().unicode());
#else
if(c2 < c2e)return /* 0 */ - (c2->lower().tqunicode());
if(c2 < c2e)return /* 0 */ - (c2->lower().unicode());
#endif
return 0;
}
#ifdef COMPILE_USE_QT4
if(c2 >= c2e)return c1->toLower().tqunicode() /* - 0 */;
if(c2 >= c2e)return c1->toLower().unicode() /* - 0 */;
#else
if(c2 >= c2e)return c1->lower().tqunicode() /* - 0 */;
if(c2 >= c2e)return c1->lower().unicode() /* - 0 */;
#endif
#ifdef COMPILE_USE_QT4
int diff = c1->toLower().tqunicode() - c2->toLower().tqunicode();
int diff = c1->toLower().unicode() - c2->toLower().unicode();
#else
int diff = c1->lower().tqunicode() - c2->lower().tqunicode();
int diff = c1->lower().unicode() - c2->lower().unicode();
#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.tqunicode();
const TQChar * c2 = sz2.tqunicode();
const TQChar * c1 = sz1.unicode();
const TQChar * c2 = sz2.unicode();
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().tqunicode() - c2->toLower().tqunicode())))
while((c1 < c1e) && !(diff = (c1->toLower().unicode() - c2->toLower().unicode())))
#else
while((c1 < c1e) && !(diff = (c1->lower().tqunicode() - c2->lower().tqunicode())))
while((c1 < c1e) && !(diff = (c1->lower().unicode() - c2->lower().unicode())))
#endif
{
c1++;
@ -533,7 +533,7 @@ namespace KviTQString
}
TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize);
//TQChar * p = (TQChar *)s.tqunicode();
//TQChar * p = (TQChar *)s.unicode();
char *argString;
long argValue;
@ -561,12 +561,12 @@ namespace KviTQString
}
for(; fmt->tqunicode() ; ++fmt)
for(; fmt->unicode() ; ++fmt)
{
if(reallen == allocsize)INCREMENT_MEM
//copy up to a '%'
if(fmt->tqunicode() != '%')
if(fmt->unicode() != '%')
{
*p++ = *fmt;
reallen++;
@ -574,7 +574,7 @@ namespace KviTQString
}
++fmt; //skip this '%'
switch(fmt->tqunicode())
switch(fmt->unicode())
{
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.tqunicode();
const TQChar * ch = str.unicode();
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->tqunicode();
const TQChar * ch = str->unicode();
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->tqunicode())
if(fmt->unicode())
{
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->tqunicode())))return false;
if(!(m1 && m2 && (m1->unicode())))return false;
const TQChar * savePos1 = 0;
const TQChar * savePos2 = m2;
while(m1->tqunicode())
while(m1->unicode())
{
//loop managed by m1 (initially first mask)
if(m1->tqunicode()=='*')
if(m1->unicode()=='*')
{
//Found a wildcard in m1
savePos1 = ++m1; //move to the next char and save the position...this is our jolly
if(!savePos1->tqunicode())return true; //last was a wildcard , matches everything ahead...
if(!savePos1->unicode())return true; //last was a wildcard , matches everything ahead...
savePos2 = m2+1; //next return state for the second string
continue; //and return
}
if(!m2->tqunicode())return false; //m2 finished and we had something to match here!
if(!m2->unicode())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->tqunicode())) && m2->tqunicode() && savePos1)
if((!(m1->unicode())) && m2->unicode() && 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->tqunicode() == '*')
if(m2->unicode() == '*')
{
//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->tqunicode() == '?') || (m2->tqunicode() == '?'))
if((m1->unicode() == '?') || (m2->unicode() == '?'))
{
m1++;
m2++;
if((!(m1->tqunicode())) && m2->tqunicode() && savePos1)
if((!(m1->unicode())) && m2->unicode() && 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->tqunicode())); //m1 surely finished , so for the match , m2 must be finished too
return (!(m2->unicode())); //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->tqunicode())
while(ptr->unicode())
{
if((ptr->tqunicode()=='[') || (ptr->tqunicode()==']'))
if((ptr->unicode()=='[') || (ptr->unicode()==']'))
{
szWildcard.append("[");
szWildcard.append(*ptr);
@ -904,9 +904,9 @@ namespace KviTQString
TQChar* ptr=(TQChar*)szExp.ucs2();
#endif
if(!ptr) return 0;
while(ptr->tqunicode())
while(ptr->unicode())
{
if((ptr->tqunicode()=='[')) // <-- hum ?
if((ptr->unicode()=='[')) // <-- 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->tqunicode();
unsigned short us = c->unicode();
while(us)
{
if(us < 256)
@ -1052,7 +1052,7 @@ namespace KviTQString
*b = *c;
c++;
b++;
us = c->tqunicode();
us = c->unicode();
}
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->tqunicode();
unsigned short us = c->unicode();
while(us)
{
if(us < 256)
@ -1079,7 +1079,7 @@ namespace KviTQString
*b = *c;
c++;
b++;
us = c->tqunicode();
us = c->unicode();
}
TQString ret(buffer,szSrc.length());
kvi_free(buffer);

18
src/kvilib/core/kvi_string.cpp
Unescape View File

@ -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;
}

4
src/kvilib/core/kvi_string.h
Unescape View File

@ -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 * tqunicode);
KviStr(const kvi_wchar_t * unicode);
KviStr(const kvi_wchar_t * tqunicode,int len);
KviStr(const kvi_wchar_t * unicode,int len);
// just free(m_ptr)
~KviStr();

6
src/kvilib/ext/kvi_osinfo.cpp
Unescape View File

@ -350,17 +350,17 @@ static TQString queryWinInfo( QueryInfo info)
TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"),
0, KEY_TQUERY_VALUE, &hKey );
if( lRet == ERROR_SUCCESS )
szVersion+= TQString("Service Pack 6a (Build %1)").tqarg( osvi.dwBuildNumber & 0xFFFF );
szVersion+= TQString("Service Pack 6a (Build %1)").arg( osvi.dwBuildNumber & 0xFFFF );
else // Windows NT 4.0 prior to SP6a
{
szVersion+= TQString( "%1 (Build %2)").tqarg( osvi.szCSDVersion).tqarg( osvi.dwBuildNumber & 0xFFFF);
szVersion+= TQString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF);
}
RegCloseKey( hKey );
}
else // not Windows NT 4.0
{
szVersion+= TQString( "%1 (Build %2)").tqarg( osvi.szCSDVersion).tqarg( osvi.dwBuildNumber & 0xFFFF);
szVersion+= TQString( "%1 (Build %2)").arg( osvi.szCSDVersion).arg( osvi.dwBuildNumber & 0xFFFF);
}
break;

6
src/kvilib/ext/kvi_stringconversion.cpp
Unescape View File

@ -234,17 +234,17 @@ namespace KviStringConversion
bool fromString(const TQString & szValue,TQFont &buffer)
{
KviStr str = szValue;
KviStr family,pointSize,tqstyleHint,weight,options;
KviStr family,pointSize,styleHint,weight,options;
str.getToken(family,',');
str.getToken(pointSize,',');
str.getToken(tqstyleHint,',');
str.getToken(styleHint,',');
str.getToken(weight,',');
if(!family.isEmpty())buffer.setFamily(family.ptr());
int i;
bool bOk;
i = pointSize.toInt(&bOk);
if(bOk && (i > 0))buffer.setPointSize(i);
i = tqstyleHint.toInt(&bOk);
i = styleHint.toInt(&bOk);
if(bOk && (i >= 0))buffer.setStyleHint((TQFont::StyleHint)i);
i = weight.toInt(&bOk);
if(bOk && (i >= 0))buffer.setWeight(i);

8
src/kvilib/file/kvi_fileutils.cpp
Unescape View File

@ -34,8 +34,8 @@
#include <tqdir.h>
#include <tqfileinfo.h>
#include <tqglobal.h>
#include <tqtextcodec.h>
#include <tqtextstream.h>
#include <textcodec.h>
#include <textstream.h>
namespace KviFileUtils
@ -60,7 +60,7 @@ namespace KviFileUtils
if(tmp_buf[255] == '\r')cur_len--; //Ignore CR...
int lastlen = szBuffer.length();
szBuffer.setLength(lastlen + cur_len);
TQChar *p1 = szBuffer.tqunicode() + lastlen;
TQChar *p1 = szBuffer.unicode() + lastlen;
char * p2 = tmp_buf;
for(int i=0;i<cur_len;i++)*p1++ = *p2++;
cur_len = 0;
@ -76,7 +76,7 @@ namespace KviFileUtils
if(tmp_buf[cur_len - 1] == '\r')cur_len--; //Ignore CR...
int lastlen = szBuffer.length();
szBuffer.setLength(lastlen + cur_len);
TQChar *p1 = szBuffer.tqunicode() + lastlen;
TQChar *p1 = szBuffer.unicode() + lastlen;
char * p2 = tmp_buf;
for(int i=0;i<cur_len;i++)*p1++ = *p2++;
}

58
src/kvilib/irc/kvi_ircmask.cpp
Unescape View File

@ -232,8 +232,8 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
if(b)
{
const TQChar * p = b;
while(p->tqunicode() && (p->tqunicode() != '!'))p++;
if(p->tqunicode())
while(p->unicode() && (p->unicode() != '!'))p++;
if(p->unicode())
{
if(p != b)
{
@ -250,8 +250,8 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
}
p++;
b = p;
while(p->tqunicode() && (p->tqunicode() != '@'))p++;
if(p->tqunicode())
while(p->unicode() && (p->unicode() != '@'))p++;
if(p->unicode())
{
if(p != b)
{
@ -267,7 +267,7 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
}
p++;
b=p;
while(p->tqunicode())p++;
while(p->unicode())p++;
if(p != b)
{
m_szHost.setUnicode(b,p-b);
@ -291,7 +291,7 @@ bool KviIrcMask::hasNumericHost() const
int nPoints = 0;
int nDoublePoints = 0;
unsigned short uc;
while((uc = p->tqunicode()))
while((uc = p->unicode()))
{
if(uc == '.')nPoints++; // ipv6 masks can contain dots too!
else {
@ -300,9 +300,9 @@ bool KviIrcMask::hasNumericHost() const
if((uc < '0') || (uc > '9'))
{
#ifdef COMPILE_USE_QT4
uc = p->toUpper().tqunicode();
uc = p->toUpper().unicode();
#else
uc = p->upper().tqunicode();
uc = p->upper().unicode();
#endif
if((uc < 'A') || (uc > 'F'))return false;
}
@ -408,13 +408,13 @@ void KviIrcMask::mask(TQString &szMask,MaskType eMaskType) const
break;
default:
if (m_szUser.length() > 0) {
if(m_szUser[0].tqunicode() != '*')
if(m_szUser[0].unicode() != '*')
szMask.append(m_szWild);
if ((m_szUser[0].tqunicode() == '~') ||
(m_szUser[0].tqunicode() == '^') ||
(m_szUser[0].tqunicode() == '+') ||
(m_szUser[0].tqunicode() == '-') ||
(m_szUser[0].tqunicode() == '='))szMask.append(m_szUser.right(m_szUser.length() - 1));
if ((m_szUser[0].unicode() == '~') ||
(m_szUser[0].unicode() == '^') ||
(m_szUser[0].unicode() == '+') ||
(m_szUser[0].unicode() == '-') ||
(m_szUser[0].unicode() == '='))szMask.append(m_szUser.right(m_szUser.length() - 1));
else
szMask.append(m_szUser);
}
@ -614,13 +614,13 @@ bool KviIrcMask::matchesFixed(const TQString &nick,const TQString &user,const TQ
int KviIrcMask::getIpDomainMaskLen() const
{
int len = m_szHost.length();
const TQChar *p = m_szHost.tqunicode();
const TQChar *p = m_szHost.unicode();
const TQChar *b = p;
p += len;
if(b < p)
{
p--;
while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))p--;
while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
}
// 000.000.000.000
// p
@ -632,17 +632,17 @@ int KviIrcMask::getIpDomainMaskLen() const
int KviIrcMask::getLargeIpDomainMaskLen() const
{
int len = m_szHost.length();
const TQChar *p = m_szHost.tqunicode();
const TQChar *p = m_szHost.unicode();
const TQChar *b = p;
p += len;
if(b < p)
{
p--;
while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))p--;
while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
if(b < p)
{
p--;
while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))p--;
while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
}
}
// 000.000.000.000
@ -657,7 +657,7 @@ TQString KviIrcMask::getHostDomainMask() const
const TQChar *p=KviTQString::nullTerminatedArray(m_szHost);
if(!p)return TQString();
const TQChar *b = p;
while(p->tqunicode() && p->tqunicode() != '.')p++;
while(p->unicode() && p->unicode() != '.')p++;
TQString ret(p,len - (p - b));
return ret;
}
@ -666,18 +666,18 @@ TQString KviIrcMask::getHostDomainMask() const
TQString KviIrcMask::getLargeHostDomainMask() const
{
int len = m_szHost.length();
const TQChar *p = m_szHost.tqunicode();
const TQChar *p = m_szHost.unicode();
const TQChar *b = p;
p += len;
if(b < p)
{
p--;
while((b < p) && (p->tqunicode() != '.'))p--;
while((b < p) && (p->unicode() != '.'))p--;
if(b < p)
{
p--;
while((b < p) && (p->tqunicode() != '.'))p--;
while((b < p) && (p->unicode() != '.'))p--;
}
}
@ -692,14 +692,14 @@ TQString KviIrcMask::getLargeHostDomainMask() const
bool KviIrcMask::hasMaskedIp() const
{
int len = m_szHost.length();
const TQChar *p = m_szHost.tqunicode();
const TQChar *p = m_szHost.unicode();
const TQChar *b = p;
if(len == 0)return false;
//run to the end
p += len;
const TQChar *e = p;
p--;
while((b < p) && (p->tqunicode() != '.'))p--;
while((b < p) && (p->unicode() != '.'))p--;
return ((e - p) > 4); // at the moment 4 should be enough : the largest top part is "name"
}
@ -721,7 +721,7 @@ bool KviIrcMask::hasWildNick()
const TQChar * aux = KviTQString::nullTerminatedArray(m_szNick);
if(!aux)return false;
unsigned short uc;
while((uc = aux->tqunicode()))
while((uc = aux->unicode()))
{
if((uc == '*') || (uc == '?'))return true;
aux++;
@ -736,14 +736,14 @@ int KviIrcMask::nonWildChars()
if(!aux)return 0;
unsigned short uc;
while((uc = aux->tqunicode()))
while((uc = aux->unicode()))
{
if((uc != '*') && (uc != '?'))iCnt++;
aux++;
}
aux = KviTQString::nullTerminatedArray(m_szUser);
while((uc = aux->tqunicode()))
while((uc = aux->unicode()))
{
if((uc != '*') && (uc != '?'))iCnt++;
aux++;
@ -751,7 +751,7 @@ int KviIrcMask::nonWildChars()
aux = KviTQString::nullTerminatedArray(m_szHost);
while((uc = aux->tqunicode()))
while((uc = aux->unicode()))
{
if((uc != '*') && (uc != '?'))iCnt++;
aux++;

2
src/kvilib/irc/kvi_ircserverdb.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqapplication.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqmessagebox.h>
#include <tqcheckbox.h>

4
src/kvilib/irc/kvi_ircuserdb.cpp
Unescape View File

@ -54,9 +54,9 @@ void KviIrcUserEntry::setRealName(const TQString &rn)
m_szRealName = KviTQString::trimmed(m_szRealName);
if(m_szRealName.length()>=3)
{
if( (m_szRealName[0].tqunicode()==KVI_TEXT_COLOR) && (m_szRealName[2].tqunicode()==KVI_TEXT_RESET) )
if( (m_szRealName[0].unicode()==KVI_TEXT_COLOR) && (m_szRealName[2].unicode()==KVI_TEXT_RESET) )
{
switch(m_szRealName[1].tqunicode())
switch(m_szRealName[1].unicode())
{
case '1': // hum.. encoded as hidden color code eh ? publish is somewhere, so others might implement this...
setGender(Male);

16
src/kvilib/irc/kvi_mirccntrl.cpp
Unescape View File

@ -169,7 +169,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
return charIdx;
}
unsigned short c = szData[(int)charIdx].tqunicode();
unsigned short c = szData[(int)charIdx].unicode();
//First we can have a digit or a coma
if(((c < '0') || (c > '9')))
@ -189,7 +189,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
return charIdx;
}
c = szData[(int)charIdx].tqunicode();
c = szData[(int)charIdx].unicode();
if(((c < '0') || (c > '9')) && (c != ','))
{
@ -207,7 +207,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
(*byte_2)=KVI_NOCHANGE;
return charIdx;
}
c = szData[(int)charIdx].tqunicode();
c = szData[(int)charIdx].unicode();
}
if(c == ',')
@ -218,7 +218,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
(*byte_2)=KVI_NOCHANGE;
return charIdx;
}
c = szData[(int)charIdx].tqunicode();
c = szData[(int)charIdx].unicode();
} else {
(*byte_2)=KVI_NOCHANGE;
return charIdx;
@ -227,7 +227,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
if((c < '0') || (c > '9'))
{
(*byte_2)=KVI_NOCHANGE;
if(szData[(int)(charIdx-1)].tqunicode()==',')
if(szData[(int)(charIdx-1)].unicode()==',')
return charIdx-1;
else
return charIdx;
@ -237,7 +237,7 @@ KVILIB_API unsigned int getUnicodeColorBytes(const TQString &szData,unsigned int
(*byte_2)=c-'0';
charIdx++;
if(charIdx >= szData.length())return charIdx;
c = szData[(int)charIdx].tqunicode();
c = szData[(int)charIdx].unicode();
if((c >= '0') && (c <='9'))
{
@ -262,7 +262,7 @@ namespace KviMircCntrl
unsigned char b2;
while(i < l)
{
switch(szData[i].tqunicode())
switch(szData[i].unicode())
{
case KVI_TEXT_UNDERLINE:
case KVI_TEXT_BOLD:
@ -288,7 +288,7 @@ namespace KviMircCntrl
i++;
while(i < l)
{
if(szData[i].tqunicode() == ' ')break;
if(szData[i].unicode() == ' ')break;
else i++;
}
begin = i;

66
src/kvilib/net/kvi_http.cpp
Unescape View File

@ -55,24 +55,24 @@ KviHttpRequest::KviHttpRequest()
m_bHeaderProcessed = false;
m_pBuffer = new KviDataBuffer();
resettqStatus();
resetStatus();
resetData();
}
KviHttpRequest::~KviHttpRequest()
{
resetInternaltqStatus();
resetInternalStatus();
delete m_pBuffer;
}
void KviHttpRequest::abort()
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Aborted");
emit terminated(false);
}
void KviHttpRequest::resetInternaltqStatus()
void KviHttpRequest::resetInternalStatus()
{
if(m_pThread)delete m_pThread;
if(m_pDns)delete m_pDns;
@ -91,7 +91,7 @@ void KviHttpRequest::resetInternaltqStatus()
KviThreadManager::killPendingEvents(this);
}
void KviHttpRequest::resettqStatus()
void KviHttpRequest::resetStatus()
{
m_szLastError = __tr2qs("No request");
m_uTotalSize = 0;
@ -114,9 +114,9 @@ void KviHttpRequest::resetData()
void KviHttpRequest::reset()
{
resettqStatus();
resetStatus();
resetData();
resetInternaltqStatus();
resetInternalStatus();
}
bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const TQString &szFileName)
@ -131,8 +131,8 @@ bool KviHttpRequest::get(const KviUrl &u,ProcessingType p,const TQString &szFile
bool KviHttpRequest::start()
{
// ensure that the file is closed
resetInternaltqStatus();
resettqStatus();
resetInternalStatus();
resetStatus();
if(m_eProcessingType == StoreToFile)
{
@ -156,15 +156,15 @@ bool KviHttpRequest::start()
if(m_url.host().isEmpty())
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Invalid URL: Missing hostname");
return false;
}
if((!kvi_strEqualCI(m_url.protocol().ptr(),"http")) && (!kvi_strEqualCI(m_url.protocol().ptr(),"https")))
{
resetInternaltqStatus();
m_szLastError=__tr2qs("Unsupported protocol %1").tqarg(m_url.protocol().ptr());
resetInternalStatus();
m_szLastError=__tr2qs("Unsupported protocol %1").arg(m_url.protocol().ptr());
return false;
}
@ -185,7 +185,7 @@ bool KviHttpRequest::startDnsLookup()
if(!m_pDns->lookup(m_url.host().ptr(),KviDns::IpV4))
{
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = __tr2qs("Unable to start the DNS lookup");
return false;
}
@ -212,7 +212,7 @@ void KviHttpRequest::dnsLookupDone(KviDns *d)
haveServerIp();
} else {
int iErr = d->error();
resetInternaltqStatus();
resetInternalStatus();
m_szLastError = KviError::getDescription(iErr);
emit terminated(false);
}