From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kresources/egroupware/debugdialog.cpp | 6 +++--- kresources/egroupware/kabc_resourcexmlrpc.cpp | 8 ++++---- kresources/egroupware/kabc_resourcexmlrpcconfig.cpp | 2 +- kresources/egroupware/kcal_resourcexmlrpc.cpp | 4 ++-- kresources/egroupware/kcal_resourcexmlrpcconfig.cpp | 2 +- kresources/egroupware/knotes_resourcexmlrpc.cpp | 4 ++-- kresources/egroupware/knotes_resourcexmlrpcconfig.cpp | 2 +- kresources/egroupware/todostatemapper.cpp | 2 +- kresources/egroupware/xmlrpciface.cpp | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kresources/egroupware') diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp index 0b2764c64..975cae8c7 100644 --- a/kresources/egroupware/debugdialog.cpp +++ b/kresources/egroupware/debugdialog.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -38,10 +38,10 @@ DebugDialog::DebugDialog() User1 | User2 | Ok, Ok, true ) { TQWidget *page = plainPage(); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() ); mView = new KTextBrowser( page ); - tqlayout->addWidget( mView ); + layout->addWidget( mView ); setButtonText( User1, "Save As..." ); setButtonText( User2, "Clear" ); diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp index 1247975f7..222c4f4f2 100644 --- a/kresources/egroupware/kabc_resourcexmlrpc.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp @@ -393,7 +393,7 @@ void ResourceXMLRPC::deleteContactFinished( const TQValueList&, void ResourceXMLRPC::fault( int error, const TQString &errorMsg, const TQVariant& ) { - TQString msg = i18n( "Server sent error %1: %2" ).tqarg( error ).tqarg( errorMsg ); + TQString msg = i18n( "Server sent error %1: %2" ).arg( error ).arg( errorMsg ); if ( addressBook() ) addressBook()->error( msg ); @@ -408,7 +408,7 @@ void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg, mAddrMap.remove( addr.uid() ); TQString msg = i18n( "Unable to add contact %1 to server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg, @@ -417,7 +417,7 @@ void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg, KABC::Addressee addr = mAddrMap[ id.toString() ]; TQString msg = i18n( "Unable to update contact %1 on server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg, @@ -437,7 +437,7 @@ void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg, mAddrMap.insert( addr.uid(), addr ); TQString msg = i18n( "Unable to delete contact %1 from server. (%2)" ); - addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) ); + addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) ); } TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask ) diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp index ddafbd1f2..56caa2ea1 100644 --- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp index f47df2718..8841da75e 100644 --- a/kresources/egroupware/kcal_resourcexmlrpc.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp @@ -239,8 +239,8 @@ bool ResourceXMLRPC::doLoad() mTodoStateMapper.load(); TQMap args, columns; - args.insert( "start", TQDateTime( TQDate::tqcurrentDate().addDays( -12 ) ) ); - args.insert( "end", TQDateTime( TQDate::tqcurrentDate().addDays( 2000 ) ) ); + args.insert( "start", TQDateTime( TQDate::currentDate().addDays( -12 ) ) ); + args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) ); mServer->call( SearchEventsCommand, args, this, TQT_SLOT( listEventsFinished( const TQValueList&, const TQVariant& ) ), diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp index 213da26e3..846c648fe 100644 --- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp index 8b50c3b8e..c9a9a1bfd 100644 --- a/kresources/egroupware/knotes_resourcexmlrpc.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp @@ -50,7 +50,7 @@ static const TQString DeleteNoteCommand = "infolog.boinfolog.delete"; static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories"; ResourceXMLRPC::ResourceXMLRPC( const KConfig* config ) - : ResourceNotes( config ), mCalendar( TQString::tqfromLatin1("UTC") ), + : ResourceNotes( config ), mCalendar( TQString::fromLatin1("UTC") ), mServer( 0 ) { init(); @@ -65,7 +65,7 @@ ResourceXMLRPC::ResourceXMLRPC( const KConfig* config ) } ResourceXMLRPC::ResourceXMLRPC( ) - : ResourceNotes( 0 ), mCalendar( TQString::tqfromLatin1("UTC") ), + : ResourceNotes( 0 ), mCalendar( TQString::fromLatin1("UTC") ), mServer( 0 ) { init(); diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp index 8cf2a35c8..e240bab8a 100644 --- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp +++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp index 81c517d0c..531b298f5 100644 --- a/kresources/egroupware/todostatemapper.cpp +++ b/kresources/egroupware/todostatemapper.cpp @@ -153,7 +153,7 @@ TQString TodoStateMapper::toRemote( int localState ) else if ( localState == 100 ) return "done"; else - return TQString( "%1%" ).tqarg( localState ); + return TQString( "%1%" ).arg( localState ); } TQString TodoStateMapper::filename() diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp index 09176ae6b..fd12d174d 100644 --- a/kresources/egroupware/xmlrpciface.cpp +++ b/kresources/egroupware/xmlrpciface.cpp @@ -113,7 +113,7 @@ void Query::slotResult( KIO::Job *job ) if ( !doc.setContent( data, false, &errMsg, &errLine, &errCol ) ) { emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" ) - .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id ); + .arg( errMsg ).arg( errLine ).arg( errCol ), m_id ); emit finished( this ); return ; } -- cgit v1.2.1