From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- korn/korncfgimpl.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'korn/korncfgimpl.cpp') diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index 33af34065..0616e6fee 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -91,10 +91,10 @@ void KornCfgImpl::slotDialogDestroyed() void KornCfgImpl::slotElementsSwapped( int box1, int box2 ) { int accountnumber1 = 0, accountnumber2 = 0; - while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box1 ).arg( accountnumber1 ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box1 ).tqarg( accountnumber1 ) ) ) ++accountnumber1; - while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box2 ).arg( accountnumber2 ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box2 ).tqarg( accountnumber2 ) ) ) ++accountnumber2; KOrnPassword::swapKOrnWalletPasswords( box1, accountnumber1, box2, accountnumber2 ); @@ -103,7 +103,7 @@ void KornCfgImpl::slotElementsSwapped( int box1, int box2 ) void KornCfgImpl::slotElementDeleted( int box ) { int accountnumber = 0; - while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( accountnumber ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box ).tqarg( accountnumber ) ) ) { KOrnPassword::deleteKOrnPassword( box, accountnumber ); ++accountnumber; @@ -161,7 +161,7 @@ void KornCfgImpl::slotSetDefaults( const TQString& name, const int index, KConfi config->writeEntry( "passivedate", false ); config->writeEntry( "numaccounts", 1 ); config->writeEntry( "dcop", TQStringList() ); - config->setGroup( TQString( "korn-%1-0" ).arg( index ) ); + config->setGroup( TQString( "korn-%1-0" ).tqarg( index ) ); config->writeEntry( "name", name ); config->writeEntry( "protocol", "mbox" ); config->writeEntry( "server", TQString() ); @@ -198,10 +198,10 @@ void KornCfgImpl::readConfig() { _config->setGroup( "korn" ); - TQChar layout = _config->readEntry( "layout" ).stripWhiteSpace()[0].upper(); - if( layout == TQChar( 'H' ) ) + TQChar tqlayout = _config->readEntry( "tqlayout" ).stripWhiteSpace()[0].upper(); + if( tqlayout == TQChar( 'H' ) ) rbHorizontal->setChecked( true ); - else if( layout == TQChar( 'V' ) ) + else if( tqlayout == TQChar( 'V' ) ) rbVertical->setChecked( true ); else rbDocked->setChecked( true ); @@ -214,11 +214,11 @@ void KornCfgImpl::writeConfig() _config->setGroup( "korn" ); if( rbHorizontal->isChecked() ) - _config->writeEntry( "layout", "Horizontal" ); + _config->writeEntry( "tqlayout", "Horizontal" ); if( rbVertical->isChecked() ) - _config->writeEntry( "layout", "Vertical" ); + _config->writeEntry( "tqlayout", "Vertical" ); if( rbDocked->isChecked() ) - _config->writeEntry( "layout", "Docked" ); + _config->writeEntry( "tqlayout", "Docked" ); //Default is 'false' here, because if no option is set, KWallet isn't used. if( _config->readBoolEntry( "usewallet", false ) != chUseWallet->isChecked() ) @@ -236,12 +236,12 @@ void KornCfgImpl::rewritePasswords() int account = 0 - 1; KConfigGroup *group; - while( _config->hasGroup( TQString( "korn-%1" ).arg( ++box ) ) ) + while( _config->hasGroup( TQString( "korn-%1" ).tqarg( ++box ) ) ) { account = 0 - 1; - while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( ++account ) ) ) + while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box ).tqarg( ++account ) ) ) { - group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).arg( box ).arg( account ) ); + group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).tqarg( box ).tqarg( account ) ); KOrnPassword::rewritePassword( box, account, *group, chUseWallet->isChecked() ); delete group; } -- cgit v1.2.1