From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- kopete/libkopete/private/kopetecommand.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'kopete/libkopete/private/kopetecommand.cpp') diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index 1f8969f6..f9ae7365 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -29,7 +29,7 @@ Kopete::Command::Command( TQObject *parent, const TQString &command, const char* const TQString &help, Kopete::CommandHandler::CommandType type, const TQString &formatString, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) : KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, parent, - ( command.lower() + TQString::fromLatin1("_command") ).latin1() ) + ( command.lower() + TQString::tqfromLatin1("_command") ).latin1() ) { init( command, handlerSlot, help, type, formatString, minArgs, maxArgs ); } @@ -61,7 +61,7 @@ void Kopete::Command::slotAction() TQString args; if( m_minArgs > 0 ) { - args = KInputDialog::getText( i18n("Enter Arguments"), i18n("Enter the arguments to %1:").arg(m_command) ); + args = KInputDialog::getText( i18n("Enter Arguments"), i18n("Enter the arguments to %1:").tqarg(m_command) ); if( args.isNull() ) return; } @@ -74,23 +74,23 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession TQStringList mArgs = Kopete::CommandHandler::parseArguments( args ); if( m_processing ) { - printError( i18n("Alias \"%1\" expands to itself.").arg( text() ), manager, gui ); + printError( i18n("Alias \"%1\" expands to itself.").tqarg( text() ), manager, gui ); } else if( mArgs.count() < m_minArgs ) { printError( i18n("\"%1\" requires at least %n argument.", "\"%1\" requires at least %n arguments.", m_minArgs) - .arg( text() ), manager, gui ); + .tqarg( text() ), manager, gui ); } else if( m_maxArgs > -1 && (int)mArgs.count() > m_maxArgs ) { printError( i18n("\"%1\" has a maximum of %n argument.", "\"%1\" has a maximum of %n arguments.", m_minArgs) - .arg( text() ), manager, gui ); + .tqarg( text() ), manager, gui ); } else if( !KApplication::kApplication()->authorizeKAction( name() ) ) { - printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui ); + printError( i18n("You are not authorized to perform the command \"%1\".").tqarg(text()), manager, gui ); } else { @@ -102,20 +102,20 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession // Translate %s to the whole string and %n to current nickname - formatString.replace( TQString::fromLatin1("%n"), manager->myself()->nickName() ); - formatString.replace( TQString::fromLatin1("%s"), args ); + formatString.replace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); + formatString.replace( TQString::tqfromLatin1("%s"), args ); // Translate %1..%N to word1..wordN while( mArgs.count() > 0 ) { - formatString = formatString.arg( mArgs.front() ); + formatString = formatString.tqarg( mArgs.front() ); mArgs.pop_front(); } kdDebug(14010) << "New Command after processing alias: " << formatString << endl; - Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/") + formatString, manager ); + Kopete::CommandHandler::commandHandler()->processMessage( TQString::tqfromLatin1("/") + formatString, manager ); } else { -- cgit v1.2.1