summaryrefslogtreecommitdiffstats
path: root/src/kvilib/irc
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/irc
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/irc')
-rw-r--r--src/kvilib/irc/kvi_ircmask.cpp58
-rw-r--r--src/kvilib/irc/kvi_ircserverdb.cpp2
-rw-r--r--src/kvilib/irc/kvi_ircuserdb.cpp4
-rw-r--r--src/kvilib/irc/kvi_mirccntrl.cpp16
4 files changed, 40 insertions, 40 deletions
diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp
index acc2de83..4552cc93 100644
--- a/src/kvilib/irc/kvi_ircmask.cpp
+++ b/src/kvilib/irc/kvi_ircmask.cpp
@@ -232,8 +232,8 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
if(b)
{
const TQChar * p = b;
- while(p->unicode() && (p->unicode() != '!'))p++;
- if(p->unicode())
+ while(p->tqunicode() && (p->tqunicode() != '!'))p++;
+ if(p->tqunicode())
{
if(p != b)
{
@@ -250,8 +250,8 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
}
p++;
b = p;
- while(p->unicode() && (p->unicode() != '@'))p++;
- if(p->unicode())
+ while(p->tqunicode() && (p->tqunicode() != '@'))p++;
+ if(p->tqunicode())
{
if(p != b)
{
@@ -267,7 +267,7 @@ KviIrcMask::KviIrcMask(const TQString &szMask)
}
p++;
b=p;
- while(p->unicode())p++;
+ while(p->tqunicode())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->unicode()))
+ while((uc = p->tqunicode()))
{
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().unicode();
+ uc = p->toUpper().tqunicode();
#else
- uc = p->upper().unicode();
+ uc = p->upper().tqunicode();
#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].unicode() != '*')
+ if(m_szUser[0].tqunicode() != '*')
szMask.append(m_szWild);
- 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));
+ 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));
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.unicode();
+ const TQChar *p = m_szHost.tqunicode();
const TQChar *b = p;
p += len;
if(b < p)
{
p--;
- while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
+ while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))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.unicode();
+ const TQChar *p = m_szHost.tqunicode();
const TQChar *b = p;
p += len;
if(b < p)
{
p--;
- while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
+ while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))p--;
if(b < p)
{
p--;
- while((b < p) && (p->unicode() != '.') && (p->unicode() != ':'))p--;
+ while((b < p) && (p->tqunicode() != '.') && (p->tqunicode() != ':'))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->unicode() && p->unicode() != '.')p++;
+ while(p->tqunicode() && p->tqunicode() != '.')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.unicode();
+ const TQChar *p = m_szHost.tqunicode();
const TQChar *b = p;
p += len;
if(b < p)
{
p--;
- while((b < p) && (p->unicode() != '.'))p--;
+ while((b < p) && (p->tqunicode() != '.'))p--;
if(b < p)
{
p--;
- while((b < p) && (p->unicode() != '.'))p--;
+ while((b < p) && (p->tqunicode() != '.'))p--;
}
}
@@ -692,14 +692,14 @@ TQString KviIrcMask::getLargeHostDomainMask() const
bool KviIrcMask::hasMaskedIp() const
{
int len = m_szHost.length();
- const TQChar *p = m_szHost.unicode();
+ const TQChar *p = m_szHost.tqunicode();
const TQChar *b = p;
if(len == 0)return false;
//run to the end
p += len;
const TQChar *e = p;
p--;
- while((b < p) && (p->unicode() != '.'))p--;
+ while((b < p) && (p->tqunicode() != '.'))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->unicode()))
+ while((uc = aux->tqunicode()))
{
if((uc == '*') || (uc == '?'))return true;
aux++;
@@ -736,14 +736,14 @@ int KviIrcMask::nonWildChars()
if(!aux)return 0;
unsigned short uc;
- while((uc = aux->unicode()))
+ while((uc = aux->tqunicode()))
{
if((uc != '*') && (uc != '?'))iCnt++;
aux++;
}
aux = KviTQString::nullTerminatedArray(m_szUser);
- while((uc = aux->unicode()))
+ while((uc = aux->tqunicode()))
{
if((uc != '*') && (uc != '?'))iCnt++;
aux++;
@@ -751,7 +751,7 @@ int KviIrcMask::nonWildChars()
aux = KviTQString::nullTerminatedArray(m_szHost);
- while((uc = aux->unicode()))
+ while((uc = aux->tqunicode()))
{
if((uc != '*') && (uc != '?'))iCnt++;
aux++;
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index cec8ad62..84bb5f39 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -26,7 +26,7 @@
#include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqmessagebox.h>
#include <tqcheckbox.h>
diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp
index 3394b047..7fda2d12 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].unicode()==KVI_TEXT_COLOR) && (m_szRealName[2].unicode()==KVI_TEXT_RESET) )
+ if( (m_szRealName[0].tqunicode()==KVI_TEXT_COLOR) && (m_szRealName[2].tqunicode()==KVI_TEXT_RESET) )
{
- switch(m_szRealName[1].unicode())
+ switch(m_szRealName[1].tqunicode())
{
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 e42f3165..21b5258a 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].unicode();
+ unsigned short c = szData[(int)charIdx].tqunicode();
//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].unicode();
+ c = szData[(int)charIdx].tqunicode();
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].unicode();
+ c = szData[(int)charIdx].tqunicode();
}
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].unicode();
+ c = szData[(int)charIdx].tqunicode();
} 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)].unicode()==',')
+ if(szData[(int)(charIdx-1)].tqunicode()==',')
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].unicode();
+ c = szData[(int)charIdx].tqunicode();
if((c >= '0') && (c <='9'))
{
@@ -262,7 +262,7 @@ namespace KviMircCntrl
unsigned char b2;
while(i < l)
{
- switch(szData[i].unicode())
+ switch(szData[i].tqunicode())
{
case KVI_TEXT_UNDERLINE:
case KVI_TEXT_BOLD:
@@ -288,7 +288,7 @@ namespace KviMircCntrl
i++;
while(i < l)
{
- if(szData[i].unicode() == ' ')break;
+ if(szData[i].tqunicode() == ' ')break;
else i++;
}
begin = i;