summaryrefslogtreecommitdiffstats
path: root/korn
diff options
context:
space:
mode:
Diffstat (limited to 'korn')
-rw-r--r--korn/accountmanager.cpp12
-rw-r--r--korn/boxcontainer.cpp4
-rw-r--r--korn/boxcontaineritem.cpp8
-rw-r--r--korn/dcopdrop.cpp2
-rw-r--r--korn/dockeditem.cpp2
-rw-r--r--korn/hvitem.cpp2
-rw-r--r--korn/imap_proto.cpp4
-rw-r--r--korn/kconf_update/korn-3-4-config_change.cpp4
-rw-r--r--korn/keditlistboxman.cpp64
-rw-r--r--korn/kio.cpp4
-rw-r--r--korn/kio_count.cpp8
-rw-r--r--korn/kio_delete.cpp2
-rw-r--r--korn/kio_read.cpp2
-rw-r--r--korn/kio_single_subject.cpp2
-rw-r--r--korn/kio_subjects.cpp4
-rw-r--r--korn/kmail_proto.cpp12
-rw-r--r--korn/kornboxcfg.ui12
-rw-r--r--korn/kornboxcfgimpl.cpp10
-rw-r--r--korn/korncfgimpl.cpp14
-rw-r--r--korn/password.cpp8
-rw-r--r--korn/polldrop.cpp2
-rw-r--r--korn/pop3_proto.cpp2
-rw-r--r--korn/subjectsdlg.cpp4
23 files changed, 94 insertions, 94 deletions
diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index ddadf7c2..a791c53d 100644
--- a/korn/accountmanager.cpp
+++ b/korn/accountmanager.cpp
@@ -53,14 +53,14 @@ AccountManager::~AccountManager()
void AccountManager::readConfig( KConfig* config, const int index )
{
- KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).tqarg( index ) );
+ KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).arg( index ) );
TQStringList dcop = masterGroup->readListEntry( "dcop", ',' );
KConfigGroup *accountGroup;
int counter = 0;
- while( config->hasGroup( TQString( "korn-%1-%2" ).tqarg( index ).tqarg( counter ) ) )
+ while( config->hasGroup( TQString( "korn-%1-%2" ).arg( index ).arg( counter ) ) )
{
- accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).tqarg( index ).tqarg( counter ) );
+ accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).arg( index ).arg( counter ) );
const Protocol *proto = Protocols::getProto( accountGroup->readEntry( "protocol" ) );
if( !proto )
@@ -144,7 +144,7 @@ void AccountManager::writeConfig( KConfig* config, const int index )
TQMap< KMailDrop*, Dropinfo* >::Iterator it;
for( it = _dropInfo->begin(); it != _dropInfo->end(); ++it )
{
- config->setGroup( TQString( "korn-%1-%2" ).tqarg( index ).tqarg( it.data()->index ) );
+ config->setGroup( TQString( "korn-%1-%2" ).arg( index ).arg( it.data()->index ) );
config->writeEntry( "reset", it.data()->reset );
}
}
@@ -155,9 +155,9 @@ TQString AccountManager::getTooltip() const
TQMap< KMailDrop*, Dropinfo* >::Iterator it;
for( it = _dropInfo->begin(); it != _dropInfo->end(); ++it )
if( it.key()->valid() )
- result.append( TQString( "%1: %2" ).tqarg( it.key()->realName() ).tqarg( it.data()->msgnr - it.data()->reset ));
+ result.append( TQString( "%1: %2" ).arg( it.key()->realName() ).arg( it.data()->msgnr - it.data()->reset ));
else
- result.append( TQString( "%1: invalid" ).tqarg( it.key()->realName() ) );
+ result.append( TQString( "%1: invalid" ).arg( it.key()->realName() ) );
result.sort();
return result.join( TQChar( '\n' ) );
}
diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp
index 72719812..934a47c5 100644
--- a/korn/boxcontainer.cpp
+++ b/korn/boxcontainer.cpp
@@ -39,9 +39,9 @@ BoxContainer::~BoxContainer()
void BoxContainer::readConfig( KConfig* config )
{
int counter = 0;
- while( config->hasGroup( TQString( "korn-%1" ).tqarg( counter ) ) )
+ while( config->hasGroup( TQString( "korn-%1" ).arg( counter ) ) )
{
- config->setGroup( TQString( "korn-%1" ).tqarg( counter ) );
+ config->setGroup( TQString( "korn-%1" ).arg( counter ) );
BoxContainerItem *item = newBoxInstance();
item->readConfig( config, counter );
addItem( item );
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 8c998953..7a0c4637 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -81,7 +81,7 @@ BoxContainerItem::~BoxContainerItem()
void BoxContainerItem::readConfig( KConfig* config, const int index )
{
//Read information about how the thing have to look like
- config->setGroup( TQString( "korn-%1" ).tqarg( index ) );
+ config->setGroup( TQString( "korn-%1" ).arg( index ) );
if( config->readBoolEntry( "hasnormalicon", false ) )
_icons[ 0 ] = new TQString( config->readEntry( "normalicon", "" ) );
else
@@ -216,8 +216,8 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
{
KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" );
- TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).tqarg( TQString(objId()) ).tqarg( accountName )
- .tqarg( total ), "", TQPixmap(), 0 );
+ TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName )
+ .arg( total ), "", TQPixmap(), 0 );
TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" );
TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" );
@@ -339,7 +339,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
//Make a transparent number; first make a white number on a black background.
//This pixmap also is the base alpha-channel, the foreground colour is added later.
numberPixmap.fill( TQt::black );
- p.tqbegin( &numberPixmap, false );
+ p.begin( &numberPixmap, false );
p.setPen( TQt::white );
if( font )
p.setFont( *font );
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 9fa7caa8..407a6ff0 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -159,7 +159,7 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message )
++_counter;
mailsubject->setSubject( subject );
- mailsubject->setSender( TQString( "DCOP: %1" ).tqarg( *_name ) );
+ mailsubject->setSender( TQString( "DCOP: %1" ).arg( *_name ) );
mailsubject->setHeader( message, true );
mailsubject->setSize( message.length() );
mailsubject->setDate( TQDateTime::currentDateTime().toTime_t() );
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 5ff6fb8a..9d30717f 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -81,7 +81,7 @@ void DockedItem::slotShowPassivePopup( TQPtrList< KornMailSubject >* list, int t
void DockedItem::slotShowPassivePopup( const TQString& message, const TQString& name )
{
- KPassivePopup::message( i18n( "Korn - %1/%2" ).tqarg( TQString(objId()) ).tqarg( name ), message, _systemtray, "Passive error message" );
+ KPassivePopup::message( i18n( "Korn - %1/%2" ).arg( TQString(objId()) ).arg( name ), message, _systemtray, "Passive error message" );
}
void DockedItem::doPopup()
diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp
index bf621445..d2453b64 100644
--- a/korn/hvitem.cpp
+++ b/korn/hvitem.cpp
@@ -71,7 +71,7 @@ void HVItem::slotShowPassivePopup( TQPtrList< KornMailSubject >* list, int total
void HVItem::slotShowPassivePopup( const TQString& errorMessage, const TQString& name )
{
- KPassivePopup::message( TQString( "korn-%1-%2" ).tqarg( TQString(objId()) ).tqarg( name ), errorMessage, _label, "Passive error message" );
+ KPassivePopup::message( TQString( "korn-%1-%2" ).arg( TQString(objId()) ).arg( name ), errorMessage, _label, "Passive error message" );
}
void HVItem::doPopup()
diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp
index 304fed5e..caedb459 100644
--- a/korn/imap_proto.cpp
+++ b/korn/imap_proto.cpp
@@ -68,9 +68,9 @@ void Imap_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQStri
if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" )
map->insert( "encryption", "ssl" );
if( metadata->contains( "tls" ) )
- map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) );
+ map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) );
if( metadata->contains( "auth" ) )
- map->insert( "auth", TQString( "auth=%1" ).tqarg( *metadata->find( "auth" ) ) );
+ map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) );
}
void Imap_Protocol::writeEntries( TQMap< TQString, TQString >* map ) const
diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/kconf_update/korn-3-4-config_change.cpp
index 7ff7a922..7eff3ad3 100644
--- a/korn/kconf_update/korn-3-4-config_change.cpp
+++ b/korn/kconf_update/korn-3-4-config_change.cpp
@@ -175,8 +175,8 @@ int main( int, char** )
{
if( numboxes > -1 && interesting_group.cap( 1 ).toInt() < numboxes )
{
- currentGroup1 = TQString( "[korn-%1]" ).tqarg( interesting_group.cap( 1 ) );
- currentGroup2 = TQString( "[korn-%1-0]" ).tqarg( interesting_group.cap( 1 ) );
+ currentGroup1 = TQString( "[korn-%1]" ).arg( interesting_group.cap( 1 ) );
+ currentGroup2 = TQString( "[korn-%1-0]" ).arg( interesting_group.cap( 1 ) );
}
tobe_deleted.append( line );
continue;
diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp
index d5ae323a..d3dce86e 100644
--- a/korn/keditlistboxman.cpp
+++ b/korn/keditlistboxman.cpp
@@ -109,9 +109,9 @@ void KEditListBoxManager::readNames()
int number = 0;
this->clear();
- while( _config->hasGroup( _groupName->tqarg( number ) ) )
+ while( _config->hasGroup( _groupName->arg( number ) ) )
{
- _config->setGroup( _groupName->tqarg( number ) );
+ _config->setGroup( _groupName->arg( number ) );
this->insertItem( _config->readEntry( "name", TQString() ) );
++number;
}
@@ -138,7 +138,7 @@ void KEditListBoxManager::slotChanged()
//First check if the item was moved up
- _config->setGroup( _groupName->tqarg( this->currentItem() ) );
+ _config->setGroup( _groupName->arg( this->currentItem() ) );
if( this->currentItem() > 0 && this->text( this->currentItem() - 1 ) == _config->readEntry( "name", TQString() ) )
changeItem( this->currentItem() - 1, this->currentItem() ); //moved down
@@ -158,10 +158,10 @@ void KEditListBoxManager::slotAdded( const TQString& name )
return;
int number = 0;
- while( _config->hasGroup( _groupName->tqarg( number ) ) )
+ while( _config->hasGroup( _groupName->arg( number ) ) )
++number;
- _config->setGroup( _groupName->tqarg( number ) );
+ _config->setGroup( _groupName->arg( number ) );
_config->writeEntry( "name", name );
emit setDefaults( name, number, _config );
@@ -180,12 +180,12 @@ void KEditListBoxManager::slotRemoved( const TQString& name )
int subnumber = 0;
while( true )
{
- if( !_config->hasGroup( _groupName->tqarg( number ) ) )
+ if( !_config->hasGroup( _groupName->arg( number ) ) )
{
number = -1; //not found
break;
}
- _config->setGroup( _groupName->tqarg( number ) );
+ _config->setGroup( _groupName->arg( number ) );
if( name == _config->readEntry( "name", TQString() ) )
break; //found
@@ -195,16 +195,16 @@ void KEditListBoxManager::slotRemoved( const TQString& name )
if( number < 0 ) //failure
return; //do nothing
- _config->deleteGroup( _groupName->tqarg( number ), true, false );
+ _config->deleteGroup( _groupName->arg( number ), true, false );
emit elementDeleted( number );
- while( _subGroupName && _config->hasGroup( _subGroupName->tqarg( number ).tqarg( subnumber ) ) )
+ while( _subGroupName && _config->hasGroup( _subGroupName->arg( number ).arg( subnumber ) ) )
{
- _config->deleteGroup( _subGroupName->tqarg( number ).tqarg( subnumber ) );
+ _config->deleteGroup( _subGroupName->arg( number ).arg( subnumber ) );
++subnumber;
}
//rotate groups
- while( _config->hasGroup( _groupName->tqarg( number + 1 ) ) )
+ while( _config->hasGroup( _groupName->arg( number + 1 ) ) )
{
moveItem( number + 1, number );
@@ -224,17 +224,17 @@ void KEditListBoxManager::moveItem( int src, int dest )
TQMap<TQString, TQString>::iterator it;
int subnumber = 0;
- *srcList = _config->entryMap( _groupName->tqarg( src ) );
- _config->deleteGroup( _groupName->tqarg( src ) );
+ *srcList = _config->entryMap( _groupName->arg( src ) );
+ _config->deleteGroup( _groupName->arg( src ) );
- _config->setGroup( _groupName->tqarg( dest ) );
+ _config->setGroup( _groupName->arg( dest ) );
for( it = srcList->begin(); it != srcList->end(); ++it )
_config->writeEntry( it.key(), it.data() );
- while( _subGroupName && _config->hasGroup( _subGroupName->tqarg( src ).tqarg( subnumber ) ) )
+ while( _subGroupName && _config->hasGroup( _subGroupName->arg( src ).arg( subnumber ) ) )
{
- _config->deleteGroup( _subGroupName->tqarg( dest ).tqarg( subnumber ) );
- _config->setGroup( _subGroupName->tqarg( dest ).tqarg( subnumber ) );
+ _config->deleteGroup( _subGroupName->arg( dest ).arg( subnumber ) );
+ _config->setGroup( _subGroupName->arg( dest ).arg( subnumber ) );
for( it = srcList->begin(); it != srcList->end(); ++it )
_config->writeEntry( it.key(), it.data() );
@@ -253,33 +253,33 @@ void KEditListBoxManager::changeItem( int first, int last )
TQMap<TQString, TQString>::iterator it;
int subnumber = 0;
- *firstList = _config->entryMap( _groupName->tqarg( first ) );
- *lastList = _config->entryMap( _groupName->tqarg( last ) );
- _config->deleteGroup( _groupName->tqarg( first ) );
- _config->deleteGroup( _groupName->tqarg( last ) );
+ *firstList = _config->entryMap( _groupName->arg( first ) );
+ *lastList = _config->entryMap( _groupName->arg( last ) );
+ _config->deleteGroup( _groupName->arg( first ) );
+ _config->deleteGroup( _groupName->arg( last ) );
- _config->setGroup( _groupName->tqarg( last ) );
+ _config->setGroup( _groupName->arg( last ) );
for( it = firstList->begin(); it != firstList->end(); ++it )
_config->writeEntry( it.key(), it.data() );
- _config->setGroup( _groupName->tqarg( first ) );
+ _config->setGroup( _groupName->arg( first ) );
for( it = lastList->begin(); it != lastList->end(); ++it )
_config->writeEntry( it.key(), it.data() );
while( _subGroupName && (
- _config->hasGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) ) ||
- _config->hasGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) ) ) )
+ _config->hasGroup( _subGroupName->arg( first ).arg( subnumber ) ) ||
+ _config->hasGroup( _subGroupName->arg( last ).arg( subnumber ) ) ) )
{
- *firstList = _config->entryMap( _subGroupName->tqarg( first ).tqarg( subnumber ) );
- *lastList = _config->entryMap( _subGroupName->tqarg( last ).tqarg( subnumber ) );
- _config->deleteGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) );
- _config->deleteGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) );
+ *firstList = _config->entryMap( _subGroupName->arg( first ).arg( subnumber ) );
+ *lastList = _config->entryMap( _subGroupName->arg( last ).arg( subnumber ) );
+ _config->deleteGroup( _subGroupName->arg( first ).arg( subnumber ) );
+ _config->deleteGroup( _subGroupName->arg( last ).arg( subnumber ) );
- _config->setGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) );
+ _config->setGroup( _subGroupName->arg( last ).arg( subnumber ) );
for( it = firstList->begin(); it != firstList->end(); ++it )
_config->writeEntry( it.key(), it.data() );
- _config->setGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) );
+ _config->setGroup( _subGroupName->arg( first ).arg( subnumber ) );
for( it = lastList->begin(); it != lastList->end(); ++it )
_config->writeEntry( it.key(), it.data() );
@@ -294,7 +294,7 @@ void KEditListBoxManager::changeItem( int first, int last )
void KEditListBoxManager::changedText()
{
- _config->setGroup( _groupName->tqarg( this->currentItem() ) );
+ _config->setGroup( _groupName->arg( this->currentItem() ) );
_config->writeEntry( "name", this->currentText() );
}
diff --git a/korn/kio.cpp b/korn/kio.cpp
index 0977eb60..8015595c 100644
--- a/korn/kio.cpp
+++ b/korn/kio.cpp
@@ -96,7 +96,7 @@ KKioDrop::KKioDrop()
_protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default
_kurl->setPort( _protocol->defaultPort( _ssl ) );
- //Creating tqchildren and connect them to the outside world; this class passes the messages for them...
+ //Creating children and connect them to the outside world; this class passes the messages for them...
//This class handles all the counting.
_count = new KIO_Count( this, "kio_count" );
@@ -134,7 +134,7 @@ KKioDrop::KKioDrop( KConfigGroup* )
_protocol = Protocols::firstProtocol()->getKIOProtocol(); //The first protocol is the default
_kurl->setPort( _protocol->defaultPort( _ssl ) );
- //Creating tqchildren and connect them to the outside world; this class passes the messages for them...
+ //Creating children and connect them to the outside world; this class passes the messages for them...
//This class handles all the counting.
_count = new KIO_Count( this, "kio_count" );
diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp
index a1635fd9..a1f8e825 100644
--- a/korn/kio_count.cpp
+++ b/korn/kio_count.cpp
@@ -86,8 +86,8 @@ void KIO_Count::count( KKioDrop *drop )
if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) //Forcing reload
{
- kdWarning() << i18n( "Not able to open a kio slave for %1." ).tqarg( _protocol->configName() ) << endl;
- _kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).tqarg( _protocol->configName() ) );
+ kdWarning() << i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) << endl;
+ _kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) );
_valid = false;
_kio->emitValidChanged();
_slave = 0;
@@ -207,8 +207,8 @@ void KIO_Count::result( KIO::Job* job )
//This could be very useful by resolving bugs.
if( job->error() )
{
- kdError() << i18n( "The next KIO-error occurred by counting: %1" ).tqarg( job->errorString() ) << endl;
- _kio->emitShowPassivePopup( i18n( "The next KIO-error occurred by counting: %1" ).tqarg( job->errorString() ) );
+ kdError() << i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) << endl;
+ _kio->emitShowPassivePopup( i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) );
_valid = false;
_kio->emitValidChanged();
}
diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp
index 576463be..db27e28d 100644
--- a/korn/kio_delete.cpp
+++ b/korn/kio_delete.cpp
@@ -182,7 +182,7 @@ void KIO_Delete::slotResult( KIO::Job* job )
{
if( job->error() )
{
- kdWarning() << i18n( "An error occurred when deleting email: %1." ).tqarg( job->errorString() ) << endl;
+ kdWarning() << i18n( "An error occurred when deleting email: %1." ).arg( job->errorString() ) << endl;
_valid = false;
}
diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp
index c14377c0..b92da304 100644
--- a/korn/kio_read.cpp
+++ b/korn/kio_read.cpp
@@ -77,7 +77,7 @@ void KIO_Read::slotResult( KIO::Job* job )
kdWarning() << i18n( "Unknown job returned; I will try if this one will do... " ) << endl;
if( job->error() )
- kdWarning() << i18n( "An error occurred when fetching the requested email: %1." ).tqarg( job->errorString() ) << endl;
+ kdWarning() << i18n( "An error occurred when fetching the requested email: %1." ).arg( job->errorString() ) << endl;
_kio->emitReadMailReady( _message );
diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp
index fad2790b..02a6a103 100644
--- a/korn/kio_single_subject.cpp
+++ b/korn/kio_single_subject.cpp
@@ -138,7 +138,7 @@ void KIO_Single_Subject::slotResult( KIO::Job *job )
if( job->error() )
{
- kdWarning() << i18n( "Error when fetching %1: %2" ).tqarg( *_name ).tqarg( job->errorString() ) << endl;
+ kdWarning() << i18n( "Error when fetching %1: %2" ).arg( *_name ).arg( job->errorString() ) << endl;
} else {
KornMailSubject * mailSubject = new KornMailSubject( new KornStringId( *_name ), 0 );
parseMail( _message, mailSubject, _protocol->fullMessage() );
diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp
index 2e1e3385..2de6ac59 100644
--- a/korn/kio_subjects.cpp
+++ b/korn/kio_subjects.cpp
@@ -101,8 +101,8 @@ void KIO_Subjects::getConnection( )
if( ! ( _slave = KIO::Scheduler::getConnectedSlave( kurl, metadata ) ) )
{
- kdWarning() << i18n( "Not able to open a kio-slave for %1." ).tqarg( _protocol->configName() );
- _kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).tqarg( _protocol->configName() ) );
+ kdWarning() << i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() );
+ _kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ) );
_valid = false;
_kio->emitValidChanged();
_slave = 0;
diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp
index 1ff68213..fb6166c3 100644
--- a/korn/kmail_proto.cpp
+++ b/korn/kmail_proto.cpp
@@ -99,7 +99,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config
{
//Construct metadata
if( kmailconfig.hasKey( "auth" ) )
- metadata += TQString( "auth=%1," ).tqarg( kmailconfig.readEntry( "auth" ) );
+ metadata += TQString( "auth=%1," ).arg( kmailconfig.readEntry( "auth" ) );
if( !kmailconfig.hasKey( "use-tls" ) )
metadata += "tls=auto";
else
@@ -124,7 +124,7 @@ TQMap< TQString, TQString > * KMail_Protocol::createConfig( KConfigGroup* config
{
//Constructing metadata
if( kmailconfig.hasKey( "auth" ) )
- metadata += TQString( "auth=%1," ).tqarg( kmailconfig.readEntry( "auth" ) );
+ metadata += TQString( "auth=%1," ).arg( kmailconfig.readEntry( "auth" ) );
if( !kmailconfig.hasKey( "use-tls" ) )
metadata += "tls=auto";
else
@@ -185,9 +185,9 @@ void KMail_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObje
int nummer = kmailFirstGroup - 1;
KConfig kmailconfig( "kmailrc", true, false );
- while( kmailconfig.hasGroup( TQString( kmailGroupName ).tqarg( ++nummer ) ) )
+ while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) )
{
- kmailconfig.setGroup( TQString( kmailGroupName ).tqarg( nummer ) );
+ kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) );
type = kmailconfig.readEntry( kmailKeyType, TQString() );
name = kmailconfig.readEntry( kmailKeyName, TQString() );
if( type == "imap" || type == "cachedimap" || type == "pop" || type == "local" )
@@ -224,9 +224,9 @@ TQString KMail_Protocol::getTypeAndConfig( const TQString& kmailname, KConfig &k
id = -1;
- while( kmailconfig.hasGroup( TQString( kmailGroupName ).tqarg( ++nummer ) ) )
+ while( kmailconfig.hasGroup( TQString( kmailGroupName ).arg( ++nummer ) ) )
{
- kmailconfig.setGroup( TQString( kmailGroupName ).tqarg( nummer ) );
+ kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) );
if( kmailconfig.readEntry( kmailKeyName, TQString() ) == kmailname )
{
id = kmailconfig.readNumEntry( kmailKeyId, 0 );
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index deea1591..78bd0367 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -161,7 +161,7 @@
<property name="text">
<string>Normal</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -201,7 +201,7 @@
<property name="text">
<string>New Mail</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -455,7 +455,7 @@
<property name="text">
<string>Left</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -518,7 +518,7 @@
<property name="text">
<string>Right</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -745,7 +745,7 @@
<property name="text">
<string>Mousebutton</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -860,7 +860,7 @@
<property name="text">
<string>Middle</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index 4cb911be..ab667142 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -78,7 +78,7 @@ void KornBoxCfgImpl::readConfig( KConfig * config, const int index )
_config = config;
_index = index;
- _config->setGroup( TQString( "korn-%1" ).tqarg( index ) );
+ _config->setGroup( TQString( "korn-%1" ).arg( index ) );
readViewConfig();
readEventConfig();
@@ -88,7 +88,7 @@ void KornBoxCfgImpl::readConfig( KConfig * config, const int index )
void KornBoxCfgImpl::writeConfig( KConfig * config, const int index )
{
- config->setGroup( TQString( "korn-%1" ).tqarg( index ) );
+ config->setGroup( TQString( "korn-%1" ).arg( index ) );
writeViewConfig( config );
writeEventConfig( config );
@@ -155,7 +155,7 @@ void KornBoxCfgImpl::readEventConfig()
void KornBoxCfgImpl::readAccountsConfig()
{
- elbAccounts->setGroupName( TQString( "korn-%1-%2" ).tqarg( _index ) );
+ elbAccounts->setGroupName( TQString( "korn-%1-%2" ).arg( _index ) );
elbAccounts->setConfig( _config );
}
@@ -250,10 +250,10 @@ void KornBoxCfgImpl::slotEditBox()
connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) );
_group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).
- tqarg( _index ).tqarg(elbAccounts->listBox()->currentItem() ) );
+ arg( _index ).arg(elbAccounts->listBox()->currentItem() ) );
TQMap< TQString, TQString > *map = new TQMap< TQString, TQString >( _config->entryMap( TQString( "korn-%1-%2" ).
- tqarg( _index ).tqarg(elbAccounts->listBox()->currentItem() ) ) );
+ arg( _index ).arg(elbAccounts->listBox()->currentItem() ) ) );
widget->readConfig( _group, map, _index, elbAccounts->listBox()->currentItem() );
delete map;
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index 0616e6fe..b61cf32c 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" ).tqarg( box1 ).tqarg( accountnumber1 ) ) )
+ while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box1 ).arg( accountnumber1 ) ) )
++accountnumber1;
- while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box2 ).tqarg( accountnumber2 ) ) )
+ while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box2 ).arg( 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" ).tqarg( box ).tqarg( accountnumber ) ) )
+ while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( 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" ).tqarg( index ) );
+ config->setGroup( TQString( "korn-%1-0" ).arg( index ) );
config->writeEntry( "name", name );
config->writeEntry( "protocol", "mbox" );
config->writeEntry( "server", TQString() );
@@ -236,12 +236,12 @@ void KornCfgImpl::rewritePasswords()
int account = 0 - 1;
KConfigGroup *group;
- while( _config->hasGroup( TQString( "korn-%1" ).tqarg( ++box ) ) )
+ while( _config->hasGroup( TQString( "korn-%1" ).arg( ++box ) ) )
{
account = 0 - 1;
- while( _config->hasGroup( TQString( "korn-%1-%2" ).tqarg( box ).tqarg( ++account ) ) )
+ while( _config->hasGroup( TQString( "korn-%1-%2" ).arg( box ).arg( ++account ) ) )
{
- group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).tqarg( box ).tqarg( account ) );
+ group = new KConfigGroup( _config, TQString( "korn-%1-%2" ).arg( box ).arg( account ) );
KOrnPassword::rewritePassword( box, account, *group, chUseWallet->isChecked() );
delete group;
}
diff --git a/korn/password.cpp b/korn/password.cpp
index bc997d51..f0ae5d8f 100644
--- a/korn/password.cpp
+++ b/korn/password.cpp
@@ -52,7 +52,7 @@ TQString KOrnPassword::readKMailPassword( int accountnr, const KConfigBase& fall
return KMailDecrypt( fallbackConfig.readEntry( "pass" ));
m_wallet->setFolder( "kmail" );
- if( m_wallet->readPassword( TQString( "account-%1" ).tqarg( accountnr ), password ) != 0 )
+ if( m_wallet->readPassword( TQString( "account-%1" ).arg( accountnr ), password ) != 0 )
return fallbackConfig.readEntry( "password" );
return password;
@@ -95,7 +95,7 @@ bool KOrnPassword::deleteKOrnPassword( int box, int account )
m_wallet->setFolder( "korn" );
//Write to wallet
- if( m_wallet->removeEntry( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ) ) != 0 )
+ if( m_wallet->removeEntry( TQString( "account-%1-%2" ).arg( box ).arg( account ) ) != 0 )
//Writing failed
return false;
@@ -201,7 +201,7 @@ bool KOrnPassword::readKOrnPassword( int box, int account, TQString& password )
return false;
m_wallet->setFolder( "korn" );
- if( m_wallet->readPassword( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ), password ) != 0 )
+ if( m_wallet->readPassword( TQString( "account-%1-%2" ).arg( box ).arg( account ), password ) != 0 )
//Error during reading the password: use the one in the config file
return false;
@@ -228,7 +228,7 @@ bool KOrnPassword::writeKOrnPassword( int box, int account, const TQString& pass
m_wallet->setFolder( "korn" );
//Write to wallet
- if( m_wallet->writePassword( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ), password ) != 0 )
+ if( m_wallet->writePassword( TQString( "account-%1-%2" ).arg( box ).arg( account ), password ) != 0 )
//Writing failed
return false;
diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp
index 7cc6bc57..8d05a03b 100644
--- a/korn/polldrop.cpp
+++ b/korn/polldrop.cpp
@@ -52,7 +52,7 @@ void KPollableDrop::timerEvent( TQTimerEvent *ev )
{
if( _timerRunning && (ev->timerId() == _timerId) ) {
// this event is ours.
- recheck(); // should be reimplemented by tqchildren.
+ recheck(); // should be reimplemented by children.
}
else {
TQObject::timerEvent( ev );
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index c4ecd6b1..b42a63ec 100644
--- a/korn/pop3_proto.cpp
+++ b/korn/pop3_proto.cpp
@@ -67,7 +67,7 @@ void Pop3_Protocol::readEntries( TQMap< TQString, TQString >* map, TQMap< TQStri
if( map->contains( "ssl" ) && *map->find( "ssl" ) == "true" )
map->insert( "encryption", "ssl" );
if( metadata->contains( "tls" ) )
- map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) );
+ map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->find( "tls" ) ) );
if( metadata->contains( "auth" ) )
map->insert( "auth", TQString( "auth=APOP" ) );
}
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index 43e5102d..5c96cbba 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -88,7 +88,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
_list->addColumn(i18n("Date"));
_list->addColumn(i18n("Size (Bytes)"));
- // column 3 contains a number (change tqalignment)
+ // column 3 contains a number (change alignment)
_list->setColumnAlignment(3, TQt::AlignRight);
_list->setItemMargin(3);
@@ -204,7 +204,7 @@ void KornSubjectsDlg::showMessage(TQListViewItem * item )
void KornSubjectsDlg::showSubjectsDlg( const TQString& name )
{
- setCaption( i18n("Mails in Box: %1").tqarg( name ) );
+ setCaption( i18n("Mails in Box: %1").arg( name ) );
// load the subjects
reloadSubjects();