From e7bee19a9f42cffe3a0792348a60e5bee1d3da71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:58:08 -0600 Subject: Remove additional unneeded tq method conversions (cherry picked from commit 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98) --- kopete/protocols/irc/ircprotocol.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kopete/protocols/irc/ircprotocol.cpp') 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(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( 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( 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( 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( 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( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("WHO %1").tqarg( argsList.first() ) ); + TQString::fromLatin1("WHO %1").arg( argsList.first() ) ); static_cast( manager->account() )->setCurrentCommandSource( manager ); } @@ -622,7 +622,7 @@ void IRCProtocol::slotWhoWasCommand( const TQString &args, Kopete::ChatSession * { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("WHOWAS %1").tqarg( argsList.first() ) ); + TQString::fromLatin1("WHOWAS %1").arg( argsList.first() ) ); static_cast( 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( 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("Are you sure you want to delete the network %1?
" "Any accounts which use this network will have to be modified.") - .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("Are you sure you want to delete the host %1?") - .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 -- cgit v1.2.1