summaryrefslogtreecommitdiffstats
path: root/src/kvilib/irc
diff options
context:
space:
mode:
Diffstat (limited to 'src/kvilib/irc')
-rw-r--r--src/kvilib/irc/kvi_avatar.cpp4
-rw-r--r--src/kvilib/irc/kvi_ircmask.cpp4
-rw-r--r--src/kvilib/irc/kvi_ircserverdb.cpp9
-rw-r--r--src/kvilib/irc/kvi_nickserv.cpp8
4 files changed, 0 insertions, 25 deletions
diff --git a/src/kvilib/irc/kvi_avatar.cpp b/src/kvilib/irc/kvi_avatar.cpp
index 680e7978..3a9f54df 100644
--- a/src/kvilib/irc/kvi_avatar.cpp
+++ b/src/kvilib/irc/kvi_avatar.cpp
@@ -153,13 +153,9 @@ TQPixmap * KviAvatar::scaledPixmap(unsigned int w,unsigned int h)
scaleW = (scaleH * curW) / curH;
}
-#ifdef COMPILE_USE_QT4
- m_pScaledPixmap = new TQPixmap(m_pPixmap->scaled(scaleW,scaleH));
-#else
TQImage img = m_pPixmap->convertToImage();
m_pScaledPixmap = new TQPixmap();
m_pScaledPixmap->convertFromImage(img.smoothScale(scaleW,scaleH));
-#endif
return m_pScaledPixmap;
}
diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp
index 9b0030ae..90ae3566 100644
--- a/src/kvilib/irc/kvi_ircmask.cpp
+++ b/src/kvilib/irc/kvi_ircmask.cpp
@@ -299,11 +299,7 @@ bool KviIrcMask::hasNumericHost() const
else {
if((uc < '0') || (uc > '9'))
{
-#ifdef COMPILE_USE_QT4
- uc = p->toUpper().unicode();
-#else
uc = p->upper().unicode();
-#endif
if((uc < 'A') || (uc > 'F'))return false;
}
}
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index 84bb5f39..8eecb260 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -184,13 +184,8 @@ bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const TQString &szNetN
for(KviIrcServer * s = r->m_pServerList->first();s;s = r->m_pServerList->next())
{
-#ifdef COMPILE_USE_QT4
- if(s->m_szDescription.contains("random",TQt::CaseInsensitive) ||
- (s->m_szDescription.contains("round",TQt::CaseInsensitive) && s->m_szDescription.contains("robin",TQt::CaseInsensitive)))
-#else
if(s->m_szDescription.contains("random",false) ||
(s->m_szDescription.contains("round",false) && s->m_szDescription.contains("robin",false)))
-#endif
{
r->setCurrentServer(s);
return true;
@@ -343,11 +338,7 @@ search_finished:
if(!(bIsValidIpV4 || bIsValidIpV6))
{
// is it a valid hostname ? (must contain at least one dot)
-#ifdef COMPILE_USE_QT4
- if(!d->szServer.contains('.'))
-#else
if(d->szServer.contains('.') < 1)
-#endif
{
// assume it is a network name!
KviIrcServerDataBaseRecord * r = m_pRecords->find(d->szServer);
diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/kvi_nickserv.cpp
index 24a50e96..240ac515 100644
--- a/src/kvilib/irc/kvi_nickserv.cpp
+++ b/src/kvilib/irc/kvi_nickserv.cpp
@@ -203,19 +203,11 @@ KviNickServRule * KviNickServRuleSet::matchRule(const TQString &szNick,const Kvi
if(!KviTQString::matchStringCI(r->registeredNick(),szNick,false,true)) continue;
if(!szServer.isEmpty())
{
-#ifdef COMPILE_USE_QT4
- TQRegExp res(r->serverMask(),TQt::CaseInsensitive,TQRegExp::Wildcard);
-#else
TQRegExp res(r->serverMask(),false,true);
-#endif
if(!res.exactMatch(szServer))continue;
}
if(!nickServ->matchedBy(KviIrcMask(r->nickServMask())))continue;
-#ifdef COMPILE_USE_QT4
- TQRegExp re(r->messageRegexp(),TQt::CaseInsensitive,TQRegExp::Wildcard);
-#else
TQRegExp re(r->messageRegexp(),false,true);
-#endif
if(re.exactMatch(szMsg))return r;
}
return 0;