summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/irc
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/irc')
-rw-r--r--kopete/protocols/irc/ircaccount.cpp44
-rw-r--r--kopete/protocols/irc/ircchannelcontact.cpp40
-rw-r--r--kopete/protocols/irc/irccontact.cpp2
-rw-r--r--kopete/protocols/irc/ircprotocol.cpp26
-rw-r--r--kopete/protocols/irc/ircservercontact.cpp10
-rw-r--r--kopete/protocols/irc/irctransferhandler.cpp2
-rw-r--r--kopete/protocols/irc/ircusercontact.cpp48
-rw-r--r--kopete/protocols/irc/ksparser.cpp8
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.cpp4
-rw-r--r--kopete/protocols/irc/libkirc/kircmessage.cpp6
-rw-r--r--kopete/protocols/irc/libkirc/kircmessageredirector.cpp6
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.cpp4
-rw-r--r--kopete/protocols/irc/ui/ircadd.ui2
-rw-r--r--kopete/protocols/irc/ui/irceditaccount.ui2
-rw-r--r--kopete/protocols/irc/ui/irceditaccountwidget.cpp4
15 files changed, 104 insertions, 104 deletions
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index ec3904eb..318a8f20 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -79,7 +79,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it )
m_engine->addCustomCtcp( it.key(), it.data() );
- TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").tqarg(kapp->aboutData()->version());
+ TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").arg(kapp->aboutData()->version());
m_engine->setVersionString( version );
TQObject::connect(m_engine, TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)),
@@ -173,7 +173,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
/* Could not find this host. Add it to the networks structure */
m_network = new IRCNetwork;
- m_network->name = i18n("Temporary Network - %1").tqarg( hostName );
+ m_network->name = i18n("Temporary Network - %1").arg( hostName );
m_network->description = i18n("Network imported from previous version of Kopete, or an IRC URI");
IRCHost *host = new IRCHost;
@@ -204,7 +204,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
m_contactManager = new IRCContactManager(mNickName, this);
setMyself( m_contactManager->mySelf() );
- setAccountLabel( TQString::fromLatin1("%1@%2").tqarg(mNickName,networkName) );
+ setAccountLabel( TQString::fromLatin1("%1@%2").arg(mNickName,networkName) );
m_myServer = m_contactManager->myServer();
m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString(), 0, this,
@@ -226,7 +226,7 @@ void IRCAccount::slotNickInUse( const TQString &nick )
{
TQString newNick = KInputDialog::getText(
i18n("IRC Plugin"),
- i18n("The nickname %1 is already in use. Please enter an alternate nickname:").tqarg(nick),
+ i18n("The nickname %1 is already in use. Please enter an alternate nickname:").arg(nick),
nick);
if (newNick.isNull())
@@ -243,7 +243,7 @@ void IRCAccount::slotNickInUse( const TQString &nick )
void IRCAccount::slotNickInUseAlert( const TQString &nick )
{
- KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").tqarg(nick), i18n("IRC Plugin"));
+ KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").arg(nick), i18n("IRC Plugin"));
}
void IRCAccount::setAltNick( const TQString &altNick )
@@ -306,8 +306,8 @@ void IRCAccount::setNetwork( const TQString &network )
KMessageBox::queuedMessageBox(
Kopete::UI::Global::mainWidget(), KMessageBox::Error,
i18n("<qt>The network associated with this account, <b>%1</b>, no longer exists. Please"
- " ensure that the account has a valid network. The account will not be enabled until you do so.</qt>").tqarg(network),
- i18n("Problem Loading %1").tqarg( accountId() ), 0 );
+ " ensure that the account has a valid network. The account will not be enabled until you do so.</qt>").arg(network),
+ i18n("Problem Loading %1").arg( accountId() ), 0 );
}
}
@@ -352,7 +352,7 @@ const TQString IRCAccount::defaultPart() const
{
TQString partMsg = configGroup()->readEntry(TQString::fromLatin1("defaultPart"));
if( partMsg.isEmpty() )
- return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").tqarg( kapp->aboutData()->version() );
+ return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg( kapp->aboutData()->version() );
return partMsg;
}
@@ -360,7 +360,7 @@ const TQString IRCAccount::defaultQuit() const
{
TQString quitMsg = configGroup()->readEntry(TQString::fromLatin1("defaultQuit"));
if( quitMsg.isEmpty() )
- return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").tqarg(kapp->aboutData()->version());
+ return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg(kapp->aboutData()->version());
return quitMsg;
}
@@ -370,7 +370,7 @@ void IRCAccount::setCustomCtcpReplies( const TQMap< TQString, TQString > &replie
for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it )
{
m_engine->addCustomCtcp( it.key(), it.data() );
- val.append( TQString::fromLatin1("%1=%2").tqarg( it.key() ).tqarg( it.data() ) );
+ val.append( TQString::fromLatin1("%1=%2").arg( it.key() ).arg( it.data() ) );
}
configGroup()->writeEntry( "CustomCtcp", val );
@@ -416,7 +416,7 @@ void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages,
KActionMenu *IRCAccount::actionMenu()
{
- TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).tqarg( accountId() ).tqarg( myself()->onlineStatus().description() );
+ TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).arg( accountId() ).arg( myself()->onlineStatus().description() );
KActionMenu *mActionMenu = Kopete::Account::actionMenu();
@@ -455,14 +455,14 @@ void IRCAccount::connectWithPassword(const TQString &password)
{
KMessageBox::queuedMessageBox(
Kopete::UI::Global::mainWidget(), KMessageBox::Error,
- i18n("<qt>The network associated with this account, <b>%1</b>, has no valid hosts. Please ensure that the account has a valid network.</qt>").tqarg(m_network->name),
+ i18n("<qt>The network associated with this account, <b>%1</b>, has no valid hosts. Please ensure that the account has a valid network.</qt>").arg(m_network->name),
i18n("Network is Empty"), 0 );
}
else if( currentHost == hosts.count() )
{
KMessageBox::queuedMessageBox(
Kopete::UI::Global::mainWidget(), KMessageBox::Error,
- i18n("<qt>Kopete could not connect to any of the servers in the network associated with this account (<b>%1</b>). Please try again later.</qt>").tqarg(m_network->name),
+ i18n("<qt>Kopete could not connect to any of the servers in the network associated with this account (<b>%1</b>). Please try again later.</qt>").arg(m_network->name),
i18n("Network is Unavailable"), 0 );
currentHost = 0;
@@ -490,7 +490,7 @@ void IRCAccount::connectWithPassword(const TQString &password)
}
IRCHost *host = hosts[ currentHost++ ];
- myServer()->appendMessage( i18n("Connecting to %1...").tqarg( host->host ) );
+ myServer()->appendMessage( i18n("Connecting to %1...").arg( host->host ) );
if( host->ssl )
myServer()->appendMessage( i18n("Using SSL") );
@@ -563,7 +563,7 @@ void IRCAccount::slotPerformOnConnectCommands()
return;
if (!autoConnect.isEmpty())
- Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").tqarg(autoConnect), manager);
+ Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").arg(autoConnect), manager);
TQStringList commands(connectCommands());
for (TQStringList::Iterator it=commands.begin(); it != commands.end(); ++it)
@@ -597,7 +597,7 @@ void IRCAccount::slotSearchChannels()
if( !m_channelList )
{
m_channelList = new ChannelListDialog( m_engine,
- i18n("Channel List for %1").tqarg( m_engine->currentHost() ), this,
+ i18n("Channel List for %1").arg( m_engine->currentHost() ), this,
TQT_SLOT( slotJoinNamedChannel( const TQString & ) ) );
}
else
@@ -714,8 +714,8 @@ bool IRCAccount::createContact( const TQString &contactId, Kopete::MetaContact *
{//This should NEVER happen
Kopete::MetaContact *old = c->metaContact();
c->setMetaContact( m );
- Kopete::ContactPtrList tqchildren = old->contacts();
- if (tqchildren.isEmpty())
+ Kopete::ContactPtrList children = old->contacts();
+ if (children.isEmpty())
Kopete::ContactList::self()->removeMetaContact( old );
}
else if( c->metaContact()->isTemporary() )
@@ -781,7 +781,7 @@ void IRCAccount::slotJoinChannel()
}
KMessageBox::error( Kopete::UI::Global::mainWidget(),
- i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").tqarg(chan),
+ i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").arg(chan),
i18n("IRC Plugin")
);
}
@@ -789,15 +789,15 @@ void IRCAccount::slotJoinChannel()
void IRCAccount::slotNewCtcpReply(const TQString &type, const TQString &/*target*/, const TQString &messageReceived)
{
- appendMessage( i18n("CTCP %1 REPLY: %2").tqarg(type).tqarg(messageReceived), InfoReply );
+ appendMessage( i18n("CTCP %1 REPLY: %2").arg(type).arg(messageReceived), InfoReply );
}
void IRCAccount::slotNoSuchNickname( const TQString &nick )
{
if( KIRC::Entity::isChannel(nick) )
- appendMessage( i18n("The channel \"%1\" does not exist").tqarg(nick), UnknownReply );
+ appendMessage( i18n("The channel \"%1\" does not exist").arg(nick), UnknownReply );
else
- appendMessage( i18n("The nickname \"%1\" does not exist").tqarg(nick), UnknownReply );
+ appendMessage( i18n("The nickname \"%1\" does not exist").arg(nick), UnknownReply );
}
void IRCAccount::appendMessage( const TQString &message, MessageType type )
diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp
index 8ecb59f0..94d67d3a 100644
--- a/kopete/protocols/irc/ircchannelcontact.cpp
+++ b/kopete/protocols/irc/ircchannelcontact.cpp
@@ -78,7 +78,7 @@ void IRCChannelContact::slotUpdateInfo()
/** This woudl be nice, but it generates server errors too often
if( !manager(Kopete::Contact::CannotCreate) && onlineStatus() == m_protocol->m_ChannelStatusOnline )
- kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").tqarg(m_nickName) );
+ kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").arg(m_nickName) );
else
setProperty( TQString::fromLatin1("channelMembers"), i18n("Members"), manager()->members().count() );
@@ -88,7 +88,7 @@ void IRCChannelContact::slotUpdateInfo()
if (manager(Kopete::Contact::CannotCreate))
{
setProperty(m_protocol->propChannelMembers, manager()->members().count());
- engine->writeMessage(TQString::fromLatin1("WHO %1").tqarg(m_nickName));
+ engine->writeMessage(TQString::fromLatin1("WHO %1").arg(m_nickName));
}
else
{
@@ -272,12 +272,12 @@ void IRCChannelContact::channelTopic(const TQString &topic)
if (mTopic.isEmpty()) {
Kopete::Message msg((Kopete::Contact*)this, mMyself,
- i18n("Topic for %1 is set empty.").tqarg(m_nickName),
+ i18n("Topic for %1 is set empty.").arg(m_nickName),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW);
appendMessage(msg);
} else {
Kopete::Message msg((Kopete::Contact*)this, mMyself,
- i18n("Topic for %1 is %2").tqarg(m_nickName).tqarg(mTopic),
+ i18n("Topic for %1 is %2").arg(m_nickName).arg(mTopic),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW);
appendMessage(msg);
}
@@ -362,7 +362,7 @@ void IRCChannelContact::userJoinedChannel(const TQString &nickname)
kdDebug() << k_funcinfo << "My view:" << manager(Kopete::Contact::CannotCreate)->view(false) << endl;
Kopete::Message msg((Kopete::Contact *)this, mMyself,
- i18n("You have joined channel %1").tqarg(m_nickName),
+ i18n("You have joined channel %1").arg(m_nickName),
Kopete::Message::Internal, Kopete::Message::PlainText,
CHAT_VIEW);
msg.setImportance( Kopete::Message::Low); //set the importance manualy to low
@@ -378,7 +378,7 @@ void IRCChannelContact::userJoinedChannel(const TQString &nickname)
contact->setOnlineStatus( m_protocol->m_UserStatusOnline );
manager()->addContact((Kopete::Contact *)contact, true);
Kopete::Message msg((Kopete::Contact *)this, mMyself,
- i18n("User <b>%1</b> joined channel %2").tqarg(nickname).tqarg(m_nickName),
+ i18n("User <b>%1</b> joined channel %2").arg(nickname).arg(m_nickName),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW);
msg.setImportance( Kopete::Message::Low); //set the importance manualy to low
manager()->appendMessage(msg);
@@ -413,9 +413,9 @@ void IRCChannelContact::userKicked(const TQString &nick, const TQString &nickKic
TQString r;
if ((reason != nick) && (reason != nickKicked)) {
- r = i18n( "%1 was kicked by %2. Reason: %3" ).tqarg(nickKicked, nick, reason);
+ r = i18n( "%1 was kicked by %2. Reason: %3" ).arg(nickKicked, nick, reason);
} else {
- r = i18n( "%1 was kicked by %2." ).tqarg(nickKicked, nick);
+ r = i18n( "%1 was kicked by %2." ).arg(nickKicked, nick);
}
manager()->removeContact( c, r );
@@ -434,9 +434,9 @@ void IRCChannelContact::userKicked(const TQString &nick, const TQString &nickKic
TQString r;
if ((reason != nick) && (reason != nickKicked)) {
- r = i18n( "You were kicked from %1 by %2. Reason: %3" ).tqarg(m_nickName, nickKicked, reason);
+ r = i18n( "You were kicked from %1 by %2. Reason: %3" ).arg(m_nickName, nickKicked, reason);
} else {
- r = i18n( "You were kicked from %1 by %2." ).tqarg(m_nickName, nickKicked);
+ r = i18n( "You were kicked from %1 by %2." ).arg(m_nickName, nickKicked);
}
KMessageBox::error(Kopete::UI::Global::mainWidget(), r, i18n("IRC Plugin"));
@@ -468,7 +468,7 @@ void IRCChannelContact::setTopic(const TQString &topic)
else
{
Kopete::Message msg(account->myServer(), manager()->members(),
- i18n("You must be a channel operator on %1 to do that.").tqarg(m_nickName),
+ i18n("You must be a channel operator on %1 to do that.").arg(m_nickName),
Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW);
manager()->appendMessage(msg);
}
@@ -483,7 +483,7 @@ void IRCChannelContact::topicChanged(const TQString &nick, const TQString &newto
setProperty( m_protocol->propChannelTopic, mTopic );
manager()->setDisplayName( caption() );
Kopete::Message msg(account->myServer(), mMyself,
- i18n("%1 has changed the topic to: %2").tqarg(nick).tqarg(newtopic),
+ i18n("%1 has changed the topic to: %2").arg(nick).arg(newtopic),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW);
msg.setImportance(Kopete::Message::Low); //set the importance manualy to low
appendMessage(msg);
@@ -494,7 +494,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time)
IRCAccount *account = ircAccount();
Kopete::Message msg(account->myServer(), mMyself,
- i18n("Topic set by %1 at %2").tqarg(nick).tqarg(
+ i18n("Topic set by %1 at %2").arg(nick).arg(
KGlobal::locale()->formatDateTime(time, true)
), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW);
msg.setImportance(Kopete::Message::Low); //set the importance manualy to low
@@ -503,7 +503,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time)
void IRCChannelContact::incomingModeChange( const TQString &nick, const TQString &mode )
{
- Kopete::Message msg(this, mMyself, i18n("%1 sets mode %2 on %3").tqarg(nick).tqarg(mode).tqarg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW);
+ Kopete::Message msg(this, mMyself, i18n("%1 sets mode %2 on %3").arg(nick).arg(mode).arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW);
msg.setImportance( Kopete::Message::Low); //set the importance manualy to low
appendMessage(msg);
@@ -564,7 +564,7 @@ void IRCChannelContact::failedChanBanned()
{
manager()->deleteLater();
KMessageBox::error( Kopete::UI::Global::mainWidget(),
- i18n("<qt>You can not join %1 because you have been banned.</qt>").tqarg(m_nickName),
+ i18n("<qt>You can not join %1 because you have been banned.</qt>").arg(m_nickName),
i18n("IRC Plugin") );
}
@@ -572,14 +572,14 @@ void IRCChannelContact::failedChanInvite()
{
manager()->deleteLater();
KMessageBox::error( Kopete::UI::Global::mainWidget(),
- i18n("<qt>You can not join %1 because it is set to invite only, and no one has invited you.</qt>").tqarg(m_nickName), i18n("IRC Plugin") );
+ i18n("<qt>You can not join %1 because it is set to invite only, and no one has invited you.</qt>").arg(m_nickName), i18n("IRC Plugin") );
}
void IRCChannelContact::failedChanFull()
{
manager()->deleteLater();
KMessageBox::error( Kopete::UI::Global::mainWidget(),
- i18n("<qt>You can not join %1 because it has reached its user limit.</qt>").tqarg(m_nickName),
+ i18n("<qt>You can not join %1 because it has reached its user limit.</qt>").arg(m_nickName),
i18n("IRC Plugin") );
}
@@ -587,7 +587,7 @@ void IRCChannelContact::failedChankey()
{
bool ok;
TQString diaPassword = KInputDialog::getText( i18n( "IRC Plugin" ),
- i18n( "Please enter key for channel %1: ").tqarg(m_nickName),
+ i18n( "Please enter key for channel %1: ").arg(m_nickName),
TQString(),
&ok );
@@ -717,9 +717,9 @@ void IRCChannelContact::slotHomepage()
const TQString IRCChannelContact::caption() const
{
- TQString cap = TQString::fromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost());
+ TQString cap = TQString::fromLatin1("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost());
if(!mTopic.isEmpty())
- cap.append( TQString::fromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) );
+ cap.append( TQString::fromLatin1(" - %1").arg(Kopete::Message::unescape(mTopic)) );
return cap;
}
diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp
index c8d59aef..c45b5303 100644
--- a/kopete/protocols/irc/irccontact.cpp
+++ b/kopete/protocols/irc/irccontact.cpp
@@ -186,7 +186,7 @@ void IRCContact::slotUserDisconnected(const TQString &user, const TQString &reas
Kopete::Contact *c = locateUser( nickname );
if ( c )
{
- m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").tqarg(reason), Kopete::Message::RichText);
+ m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").arg(reason), Kopete::Message::RichText);
c->setOnlineStatus(m_protocol->m_UserStatusOffline);
}
}
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index a4fdb655..a8b39299 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -90,7 +90,7 @@ void IRCProtocolHandler::handleURL( const KURL &url ) const
return;
KUser user( getuid() );
- TQString accountId = TQString::fromLatin1("%1@%2:%3").tqarg(
+ TQString accountId = TQString::fromLatin1("%1@%2:%3").arg(
user.loginName(),
url.host(),
TQString::number(port)
@@ -512,7 +512,7 @@ void IRCProtocol::slotTopicCommand( const TQString &args, Kopete::ChatSession *m
else
{
static_cast<IRCAccount*>(manager->account())->engine()->
- writeRawMessage(TQString::fromLatin1("TOPIC %1").tqarg(chan->nickName()));
+ writeRawMessage(TQString::fromLatin1("TOPIC %1").arg(chan->nickName()));
}
}
else
@@ -536,7 +536,7 @@ void IRCProtocol::slotJoinCommand( const TQString &arg, Kopete::ChatSession *man
{
static_cast<IRCAccount*>( manager->account() )->appendMessage(
i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.")
- .tqarg(args[0]), IRCAccount::ErrorReply );
+ .arg(args[0]), IRCAccount::ErrorReply );
}
}
@@ -556,7 +556,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession *
{
static_cast<IRCAccount*>( manager->account() )->appendMessage(
i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.")
- .tqarg(argsList[1]), IRCAccount::ErrorReply );
+ .arg(argsList[1]), IRCAccount::ErrorReply );
}
}
else
@@ -568,7 +568,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession *
if( c && c->manager()->contactOnlineStatus( manager->myself() ) == m_UserStatusOp )
{
static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage(
- TQString::fromLatin1("INVITE %1 %2").tqarg( argsList[0] ).
+ TQString::fromLatin1("INVITE %1 %2").arg( argsList[0] ).
arg( c->nickName() )
);
}
@@ -599,7 +599,7 @@ void IRCProtocol::slotQueryCommand( const TQString &args, Kopete::ChatSession *m
else
{
static_cast<IRCAccount*>( manager->account() )->appendMessage(
- i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").tqarg(user),
+ i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").arg(user),
IRCAccount::ErrorReply );
}
}
@@ -614,7 +614,7 @@ void IRCProtocol::slotWhoCommand( const TQString &args, Kopete::ChatSession *man
{
TQStringList argsList = Kopete::CommandHandler::parseArguments( args );
static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage(
- TQString::fromLatin1("WHO %1").tqarg( argsList.first() ) );
+ TQString::fromLatin1("WHO %1").arg( argsList.first() ) );
static_cast<IRCAccount*>( manager->account() )->setCurrentCommandSource( manager );
}
@@ -622,7 +622,7 @@ void IRCProtocol::slotWhoWasCommand( const TQString &args, Kopete::ChatSession *
{
TQStringList argsList = Kopete::CommandHandler::parseArguments( args );
static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage(
- TQString::fromLatin1("WHOWAS %1").tqarg( argsList.first() ) );
+ TQString::fromLatin1("WHOWAS %1").arg( argsList.first() ) );
static_cast<IRCAccount*>( manager->account() )->setCurrentCommandSource( manager );
}
@@ -691,7 +691,7 @@ void IRCProtocol::slotBanCommand( const TQString &args, Kopete::ChatSession *man
Kopete::ContactPtrList members = manager->members();
IRCChannelContact *chan = static_cast<IRCChannelContact*>( members.first() );
if( chan && chan->locateUser( argsList.front() ) )
- chan->setMode( TQString::fromLatin1("+b %1").tqarg( argsList.front() ) );
+ chan->setMode( TQString::fromLatin1("+b %1").arg( argsList.front() ) );
}
else
{
@@ -754,7 +754,7 @@ void IRCProtocol::simpleModeChange( const TQString &args, Kopete::ChatSession *m
for( TQStringList::iterator it = argsList.begin(); it != argsList.end(); ++it )
{
if( chan->locateUser( *it ) )
- chan->setMode( TQString::fromLatin1("%1 %2").tqarg( mode ).tqarg( *it ) );
+ chan->setMode( TQString::fromLatin1("%1 %2").arg( mode ).arg( *it ) );
}
}
}
@@ -918,7 +918,7 @@ void IRCProtocol::slotDeleteNetwork()
if( KMessageBox::warningContinueCancel(
Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the network <b>%1</b>?<br>"
"Any accounts which use this network will have to be modified.</qt>")
- .tqarg(network), i18n("Deleting Network"),
+ .arg(network), i18n("Deleting Network"),
KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue )
{
disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) );
@@ -944,7 +944,7 @@ void IRCProtocol::slotDeleteHost()
TQString hostName = netConf->host->text();
if ( KMessageBox::warningContinueCancel(
Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the host <b>%1</b>?</qt>")
- .tqarg(hostName), i18n("Deleting Host"),
+ .arg(hostName), i18n("Deleting Host"),
KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue )
{
IRCHost *host = m_hosts[ hostName ];
@@ -976,7 +976,7 @@ void IRCProtocol::slotNewNetwork()
{
int newIdx = 1;
do {
- netName = TQString::fromLatin1( "New Network #%1" ).tqarg( newIdx++ );
+ netName = TQString::fromLatin1( "New Network #%1" ).arg( newIdx++ );
}
while ( m_networks.find( netName ) && newIdx < 100 );
if ( newIdx == 100 ) // pathological case
diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp
index d0c70cfb..5be40dff 100644
--- a/kopete/protocols/irc/ircservercontact.cpp
+++ b/kopete/protocols/irc/ircservercontact.cpp
@@ -92,7 +92,7 @@ void IRCServerContact::updateStatus()
const TQString IRCServerContact::caption() const
{
- return i18n("%1 @ %2").tqarg(ircAccount()->mySelf()->nickName() ).tqarg(
+ return i18n("%1 @ %2").arg(ircAccount()->mySelf()->nickName() ).arg(
kircEngine()->currentHost().isEmpty() ? ircAccount()->networkName() : kircEngine()->currentHost()
);
}
@@ -147,7 +147,7 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString
// Prefix missing.
// NOTICE AUTH :*** Checking Ident
- ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg(kircEngine()->currentHost(), notice),
+ ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg(kircEngine()->currentHost(), notice),
IRCAccount::NoticeReply);
} else {
@@ -155,13 +155,13 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString
// :[email protected] NOTICE foobar :hello
if (orig.contains('!')) {
- ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").tqarg(
+ ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").arg(
orig.section('!', 0, 0),
orig.section('!', 1, 1),
notice),
IRCAccount::NoticeReply);
} else {
- ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg(
+ ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg(
orig, notice), IRCAccount::NoticeReply);
}
}
@@ -184,7 +184,7 @@ void IRCServerContact::slotIncomingMotd(const TQString &message)
void IRCServerContact::slotCannotSendToChannel(const TQString &channel, const TQString &message)
{
- ircAccount()->appendMessage(TQString::fromLatin1("%1: %2").tqarg(channel).tqarg(message), IRCAccount::ErrorReply);
+ ircAccount()->appendMessage(TQString::fromLatin1("%1: %2").arg(channel).arg(message), IRCAccount::ErrorReply);
}
void IRCServerContact::appendMessage(Kopete::Message &msg)
diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp
index f4b5af10..e579e94a 100644
--- a/kopete/protocols/irc/irctransferhandler.cpp
+++ b/kopete/protocols/irc/irctransferhandler.cpp
@@ -164,7 +164,7 @@ void IRCTransferHandler::kioresult(KIO::Job *job)
// if (t->)
// kt->userAbort(i18n("User canceled transfer."));
// else
-// kt->userAbort(i18n("User canceled transfer for file:%1").tqarg(t->fileName()));
+// kt->userAbort(i18n("User canceled transfer for file:%1").arg(t->fileName()));
break;
default:
kdDebug(14120) << k_funcinfo << "Transfer halted:" << kt->error() << endl;
diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp
index b03d465f..c4607cb9 100644
--- a/kopete/protocols/irc/ircusercontact.cpp
+++ b/kopete/protocols/irc/ircusercontact.cpp
@@ -165,7 +165,7 @@ void IRCUserContact::slotUserOffline()
updateStatus();
if( !metaContact()->isTemporary() )
- kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").tqarg(m_nickName) );
+ kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").arg(m_nickName) );
removeProperty( m_protocol->propUserInfo );
removeProperty( m_protocol->propServer );
@@ -185,7 +185,7 @@ void IRCUserContact::incomingUserIsAway(const TQString &reason)
if( manager( Kopete::Contact::CannotCreate ) )
{
Kopete::Message msg( (Kopete::Contact*)ircAccount()->myServer(), mMyself,
- i18n("%1 is away (%2)").tqarg( m_nickName ).tqarg( reason ),
+ i18n("%1 is away (%2)").arg( m_nickName ).arg( reason ),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW );
manager(Kopete::Contact::CanCreate)->appendMessage(msg);
}
@@ -216,7 +216,7 @@ void IRCUserContact::slotUserInfo()
const TQString IRCUserContact::caption() const
{
- return i18n("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost());
+ return i18n("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost());
}
void IRCUserContact::slotOp()
@@ -260,7 +260,7 @@ void IRCUserContact::slotBanHostOnce()
Kopete::ContactPtrList members = mActiveManager->members();
TQString channelName = static_cast<IRCContact*>(members.first())->nickName();
- kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").tqarg(mInfo.hostName));
+ kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").arg(mInfo.hostName));
}
void IRCUserContact::slotBanUserHost()
@@ -284,7 +284,7 @@ void IRCUserContact::slotBanUserHostOnce()
Kopete::ContactPtrList members = mActiveManager->members();
TQString channelName = static_cast<IRCContact*>(members.first())->nickName();
- kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").tqarg(mInfo.userName, mInfo.hostName));
+ kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").arg(mInfo.userName, mInfo.hostName));
}
void IRCUserContact::slotBanDomain()
@@ -310,7 +310,7 @@ void IRCUserContact::slotBanDomainOnce()
TQString domain = mInfo.hostName.section('.', 1);
- kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").tqarg(domain));
+ kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").arg(domain));
}
void IRCUserContact::slotBanUserDomain()
@@ -336,7 +336,7 @@ void IRCUserContact::slotBanUserDomainOnce()
TQString domain = mInfo.hostName.section('.', 1);
- kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").tqarg(mInfo.userName, domain));
+ kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").arg(mInfo.userName, domain));
}
void IRCUserContact::slotKick()
@@ -350,7 +350,7 @@ void IRCUserContact::contactMode(const TQString &mode)
{
Kopete::ContactPtrList members = mActiveManager->members();
TQString channelName = static_cast<IRCContact*>(members.first())->nickName();
- kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").tqarg(mode).tqarg(m_nickName));
+ kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").arg(mode).arg(m_nickName));
}
void IRCUserContact::slotCtcpPing()
@@ -373,7 +373,7 @@ void IRCUserContact::newWhoIsUser(const TQString &username, const TQString &host
if( onlineStatus().status() == Kopete::OnlineStatus::Offline )
{
setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2")
- .tqarg(mInfo.userName).tqarg(mInfo.hostName) );
+ .arg(mInfo.userName).arg(mInfo.hostName) );
setProperty( m_protocol->propServer, mInfo.serverName );
setProperty( m_protocol->propFullName, mInfo.realName );
}
@@ -433,26 +433,26 @@ void IRCUserContact::whoIsComplete()
{
//User info
TQString msg = i18n("%1 is (%2@%3): %4<br/>")
- .tqarg(m_nickName)
- .tqarg(mInfo.userName)
- .tqarg(mInfo.hostName)
- .tqarg(mInfo.realName);
+ .arg(m_nickName)
+ .arg(mInfo.userName)
+ .arg(mInfo.hostName)
+ .arg(mInfo.realName);
if( mInfo.isIdentified )
- msg += i18n("%1 is authenticated with NICKSERV<br/>").tqarg(m_nickName);
+ msg += i18n("%1 is authenticated with NICKSERV<br/>").arg(m_nickName);
if( mInfo.isOperator )
- msg += i18n("%1 is an IRC operator<br/>").tqarg(m_nickName);
+ msg += i18n("%1 is an IRC operator<br/>").arg(m_nickName);
//Channels
- msg += i18n("on channels %1<br/>").tqarg(mInfo.channels.join(" ; "));
+ msg += i18n("on channels %1<br/>").arg(mInfo.channels.join(" ; "));
//Server
- msg += i18n("on IRC via server %1 ( %2 )<br/>").tqarg(mInfo.serverName).tqarg(mInfo.serverInfo);
+ msg += i18n("on IRC via server %1 ( %2 )<br/>").arg(mInfo.serverName).arg(mInfo.serverInfo);
//Idle
TQString idleTime = formattedIdleTime();
- msg += i18n("idle: %2<br/>").tqarg( idleTime.isEmpty() ? TQString::number(0) : idleTime );
+ msg += i18n("idle: %2<br/>").arg( idleTime.isEmpty() ? TQString::number(0) : idleTime );
//End
ircAccount()->appendMessage(msg, IRCAccount::InfoReply );
@@ -466,12 +466,12 @@ void IRCUserContact::whoWasComplete()
{
//User info
TQString msg = i18n("%1 was (%2@%3): %4\n")
- .tqarg(m_nickName)
- .tqarg(mInfo.userName)
- .tqarg(mInfo.hostName)
- .tqarg(mInfo.realName);
+ .arg(m_nickName)
+ .arg(mInfo.userName)
+ .arg(mInfo.hostName)
+ .arg(mInfo.realName);
- msg += i18n("Last Online: %1\n").tqarg(
+ msg += i18n("Last Online: %1\n").arg(
KGlobal::locale()->formatDateTime(
property( m_protocol->propLastSeen ).value().toDateTime()
)
@@ -490,7 +490,7 @@ TQString IRCUserContact::formattedName() const
void IRCUserContact::updateInfo()
{
setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2")
- .tqarg(mInfo.userName).tqarg(mInfo.hostName) );
+ .arg(mInfo.userName).arg(mInfo.hostName) );
setProperty( m_protocol->propServer, mInfo.serverName );
setProperty( m_protocol->propChannels, mInfo.channels.join(" ") );
setProperty( m_protocol->propHops, TQString::number(mInfo.hops) );
diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp
index 25421d4d..514421ff 100644
--- a/kopete/protocols/irc/ksparser.cpp
+++ b/kopete/protocols/irc/ksparser.cpp
@@ -152,7 +152,7 @@ TQCString KSParser::_parse(const TQCString &message)
break;
default:
if (cur < TQChar(' ')) // search for control characters
- toAppend = TQString::fromLatin1("&lt;%1&gt;").tqarg(cur, 2, 16).upper();
+ toAppend = TQString::fromLatin1("&lt;%1&gt;").arg(cur, 2, 16).upper();
else
toAppend = TQStyleSheet::escape(cur);
}
@@ -193,12 +193,12 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor)
TQString tagStyle;
if (fgColor.isValid())
- tagStyle += TQString::fromLatin1("color:%1;").tqarg(fgColor.name());
+ tagStyle += TQString::fromLatin1("color:%1;").arg(fgColor.name());
if (bgColor.isValid())
- tagStyle += TQString::fromLatin1("background-color:%1;").tqarg(bgColor.name());
+ tagStyle += TQString::fromLatin1("background-color:%1;").arg(bgColor.name());
if(!tagStyle.isEmpty())
- tagStyle = TQString::fromLatin1("style=\"%1\"").tqarg(tagStyle);
+ tagStyle = TQString::fromLatin1("style=\"%1\"").arg(tagStyle);
return pushTag(TQString::fromLatin1("span"), tagStyle);;
}
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 0e1b3bc1..0fddaab7 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -54,7 +54,7 @@ using namespace KIRC;
const TQRegExp Engine::m_RemoveLinefeeds( TQString::fromLatin1("[\\r\\n]*$") );
Engine::Engine(TQObject *parent, const char *name)
- : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()),
+ : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").arg(name).latin1()),
m_status(Idle),
m_FailedNickOnLogin(false),
m_useSSL(false),
@@ -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)").tqarg(errors.size()));
+ TQString::fromLatin1("%1 internal error(s)").arg(errors.size()));
}
else
{
diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp
index c9d71cd2..8a48ce52 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessage.cpp
@@ -106,7 +106,7 @@ void Message::writeRawMessage(Engine *engine, const TQTextCodec *codec, const TQ
// 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").tqarg(wrote).tqarg(str) << endl;
+ kdDebug(14121) << TQString::fromLatin1("(%1 bytes) >> %2").arg(wrote).arg(str) << endl;
}
void Message::writeMessage(Engine *engine, const TQTextCodec *codec, const TQString &message)
@@ -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.tqat(length-2) = '\0';
+ raw.at(length-2) = '\0';
}
if (length > 2 && raw.at(length-3) == '\r') {
- raw.tqat(length-3) = '\0';
+ raw.at(length-3) = '\0';
}
kdDebug(14121) << "<< " << raw << endl;
diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
index 7ff74ecc..2e1d0b4c 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.tqarg(0) == m_Nickname ||
- msg.tqarg(0) == m_PendingNick ||
- msg.tqarg(0) == TQString::fromLatin1("*")
+ msg.arg(0) == m_Nickname ||
+ msg.arg(0) == m_PendingNick ||
+ msg.arg(0) == TQString::fromLatin1("*")
)
)
)
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 2bf3910a..6d6c2ba2 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.tqarg(ourHost),
+ msg.arg(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.tqarg(ourHost),
+ msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
i18n("Co&ntinue") );
diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui
index bed61568..3c417075 100644
--- a/kopete/protocols/irc/ui/ircadd.ui
+++ b/kopete/protocols/irc/ui/ircadd.ui
@@ -88,7 +88,7 @@
<property name="text">
<string>&lt;i&gt;(for example: joe_bob or #somechannel)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui
index 34ef83b7..f04c8e09 100644
--- a/kopete/protocols/irc/ui/irceditaccount.ui
+++ b/kopete/protocols/irc/ui/irceditaccount.ui
@@ -91,7 +91,7 @@
<property name="text">
<string>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; Most IRC servers do not require a password, and only a nickname is required to connect&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 9012a924..c0d5a87a 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -212,9 +212,9 @@ TQString IRCEditAccountWidget::generateAccountId( const TQString &network )
TQString nextId = network;
uint accountNumber = 1;
- while( config->hasGroup( TQString("Account_%1_%2").tqarg( m_protocol->pluginId() ).tqarg( nextId ) ) )
+ while( config->hasGroup( TQString("Account_%1_%2").arg( m_protocol->pluginId() ).arg( nextId ) ) )
{
- nextId = TQString::fromLatin1("%1_%2").tqarg( network ).tqarg( ++accountNumber );
+ nextId = TQString::fromLatin1("%1_%2").arg( network ).arg( ++accountNumber );
}
kdDebug( 14120 ) << k_funcinfo << " ID IS: " << nextId << endl;
return nextId;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-12 11:33:52 +0000