From 2dd6d32bd821b303aa7b25edda76d1ef7c14b2bf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:06:29 -0600 Subject: Rename obsolete tq methods to standard names --- src/kvilib/config/kvi_wincfg.h | 2 +- src/kvilib/core/kvi_pointerhashtable.h | 10 +-- src/kvilib/core/kvi_qstring.cpp | 152 ++++++++++++++++----------------- src/kvilib/core/kvi_string.cpp | 18 ++-- src/kvilib/core/kvi_string.h | 4 +- src/kvilib/file/kvi_fileutils.cpp | 4 +- src/kvilib/irc/kvi_ircmask.cpp | 58 ++++++------- src/kvilib/irc/kvi_ircuserdb.cpp | 4 +- src/kvilib/irc/kvi_mirccntrl.cpp | 16 ++-- src/kvilib/tal/kvi_tal_listview.cpp | 30 +++---- src/kvilib/tal/kvi_tal_toolbar.cpp | 6 +- 11 files changed, 152 insertions(+), 152 deletions(-) (limited to 'src/kvilib') diff --git a/src/kvilib/config/kvi_wincfg.h b/src/kvilib/config/kvi_wincfg.h index 3441e7b2..1759e323 100644 --- a/src/kvilib/config/kvi_wincfg.h +++ b/src/kvilib/config/kvi_wincfg.h @@ -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 */ diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h index 1c2bcab3..99e513f3 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->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++; } diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp index b02e3080..84beaa07 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.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++; @@ -189,15 +189,15 @@ 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); 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); 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; } diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h index 4e9a3acb..9434e274 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.
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(); diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp index 1668999d..3410773d 100644 --- a/src/kvilib/file/kvi_fileutils.cpp +++ b/src/kvilib/file/kvi_fileutils.cpp @@ -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;itqunicode() && (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++; diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp index 7fda2d12..3394b047 100644 --- a/src/kvilib/irc/kvi_ircuserdb.cpp +++ b/src/kvilib/irc/kvi_ircuserdb.cpp @@ -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); diff --git a/src/kvilib/irc/kvi_mirccntrl.cpp b/src/kvilib/irc/kvi_mirccntrl.cpp index 21b5258a..e42f3165 100644 --- a/src/kvilib/irc/kvi_mirccntrl.cpp +++ b/src/kvilib/irc/kvi_mirccntrl.cpp @@ -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; diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp index 68e69675..d090fdab 100644 --- a/src/kvilib/tal/kvi_tal_listview.cpp +++ b/src/kvilib/tal/kvi_tal_listview.cpp @@ -479,7 +479,7 @@ return; TQPoint pos; - int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv); + int boxsize = lv->style()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv); if (activatedPos(pos)) { bool parentControl = false; if (parent() && parent()->rtti() == 1 && @@ -652,7 +652,7 @@ int h = height(); KviTalListView *lv = listView(); if (lv) - h = qMax(lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv), + h = qMax(lv->style()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv), h); h = qMax(h, TQApplication::globalStrut().height()); setHeight(h); @@ -666,7 +666,7 @@ if (myType == RadioButtonController && pixmap(0)) { // r += 0; } else { - r += lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4; + r += lv->style()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv) + 4; } } return qMax(r, TQApplication::globalStrut().width()); @@ -700,7 +700,7 @@ parentControl = true; TQFontMetrics fm(lv->fontMetrics()); - int boxsize = lv->tqstyle()->pixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize : + int boxsize = lv->style()->pixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize : TQStyle::PM_CheckListButtonSize, 0, lv); int marg = lv->itemMargin(); int r = marg; @@ -733,7 +733,7 @@ opt.rect.setRect(x, 0, boxsize, fm.height() + 2 + marg); opt.palette = cg; opt.state = styleflags; - lv->tqstyle()->drawPrimitive(TQStyle::PE_Q3CheckListController, &opt, p, lv); + lv->style()->drawPrimitive(TQStyle::PE_Q3CheckListController, &opt, p, lv); r += boxsize + 4; } } else { @@ -751,7 +751,7 @@ opt.rect.setRect(x, y, boxsize, fm.height() + 2 + marg); opt.palette = cg; opt.state = styleflags; - lv->tqstyle()->drawPrimitive((myType == CheckBox || myType == CheckBoxController) + lv->style()->drawPrimitive((myType == CheckBox || myType == CheckBoxController) ? TQStyle::PE_Q3CheckListIndicator : TQStyle::PE_Q3CheckListExclusiveIndicator, &opt, p, lv); r += boxsize + 4; @@ -782,7 +782,7 @@ (lv->rootIsDecorated() || myType == RadioButton || (myType == CheckBox && parentControl))) { TQRect rect; - int boxsize = lv->tqstyle()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv); + int boxsize = lv->style()->pixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv); if (lv->columnAlignment(0) == TQt::AlignCenter) { TQFontMetrics fm(lv->font()); int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize; @@ -1216,7 +1216,7 @@ return; TQPoint pos; - int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); if ( activatedPos( pos ) ) { bool parentControl = FALSE; if ( parent() && parent()->rtti() == 1 && @@ -1388,7 +1388,7 @@ int h = height(); KviTalListView *lv = listView(); if ( lv ) - h = TQMAX( lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv), + h = TQMAX( lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv), h ); h = TQMAX( h, TQApplication::globalStrut().height() ); setHeight( h ); @@ -1402,7 +1402,7 @@ if ( myType == RadioButtonController && pixmap( 0 ) ) { // r += 0; } else { - r += lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; + r += lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4; } } return TQMAX( r, TQApplication::globalStrut().width() ); @@ -1437,7 +1437,7 @@ parentControl = TRUE; TQFontMetrics fm( lv->fontMetrics() ); - int boxsize = lv->tqstyle().pixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize : + int boxsize = lv->style().pixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize : TQStyle::PM_CheckListButtonSize, lv); int marg = lv->itemMargin(); int r = marg; @@ -1464,7 +1464,7 @@ if(!parentControl) x += 3; if ( !pixmap( 0 ) ) { - lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListController, p, + lv->style().tqdrawPrimitive(TQStyle::PE_CheckListController, p, TQRect(x, 0, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); @@ -1482,12 +1482,12 @@ y = (fm.height() + 2 + marg - boxsize) / 2; if ( ( myType == CheckBox ) || ( myType == CheckBoxController ) ) { - lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, + lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); } else { //radio button look - lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListExclusiveIndicator, + lv->style().tqdrawPrimitive(TQStyle::PE_CheckListExclusiveIndicator, p, TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, TQStyleOption(this)); @@ -1519,7 +1519,7 @@ (lv->rootIsDecorated() || myType == RadioButton || (myType == CheckBox && parentControl) ) ) { TQRect rect; - int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); + int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv); if ( lv->columnAlignment(0) == AlignCenter ) { TQFontMetrics fm( lv->font() ); int bx = (lv->columnWidth(0) - (boxsize + fm.width(text())))/2 + boxsize; diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp index 80ac44aa..85e24f3e 100644 --- a/src/kvilib/tal/kvi_tal_toolbar.cpp +++ b/src/kvilib/tal/kvi_tal_toolbar.cpp @@ -49,7 +49,7 @@ { //setFrameStyle(TQFrame::NoFrame); setObjectName(nam); - if(!tqlayout()) + if(!layout()) this->setLayout(new TQBoxLayout(TQBoxLayout::LeftToRight)); w->addToolBar(dock,this); } @@ -58,14 +58,14 @@ { //setFrameStyle(TQFrame::NoFrame); setObjectName(name); - if(!tqlayout()) + if(!layout()) this->setLayout(new TQBoxLayout(TQBoxLayout::LeftToRight)); w->addToolBar(this); } TQBoxLayout * KviTalToolBar::boxLayout() { - return (TQBoxLayout*)this->tqlayout(); + return (TQBoxLayout*)this->layout(); } void KviTalToolBar::setBoxLayout(TQBoxLayout * l) -- cgit v1.2.1