summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/irc/libkirc
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/irc/libkirc')
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.cpp40
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.h12
-rw-r--r--kopete/protocols/irc/libkirc/kircengine_commands.cpp10
-rw-r--r--kopete/protocols/irc/libkirc/kircengine_ctcp.cpp30
-rw-r--r--kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp2
-rw-r--r--kopete/protocols/irc/libkirc/kircentity.cpp6
-rw-r--r--kopete/protocols/irc/libkirc/kircmessage.cpp24
-rw-r--r--kopete/protocols/irc/libkirc/kircmessage.h2
-rw-r--r--kopete/protocols/irc/libkirc/kircmessageredirector.cpp6
-rw-r--r--kopete/protocols/irc/libkirc/kirctransfer.cpp4
-rw-r--r--kopete/protocols/irc/libkirc/kirctransfer.h6
-rw-r--r--kopete/protocols/irc/libkirc/kirctransferhandler.cpp2
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.cpp4
13 files changed, 74 insertions, 74 deletions
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 8a81d848..ac1fd698 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -30,7 +30,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqtimer.h>
//Needed for getuid / getpwuid
@@ -51,10 +51,10 @@ using namespace KIRC;
/* Please note that the regular expression "[\\r\\n]*$" is used in a TQString::replace statement many times.
* This gets rid of trailing \r\n, \r, \n, and \n\r characters.
*/
-const TQRegExp Engine::m_RemoveLinefeeds( TQString::fromLatin1("[\\r\\n]*$") );
+const TQRegExp Engine::m_RemoveLinefeeds( TQString::tqfromLatin1("[\\r\\n]*$") );
Engine::Engine(TQObject *parent, const char *name)
- : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").arg(name).latin1()),
+ : TQObject(parent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()),
m_status(Idle),
m_FailedNickOnLogin(false),
m_useSSL(false),
@@ -74,9 +74,9 @@ Engine::Engine(TQObject *parent, const char *name)
bindNumericReplies();
bindCtcp();
- m_VersionString = TQString::fromLatin1("Anonymous client using the KIRC engine.");
- m_UserString = TQString::fromLatin1("Response not supplied by user.");
- m_SourceString = TQString::fromLatin1("Unknown client, known source.");
+ m_VersionString = TQString::tqfromLatin1("Anonymous client using the KIRC engine.");
+ m_UserString = TQString::tqfromLatin1("Response not supplied by user.");
+ m_SourceString = TQString::tqfromLatin1("Unknown client, known source.");
defaultCodec = TQTextCodec::codecForMib(106); // UTF8 mib is 106
kdDebug(14120) << "Setting default engine codec, " << defaultCodec->name() << endl;
@@ -133,14 +133,14 @@ void Engine::setUseSSL( bool useSSL )
}
}
-void Engine::setStatus(Engine::Status status)
+void Engine::settqStatus(Engine::tqStatus status)
{
kdDebug(14120) << k_funcinfo << status << endl;
if (m_status == status)
return;
-// Engine::Status oldStatus = m_status;
+// Engine::tqStatus oldtqStatus = m_status;
m_status = status;
emit statusChanged(status);
@@ -169,16 +169,16 @@ void Engine::setStatus(Engine::Status status)
case Closing:
m_sock->close();
m_sock->reset();
- setStatus(Idle);
+ settqStatus(Idle);
break;
case AuthentifyingFailed:
- setStatus(Closing);
+ settqStatus(Closing);
break;
case Timeout:
- setStatus(Closing);
+ settqStatus(Closing);
break;
case Disconnected:
- setStatus(Closing);
+ settqStatus(Closing);
break;
}
}
@@ -200,23 +200,23 @@ void Engine::connectToServer(const TQString &host, TQ_UINT16 port, const TQStrin
if( m_sock->startAsyncConnect() == 0 )
{
kdDebug(14120) << k_funcinfo << "Success!. Status: " << m_sock->socketStatus() << endl;
- setStatus(Connecting);
+ settqStatus(Connecting);
}
else
{
kdDebug(14120) << k_funcinfo << "Failed. Status: " << m_sock->socketStatus() << endl;
- setStatus(Disconnected);
+ settqStatus(Disconnected);
}
}
void Engine::slotConnected()
{
- setStatus(Authentifying);
+ settqStatus(Authentifying);
}
void Engine::slotConnectionClosed()
{
- setStatus(Disconnected);
+ settqStatus(Disconnected);
}
void Engine::error(int errCode)
@@ -225,7 +225,7 @@ void Engine::error(int errCode)
if (m_sock->socketStatus () != KExtendedSocket::connecting)
{
// Connection in progress.. This is a signal fired wrong
- setStatus(Disconnected);
+ settqStatus(Disconnected);
}
}
@@ -250,7 +250,7 @@ void Engine::setSourceString(const TQString &newString)
void Engine::setUserName(const TQString &newName)
{
if(newName.isEmpty())
- m_Username = TQString::fromLatin1(getpwuid(getuid())->pw_name);
+ m_Username = TQString::tqfromLatin1(getpwuid(getuid())->pw_name);
else
m_Username = newName;
m_Username.remove(m_RemoveLinefeeds);
@@ -259,7 +259,7 @@ void Engine::setUserName(const TQString &newName)
void Engine::setRealName(const TQString &newName)
{
if(newName.isEmpty())
- m_realName = TQString::fromLatin1(getpwuid(getuid())->pw_gecos);
+ m_realName = TQString::tqfromLatin1(getpwuid(getuid())->pw_gecos);
else
m_realName = newName;
m_realName.remove(m_RemoveLinefeeds);
@@ -443,7 +443,7 @@ bool Engine::invokeCtcpCommandOfMessage(const TQDict<MessageRedirector> &map, Me
kdDebug(14120) << "Method error for line:" << ctcpMsg.raw() << endl;
writeCtcpErrorMessage(msg.prefix(), msg.ctcpRaw(),
- TQString::fromLatin1("%1 internal error(s)").arg(errors.size()));
+ TQString::tqfromLatin1("%1 internal error(s)").tqarg(errors.size()));
}
else
{
diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h
index 9f488d47..1be8651c 100644
--- a/kopete/protocols/irc/libkirc/kircengine.h
+++ b/kopete/protocols/irc/libkirc/kircengine.h
@@ -72,7 +72,7 @@ class Engine
// TQ_PROPERTY(TQString nick READ nick)
// TQ_PROPERTY(TQStringList portList)
- Q_ENUMS(Status)
+ Q_ENUMS(tqStatus)
public:
enum Error
@@ -84,7 +84,7 @@ public:
MethodFailed
};
- enum Status
+ enum tqStatus
{
Idle,
Connecting,
@@ -165,7 +165,7 @@ public:
KExtendedSocket *socket()
{ return m_sock; };
- inline KIRC::Engine::Status status() const
+ inline KIRC::Engine::tqStatus status() const
{ return m_status; }
inline bool isDisconnected() const
@@ -275,7 +275,7 @@ public slots:
void showInfoDialog();
signals:
- void statusChanged(KIRC::Engine::Status newStatus);
+ void statusChanged(KIRC::Engine::tqStatus newtqStatus);
void internalError(KIRC::Engine::Error, KIRC::Message &);
void receivedMessage(KIRC::Message &);
@@ -479,7 +479,7 @@ private:
void bindNumericReplies();
void bindCtcp();
- void setStatus(KIRC::Engine::Status status);
+ void settqStatus(KIRC::Engine::tqStatus status);
bool invokeCtcpCommandOfMessage(const TQDict<KIRC::MessageRedirector> &map, KIRC::Message &message);
/*
@@ -493,7 +493,7 @@ private:
//Static regexes
static const TQRegExp m_RemoveLinefeeds;
- KIRC::Engine::Status m_status;
+ KIRC::Engine::tqStatus m_status;
TQString m_Host;
TQ_UINT16 m_Port;
diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
index acea30e7..e0e63909 100644
--- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
@@ -48,7 +48,7 @@ void Engine::away(bool isAway, const TQString &awayMessage)
if( !awayMessage.isEmpty() )
writeMessage("AWAY", TQString(), awayMessage);
else
- writeMessage("AWAY", TQString(), TQString::fromLatin1("I'm away."));
+ writeMessage("AWAY", TQString(), TQString::tqfromLatin1("I'm away."));
else
writeMessage("AWAY", TQString());
}
@@ -56,20 +56,20 @@ void Engine::away(bool isAway, const TQString &awayMessage)
// FIXME: Really handle this message
void Engine::error(Message &)
{
- setStatus(Closing);
+ settqStatus(Closing);
}
void Engine::ison(const TQStringList &nickList)
{
if (!nickList.isEmpty())
{
- TQString statement = TQString::fromLatin1("ISON");
+ TQString statement = TQString::tqfromLatin1("ISON");
for (TQStringList::ConstIterator it = nickList.begin(); it != nickList.end(); ++it)
{
if ((statement.length()+(*it).length())>509) // 512(max buf)-2("\r\n")-1(<space separator>)
{
writeMessage(statement);
- statement = TQString::fromLatin1("ISON ") + (*it);
+ statement = TQString::tqfromLatin1("ISON ") + (*it);
}
else
statement.append(TQChar(' ') + (*it));
@@ -201,7 +201,7 @@ void Engine::quit(const TQString &reason, bool /*now*/)
if (isConnected())
writeMessage("QUIT", TQString(), reason);
- setStatus(Closing);
+ settqStatus(Closing);
}
void Engine::quit(Message &msg)
diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
index 0159f790..05477710 100644
--- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
@@ -109,10 +109,10 @@ bool Engine::CtcpReply_action(Message &msg)
// FIXME: the API can now answer to help commands.
void Engine::CtcpQuery_clientinfo(Message &msg)
{
- TQString clientinfo = customCtcpMap[ TQString::fromLatin1("clientinfo") ];
+ TQString clientinfo = customCtcpMap[ TQString::tqfromLatin1("clientinfo") ];
if (clientinfo.isNull())
- clientinfo = TQString::fromLatin1("The following commands are supported, but "
+ clientinfo = TQString::tqfromLatin1("The following commands are supported, but "
"without sub-command help: VERSION, CLIENTINFO, USERINFO, TIME, SOURCE, PING,"
"ACTION.");
@@ -132,8 +132,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName,
case Transfer::Chat:
{
writeCtcpQueryMessage(nickname, TQString(),
- TQString::fromLatin1("DCC"),
- TQStringList(TQString::fromLatin1("CHAT")) << TQString::fromLatin1("chat") <<
+ TQString::tqfromLatin1("DCC"),
+ TQStringList(TQString::tqfromLatin1("CHAT")) << TQString::tqfromLatin1("chat") <<
m_sock->localAddress()->nodeName() << TQString::number(port)
);
break;
@@ -154,8 +154,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName,
kdDebug(14120) << "Starting DCC file outgoing transfer." << endl;
writeCtcpQueryMessage(nickname, TQString(),
- TQString::fromLatin1("DCC"),
- TQStringList(TQString::fromLatin1("SEND")) << noWhiteSpace << ipNumber <<
+ TQString::tqfromLatin1("DCC"),
+ TQStringList(TQString::tqfromLatin1("SEND")) << noWhiteSpace << ipNumber <<
TQString::number(server->port()) << TQString::number(file.size())
);
break;
@@ -173,7 +173,7 @@ void Engine::CtcpQuery_dcc(Message &msg)
Message &ctcpMsg = msg.ctcpMessage();
TQString dccCommand = ctcpMsg.arg(0).upper();
- if (dccCommand == TQString::fromLatin1("CHAT"))
+ if (dccCommand == TQString::tqfromLatin1("CHAT"))
{
// if(ctcpMsg.argsSize()!=4) return false;
@@ -196,7 +196,7 @@ void Engine::CtcpQuery_dcc(Message &msg)
Transfer::Chat );
}
}
- else if (dccCommand == TQString::fromLatin1("SEND"))
+ else if (dccCommand == TQString::tqfromLatin1("SEND"))
{
// if(ctcpMsg.argsSize()!=5) return false;
@@ -253,7 +253,7 @@ void Engine::CtcpRequest_ping(const TQString &target)
TQString timeReply;
if( Entity::isChannel(target) )
- timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
+ timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
else
timeReply = TQString::number( time.tv_sec );
@@ -275,7 +275,7 @@ void Engine::CtcpReply_ping(Message &msg)
if (gettimeofday(&time, 0) == 0)
{
// FIXME: the time code is wrong for usec
- TQString timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
+ TQString timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
double newTime = timeReply.toDouble();
double oldTime = msg.suffix().section(' ',0, 0).toDouble();
double difference = newTime - oldTime;
@@ -295,10 +295,10 @@ void Engine::CtcpReply_ping(Message &msg)
TQString millSec = diffString.section('.', 1, 1);
millSec.remove(millSec.find('.'), 1);
millSec.truncate(3);
- diffString = TQString::fromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec);
+ diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec);
}
- emit incomingCtcpReply(TQString::fromLatin1("PING"), msg.nickFromPrefix(), diffString);
+ emit incomingCtcpReply(TQString::tqfromLatin1("PING"), msg.nickFromPrefix(), diffString);
}
// else
// ((MessageRedirector *)sender())->error("failed to get current time");
@@ -313,13 +313,13 @@ void Engine::CtcpQuery_source(Message &msg)
void Engine::CtcpQuery_time(Message &msg)
{
writeCtcpReplyMessage(msg.nickFromPrefix(), TQString(),
- msg.ctcpMessage().command(), TQDateTime::currentDateTime().toString(),
+ msg.ctcpMessage().command(), TQDateTime::tqcurrentDateTime().toString(),
TQString(), false);
}
void Engine::CtcpQuery_userinfo(Message &msg)
{
- TQString userinfo = customCtcpMap[ TQString::fromLatin1("userinfo") ];
+ TQString userinfo = customCtcpMap[ TQString::tqfromLatin1("userinfo") ];
if (userinfo.isNull())
userinfo = m_UserString;
@@ -335,7 +335,7 @@ void Engine::CtcpRequest_version(const TQString &target)
void Engine::CtcpQuery_version(Message &msg)
{
- TQString response = customCtcpMap[ TQString::fromLatin1("version") ];
+ TQString response = customCtcpMap[ TQString::tqfromLatin1("version") ];
kdDebug(14120) << "Version check: " << response << endl;
if (response.isNull())
diff --git a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
index 67d3a842..3d7b896b 100644
--- a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
@@ -117,7 +117,7 @@ void Engine::numericReply_001(Message &msg)
*/
emitSuffix(msg);
- setStatus(Connected);
+ settqStatus(Connected);
}
/* 002: ":Your host is <servername>, running version <ver>"
diff --git a/kopete/protocols/irc/libkirc/kircentity.cpp b/kopete/protocols/irc/libkirc/kircentity.cpp
index 74781e48..2086ab9d 100644
--- a/kopete/protocols/irc/libkirc/kircentity.cpp
+++ b/kopete/protocols/irc/libkirc/kircentity.cpp
@@ -29,16 +29,16 @@ using namespace KNetwork;
* where user and host are optionnal.
* NOTE: If changes are done to the regexp string, update also the sm_userStrictRegExp regexp string.
*/
-const TQRegExp Entity::sm_userRegExp(TQString::fromLatin1("^([^\\s,:!@]+)(?:(?:!([^\\s,:!@]+))?(?:@([^\\s,!@]+)))?$"));
+const TQRegExp Entity::sm_userRegExp(TQString::tqfromLatin1("^([^\\s,:!@]+)(?:(?:!([^\\s,:!@]+))?(?:@([^\\s,!@]+)))?$"));
/**
* Regexp to match strictly the complete user definition:
* nick!user@host
* NOTE: If changes are done to the regexp string, update also the sm_userRegExp regexp string.
*/
-const TQRegExp Entity::sm_userStrictRegExp(TQString::fromLatin1("^([^\\s,:!@]+)!([^\\s,:!@]+)@([^\\s,:!@]+)$"));
+const TQRegExp Entity::sm_userStrictRegExp(TQString::tqfromLatin1("^([^\\s,:!@]+)!([^\\s,:!@]+)@([^\\s,:!@]+)$"));
-const TQRegExp Entity::sm_channelRegExp( TQString::fromLatin1("^[#!+&][^\\s,]+$") );
+const TQRegExp Entity::sm_channelRegExp( TQString::tqfromLatin1("^[#!+&][^\\s,]+$") );
Entity::Entity(const TQString &, const Type type)
: TQObject(0, "KIRC::Entity"),
diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp
index 8a48ce52..6f45b0c1 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessage.cpp
@@ -99,14 +99,14 @@ void Message::writeRawMessage(Engine *engine, const TQTextCodec *codec, const TQ
return;
}
- TQString txt = str + TQString::fromLatin1("\r\n");
+ TQString txt = str + TQString::tqfromLatin1("\r\n");
TQCString s(codec->fromUnicode(txt));
kdDebug(14120) << "Message is " << s.length() << " chars" << endl;
// FIXME: Should check the amount of data really writen.
int wrote = engine->socket()->writeBlock(s.data(), s.length());
- kdDebug(14121) << TQString::fromLatin1("(%1 bytes) >> %2").arg(wrote).arg(str) << endl;
+ kdDebug(14121) << TQString::tqfromLatin1("(%1 bytes) >> %2").tqarg(wrote).tqarg(str) << endl;
}
void Message::writeMessage(Engine *engine, const TQTextCodec *codec, const TQString &message)
@@ -123,7 +123,7 @@ void Message::writeMessage(Engine *engine, const TQTextCodec *codec,
msg += TQChar(' ') + args.join(TQChar(' ')).stripWhiteSpace(); // some extra check should be done here
if (!suffix.isNull())
- msg = msg.stripWhiteSpace() + TQString::fromLatin1(" :") + suffix;
+ msg = msg.stripWhiteSpace() + TQString::tqfromLatin1(" :") + suffix;
writeMessage(engine, codec, msg);
}
@@ -145,7 +145,7 @@ void Message::writeCtcpMessage(Engine *engine, const TQTextCodec *codec,
ctcpMsg += TQChar(' ') + ctcpArgs.join(TQChar(' ')).stripWhiteSpace(); // some extra check should be done here
if (!ctcpSuffix.isNull())
- ctcpMsg += TQString::fromLatin1(" :") + ctcpSuffix;
+ ctcpMsg += TQString::tqfromLatin1(" :") + ctcpSuffix;
writeMessage(engine, codec, command, to, suffix + TQChar(0x01) + ctcpQuote(ctcpMsg) + TQChar(0x01));
}
@@ -169,10 +169,10 @@ Message Message::parse(Engine *engine, const TQTextCodec *codec, bool *parseSucc
// Some servers send '\n' instead of '\r\n' that the RFCs say they should be sending.
if (length > 1 && raw.at(length-2) == '\n') {
- raw.at(length-2) = '\0';
+ raw.tqat(length-2) = '\0';
}
if (length > 2 && raw.at(length-3) == '\r') {
- raw.at(length-3) = '\0';
+ raw.tqat(length-3) = '\0';
}
kdDebug(14121) << "<< " << raw << endl;
@@ -202,9 +202,9 @@ TQString Message::quote(const TQString &str)
TQString tmp = str;
TQChar q('\020');
tmp.replace(q, q+TQString(q));
- tmp.replace(TQChar('\r'), q+TQString::fromLatin1("r"));
- tmp.replace(TQChar('\n'), q+TQString::fromLatin1("n"));
- tmp.replace(TQChar('\0'), q+TQString::fromLatin1("0"));
+ tmp.replace(TQChar('\r'), q+TQString::tqfromLatin1("r"));
+ tmp.replace(TQChar('\n'), q+TQString::tqfromLatin1("n"));
+ tmp.replace(TQChar('\0'), q+TQString::tqfromLatin1("0"));
return tmp;
}
@@ -230,8 +230,8 @@ TQString Message::unquote(const TQString &str)
TQString Message::ctcpQuote(const TQString &str)
{
TQString tmp = str;
- tmp.replace( TQChar('\\'), TQString::fromLatin1("\\\\"));
- tmp.replace( (char)1, TQString::fromLatin1("\\1"));
+ tmp.replace( TQChar('\\'), TQString::tqfromLatin1("\\\\"));
+ tmp.replace( (char)1, TQString::tqfromLatin1("\\1"));
return tmp;
}
@@ -317,7 +317,7 @@ TQString Message::toString() const
for (TQStringList::ConstIterator it = m_args.begin(); it != m_args.end(); ++it)
msg += TQChar(' ') + *it;
if (!m_suffix.isNull())
- msg += TQString::fromLatin1(" :") + m_suffix;
+ msg += TQString::tqfromLatin1(" :") + m_suffix;
return msg;
}
diff --git a/kopete/protocols/irc/libkirc/kircmessage.h b/kopete/protocols/irc/libkirc/kircmessage.h
index cd409323..fb38a476 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.h
+++ b/kopete/protocols/irc/libkirc/kircmessage.h
@@ -25,7 +25,7 @@
#include <tqdict.h>
#include <tqstring.h>
#include <tqstringlist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqregexp.h>
#include <kopetemessage.h>
diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
index 2e1d0b4c..ae9854f1 100644
--- a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
@@ -80,9 +80,9 @@ bool MessageRedirector::checkValidity(const Message &msg)
/*
if ( msg.isNumeric() &&
( msg.argsSize() > 0 && (
- msg.arg(0) == m_Nickname ||
- msg.arg(0) == m_PendingNick ||
- msg.arg(0) == TQString::fromLatin1("*")
+ msg.tqarg(0) == m_Nickname ||
+ msg.tqarg(0) == m_PendingNick ||
+ msg.tqarg(0) == TQString::tqfromLatin1("*")
)
)
)
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp
index 68e28f0c..3c6d1907 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp
@@ -94,11 +94,11 @@ Transfer::~Transfer()
// m_file is automatically closed on destroy.
}
-Transfer::Status Transfer::status() const
+Transfer::tqStatus Transfer::status() const
{
if(m_socket)
{
-// return (Transfer::Status)m_socket->socketStatus();
+// return (Transfer::tqStatus)m_socket->socketStatus();
return Connected;
}
return Error_NoSocket;
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.h b/kopete/protocols/irc/libkirc/kirctransfer.h
index a64a9ddb..950c0e96 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.h
+++ b/kopete/protocols/irc/libkirc/kirctransfer.h
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <tqhostaddress.h>
#include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
class KExtendedSocket;
@@ -47,7 +47,7 @@ public:
FileIncoming
};
- enum Status {
+ enum tqStatus {
Error_NoSocket = -2,
Error = -1,
Idle = 0,
@@ -101,7 +101,7 @@ public:
{ return m_nick; }
Type type() const
{ return m_type; }
- Status status() const;
+ tqStatus status() const;
/* Start the transfer.
* If not connected connect to client.
diff --git a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
index 00d893da..3a5ef27c 100644
--- a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
@@ -21,7 +21,7 @@
#include <tqfile.h>
#include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include "kirctransferserver.h"
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 6d6c2ba2..2bf3910a 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -372,7 +372,7 @@ int KSSLSocket::verifyCertificate()
"does not match the one the "
"certificate was issued to.");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
- msg.arg(ourHost),
+ msg.tqarg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
i18n("Co&ntinue") );
@@ -382,7 +382,7 @@ int KSSLSocket::verifyCertificate()
TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
- msg.arg(ourHost),
+ msg.tqarg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
i18n("Co&ntinue") );