Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

35 files changed, 205 insertions, 205 deletions

diff --git a/korn/ChangeLog b/korn/ChangeLog
index d22d617aa..e644587e3 100644
--- a/korn/ChangeLog
+++ b/korn/ChangeLog
@@ -14,7 +14,7 @@
 	* Converted C-style casts to C++-style, and checked retvals
 	  of dynamic_casts. Currently only assert() used, but that's
 	  better than crashing.
-	* Fixed layout of polldlg.
+	* Fixed tqlayout of polldlg.
 	* Split 'General' cfg widget into two, 'View' and 'Commands'
 	* Added some keyboard accelerators.
 	* Still need to connect config stuff up properly...
@@ -28,7 +28,7 @@
 
 	* temporarily take care of korn (with Taj's blessing)
 	* fix most of the layouts (/me being too stupid to fix Taj's nice
-		custom layout classes, I switched completely to pure QLayouts)
+		custom tqlayout classes, I switched completely to pure QLayouts)
 	* fixed most of the i18n
 	* made FileDialogs start with the current path by default (instead no
 		path, used before)
diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index a791c53d4..ddadf7c23 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" ).arg( index ) );
+	KConfigGroup *masterGroup = new KConfigGroup( config, TQString( "korn-%1" ).tqarg( index ) );
 	TQStringList dcop = masterGroup->readListEntry( "dcop", ',' );
 	KConfigGroup *accountGroup;
 	int counter = 0;
 		
-	while( config->hasGroup( TQString( "korn-%1-%2" ).arg( index ).arg( counter ) ) )
+	while( config->hasGroup( TQString( "korn-%1-%2" ).tqarg( index ).tqarg( counter ) ) )
 	{
-		accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).arg( index ).arg( counter ) );
+		accountGroup = new KConfigGroup( config, TQString( "korn-%1-%2" ).tqarg( index ).tqarg( 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" ).arg( index ).arg( it.data()->index ) );
+		config->setGroup( TQString( "korn-%1-%2" ).tqarg( index ).tqarg( 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" ).arg( it.key()->realName() ).arg( it.data()->msgnr - it.data()->reset ));
+			result.append( TQString( "%1: %2" ).tqarg( it.key()->realName() ).tqarg( it.data()->msgnr - it.data()->reset ));
 		else
-			result.append( TQString( "%1: invalid" ).arg( it.key()->realName() ) );
+			result.append( TQString( "%1: invalid" ).tqarg( it.key()->realName() ) );
 	result.sort();
 	return result.join( TQChar( '\n' ) );
 }
diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp
index 934a47c53..72719812d 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" ).arg( counter ) ) )
+	while( config->hasGroup( TQString( "korn-%1" ).tqarg( counter ) ) )
 	{
-		config->setGroup( TQString( "korn-%1" ).arg( counter ) );
+		config->setGroup( TQString( "korn-%1" ).tqarg( counter ) );
 		BoxContainerItem *item = newBoxInstance();
 		item->readConfig( config, counter );
 		addItem( item );
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index b026e95c4..c412a07b2 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" ).arg( index ) );
+	config->setGroup( TQString( "korn-%1" ).tqarg( index ) );
 	if( config->readBoolEntry( "hasnormalicon", false ) )
 		_icons[ 0 ] = new TQString( config->readEntry( "normalicon", "" ) );
 	else
@@ -216,23 +216,23 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
 {
 	KPassivePopup *popup = new KPassivePopup( parent, "Passive popup" );
 		
-	TQVBox *mainvlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( TQString(objId()) ).arg( accountName )
-			.arg( total ), "", TQPixmap(), 0 );
-	TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" );
+	TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).tqarg( TQString(objId()) ).tqarg( accountName )
+			.tqarg( total ), "", TQPixmap(), 0 );
+	TQGrid *maingtqlayout = new TQGrid( date ? 3 : 2 ,mainvtqlayout, "Grid-Layout" );
 	
-	TQLabel *title = new TQLabel( i18n("From"), mainglayout, "from_label" );
+	TQLabel *title = new TQLabel( i18n("From"), maingtqlayout, "from_label" );
 	TQFont font = title->font();
 	font.setBold( true );
 	title->setFont( font );
 		
-	title = new TQLabel( i18n("Subject"), mainglayout, "subject_label" );
+	title = new TQLabel( i18n("Subject"), maingtqlayout, "subject_label" );
 	font = title->font();
 	font.setBold( true );
 	title->setFont( font );
 		
 	if( date )
 	{
-		title = new TQLabel( i18n("Date"), mainglayout, "date_label" );
+		title = new TQLabel( i18n("Date"), maingtqlayout, "date_label" );
 		font = title->font();
 		font.setBold( true );
 		title->setFont( font );
@@ -240,19 +240,19 @@ void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSu
 	
 	for( KornMailSubject* subject = list->first(); subject; subject = list->next() )
 	{
-		new TQLabel( subject->getSender(), mainglayout, "from-value" );
-		new TQLabel( subject->getSubject(), mainglayout, "subject-value" );
+		new TQLabel( subject->getSender(), maingtqlayout, "from-value" );
+		new TQLabel( subject->getSubject(), maingtqlayout, "subject-value" );
 		if( date )
 		{
 			TQDateTime tijd;
 			tijd.setTime_t( subject->getDate() );
-			new TQLabel( tijd.toString(), mainglayout, "date-value" );
+			new TQLabel( tijd.toString(), maingtqlayout, "date-value" );
 		}
 	}
 	
 	popup->setAutoDelete( true ); //Now, now care for deleting these pointers.
 	
-	popup->setView( mainvlayout );
+	popup->setView( mainvtqlayout );
 	
 	popup->show(); //Display it
 }
@@ -316,7 +316,7 @@ void BoxContainerItem::drawLabel( TQLabel *label, const int count, const bool ne
 		if( _fonts[ index ] )
 			label->setFont( *_fonts[ index ] );
 		label->setPaletteForegroundColor( *_fgColour[ index ] );
-		label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+		label->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 		label->setText( TQString::number( count ) );
 	}
 	
@@ -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.begin( &numberPixmap, false );
+	p.tqbegin( &numberPixmap, false );
 	p.setPen( TQt::white );
 	if( font )
 		p.setFont( *font );
@@ -371,7 +371,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 
 void BoxContainerItem::setAnimIcon( TQLabel* label, const TQString& anim )
 {
-	label->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
+	label->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
 	label->setMovie( TQMovie( anim ) );
 	label->show();
 }
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 407a6ff06..aea90103e 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -159,10 +159,10 @@ int DCOPDrop::addMessage( const TQString& subject, const TQString& message )
 	++_counter;
 	
 	mailsubject->setSubject( subject );
-	mailsubject->setSender( TQString( "DCOP: %1" ).arg( *_name ) );
+	mailsubject->setSender( TQString( "DCOP: %1" ).tqarg( *_name ) );
 	mailsubject->setHeader( message, true );
 	mailsubject->setSize( message.length() );
-	mailsubject->setDate( TQDateTime::currentDateTime().toTime_t() );
+	mailsubject->setDate( TQDateTime::tqcurrentDateTime().toTime_t() );
 	
 	_msgList->insert( id->getId(), mailsubject );
 	
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 9d30717f0..5ff6fb8af 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" ).arg( TQString(objId()) ).arg( name ), message, _systemtray, "Passive error message" );
+	KPassivePopup::message( i18n( "Korn - %1/%2" ).tqarg( TQString(objId()) ).tqarg( name ), message, _systemtray, "Passive error message" );
 }
 
 void DockedItem::doPopup()
diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp
index d2453b64c..bf621445f 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" ).arg( TQString(objId()) ).arg( name ), errorMessage, _label, "Passive error message" );
+	KPassivePopup::message( TQString( "korn-%1-%2" ).tqarg( TQString(objId()) ).tqarg( name ), errorMessage, _label, "Passive error message" );
 }
 	
 void HVItem::doPopup()
diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp
index caedb4597..304fed5ed 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" ).arg( *metadata->find( "tls" ) ) );
+		map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) );
 	if( metadata->contains( "auth" ) )
-		map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->find( "auth" ) ) );
+		map->insert( "auth", TQString( "auth=%1" ).tqarg( *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 e3c11610f..7ff7a922c 100644
--- a/korn/kconf_update/korn-3-4-config_change.cpp
+++ b/korn/kconf_update/korn-3-4-config_change.cpp
@@ -18,7 +18,7 @@
 
 #include <tqstring.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqmap.h>
 #include <tqvaluelist.h>
 
@@ -175,8 +175,8 @@ int main( int, char**  )
 		{
 			if( numboxes > -1 && interesting_group.cap( 1 ).toInt() < numboxes )
 			{
-				currentGroup1 = TQString( "[korn-%1]" ).arg( interesting_group.cap( 1 ) );
-				currentGroup2 = TQString( "[korn-%1-0]" ).arg( interesting_group.cap( 1 ) );
+				currentGroup1 = TQString( "[korn-%1]" ).tqarg( interesting_group.cap( 1 ) );
+				currentGroup2 = TQString( "[korn-%1-0]" ).tqarg( interesting_group.cap( 1 ) );
 			}
 			tobe_deleted.append( line );
 			continue;
diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp
index d3dce86e0..d5ae323a5 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->arg( number ) ) )
+	while( _config->hasGroup( _groupName->tqarg( number ) ) )
 	{
-		_config->setGroup( _groupName->arg( number ) );
+		_config->setGroup( _groupName->tqarg( 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->arg( this->currentItem() ) );
+	_config->setGroup( _groupName->tqarg( 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->arg( number ) ) )
+	while( _config->hasGroup( _groupName->tqarg( number ) ) )
 		++number;
 		
-	_config->setGroup( _groupName->arg( number ) );
+	_config->setGroup( _groupName->tqarg( 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->arg( number ) ) )
+		if( !_config->hasGroup( _groupName->tqarg( number ) ) )
 		{
 			number = -1; //not found
 			break;
 		}
-		_config->setGroup( _groupName->arg( number ) );
+		_config->setGroup( _groupName->tqarg( 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->arg( number ), true, false );
+	_config->deleteGroup( _groupName->tqarg( number ), true, false );
 	emit elementDeleted( number );
-	while( _subGroupName && _config->hasGroup( _subGroupName->arg( number ).arg( subnumber ) ) )
+	while( _subGroupName && _config->hasGroup( _subGroupName->tqarg( number ).tqarg( subnumber ) ) )
 	{
-		_config->deleteGroup( _subGroupName->arg( number ).arg( subnumber ) );
+		_config->deleteGroup( _subGroupName->tqarg( number ).tqarg( subnumber ) );
 		++subnumber;
 	}
 	
 	//rotate groups
-	while( _config->hasGroup( _groupName->arg( number + 1 ) ) )
+	while( _config->hasGroup( _groupName->tqarg( 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->arg( src ) );
-	_config->deleteGroup( _groupName->arg( src ) );
+	*srcList = _config->entryMap( _groupName->tqarg( src ) );
+	_config->deleteGroup( _groupName->tqarg( src ) );
 	
-	_config->setGroup( _groupName->arg( dest ) );
+	_config->setGroup( _groupName->tqarg( dest ) );
 	for( it = srcList->begin(); it != srcList->end(); ++it )
 		_config->writeEntry( it.key(), it.data() );
 		
-	while( _subGroupName && _config->hasGroup( _subGroupName->arg( src ).arg( subnumber ) ) )
+	while( _subGroupName && _config->hasGroup( _subGroupName->tqarg( src ).tqarg( subnumber ) ) )
 	{
-		_config->deleteGroup( _subGroupName->arg( dest ).arg( subnumber ) );
-		_config->setGroup( _subGroupName->arg( dest ).arg( subnumber ) );
+		_config->deleteGroup( _subGroupName->tqarg( dest ).tqarg( subnumber ) );
+		_config->setGroup( _subGroupName->tqarg( dest ).tqarg( 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->arg( first ) );
-	*lastList = _config->entryMap( _groupName->arg( last ) );
-	_config->deleteGroup( _groupName->arg( first ) );
-	_config->deleteGroup( _groupName->arg( last ) );
+	*firstList = _config->entryMap( _groupName->tqarg( first ) );
+	*lastList = _config->entryMap( _groupName->tqarg( last ) );
+	_config->deleteGroup( _groupName->tqarg( first ) );
+	_config->deleteGroup( _groupName->tqarg( last ) );
 	
-	_config->setGroup( _groupName->arg( last ) );
+	_config->setGroup( _groupName->tqarg( last ) );
 	for( it = firstList->begin(); it != firstList->end(); ++it )
 		_config->writeEntry( it.key(), it.data() );
 		
-	_config->setGroup( _groupName->arg( first ) );
+	_config->setGroup( _groupName->tqarg( first ) );
 	for( it = lastList->begin(); it != lastList->end(); ++it )
 		_config->writeEntry( it.key(), it.data() );
 	
 	while( _subGroupName && (
-		_config->hasGroup( _subGroupName->arg( first ).arg( subnumber ) ) ||
-		_config->hasGroup( _subGroupName->arg( last ).arg( subnumber ) ) ) )
+		_config->hasGroup( _subGroupName->tqarg( first ).tqarg( subnumber ) ) ||
+		_config->hasGroup( _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 ) );
+		*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 ) );
 		
-		_config->setGroup( _subGroupName->arg( last ).arg( subnumber ) );
+		_config->setGroup( _subGroupName->tqarg( last ).tqarg( subnumber ) );
 		for( it = firstList->begin(); it != firstList->end(); ++it )
 			_config->writeEntry( it.key(), it.data() );
 		
-		_config->setGroup( _subGroupName->arg( first ).arg( subnumber ) );
+		_config->setGroup( _subGroupName->tqarg( first ).tqarg( 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->arg( this->currentItem() ) );
+	_config->setGroup( _groupName->tqarg( this->currentItem() ) );
 	_config->writeEntry( "name", this->currentText() );
 }
 
diff --git a/korn/kio.cpp b/korn/kio.cpp
index 8015595c0..0977eb603 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 children and connect them to the outside world; this class passes the messages for them...
+	//Creating tqchildren 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 children and connect them to the outside world; this class passes the messages for them...
+	//Creating tqchildren 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 a1f8e825c..a1635fd9f 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." ).arg( _protocol->configName() ) << endl;
-			_kio->emitShowPassivePopup( i18n( "Not able to open a kio slave for %1." ).arg( _protocol->configName() ) );
+			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() ) );
 			_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" ).arg( job->errorString() ) << endl;
-		_kio->emitShowPassivePopup( i18n( "The next KIO-error occurred by counting: %1" ).arg( job->errorString() ) );
+		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() ) );
 		_valid = false;
 		_kio->emitValidChanged();
 	}
diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp
index db27e28d9..576463bef 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." ).arg( job->errorString() ) << endl;
+		kdWarning() << i18n( "An error occurred when deleting email: %1." ).tqarg( job->errorString() ) << endl;
 		_valid = false;
 	}
 	
diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp
index b92da304c..c14377c0b 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." ).arg( job->errorString() ) << endl;
+		kdWarning() << i18n( "An error occurred when fetching the requested email: %1." ).tqarg( job->errorString() ) << endl;
 		
 	_kio->emitReadMailReady( _message );
 	
diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp
index 02a6a103d..fad2790b5 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" ).arg( *_name ).arg( job->errorString() ) << endl;
+		kdWarning() << i18n( "Error when fetching %1: %2" ).tqarg( *_name ).tqarg( 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 2de6ac59a..2e1e33855 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." ).arg( _protocol->configName() );
-			_kio->emitShowPassivePopup( i18n( "Not able to open a kio-slave for %1." ).arg( _protocol->configName() ) );
+			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() ) );
 			_valid = false;
 			_kio->emitValidChanged();
 			_slave = 0;
diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp
index fb6166c31..1ff68213b 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," ).arg( kmailconfig.readEntry( "auth" ) );
+			metadata += TQString( "auth=%1," ).tqarg( 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," ).arg( kmailconfig.readEntry( "auth" ) );
+			metadata += TQString( "auth=%1," ).tqarg( 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 ).arg( ++nummer ) ) )
+	while( kmailconfig.hasGroup( TQString( kmailGroupName ).tqarg( ++nummer ) ) )
 	{
-		kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) );
+		kmailconfig.setGroup( TQString( kmailGroupName ).tqarg( 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 ).arg( ++nummer ) ) )
+	while( kmailconfig.hasGroup( TQString( kmailGroupName ).tqarg( ++nummer ) ) )
 	{
-		kmailconfig.setGroup( TQString( kmailGroupName ).arg( nummer ) );
+		kmailconfig.setGroup( TQString( kmailGroupName ).tqarg( nummer ) );
 		if( kmailconfig.readEntry( kmailKeyName, TQString() ) == kmailname )
 		{
 			id = kmailconfig.readNumEntry( kmailKeyId, 0 );	
diff --git a/korn/kornaccountcfg.ui b/korn/kornaccountcfg.ui
index 5e540b4b2..9a640718e 100644
--- a/korn/kornaccountcfg.ui
+++ b/korn/kornaccountcfg.ui
@@ -73,7 +73,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout35</cstring>
+                            <cstring>tqlayout35</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -137,7 +137,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout33</cstring>
+                                    <cstring>tqlayout33</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 5da0210e7..ce1c9058b 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqptrvector.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqlabel.h>
 #include <tqwidget.h>
@@ -44,7 +44,7 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name )
 	_urlfields( 0 ),
 	_boxnr( 0 ),
 	_accountnr( 0 ),
-	_vlayout( 0 ),
+	_vtqlayout( 0 ),
 	_protocolLayout( 0 ),
 	_groupBoxes( 0 ),
 	_accountinput( new TQPtrList< AccountInput >() )
@@ -173,12 +173,12 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	_accountinput->clear();
 	delete _groupBoxes;
 	delete _protocolLayout;
-	delete _vlayout;
-	_vlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 );
-	_vlayout->setSpacing( 10 );
-	_vlayout->setMargin( 10 );
+	delete _vtqlayout;
+	_vtqlayout = new TQVBoxLayout( this->server_tab, groupBoxes->count() + 1 );
+	_vtqlayout->setSpacing( 10 );
+	_vtqlayout->setMargin( 10 );
 
-	_protocolLayout = new TQHBoxLayout( _vlayout );
+	_protocolLayout = new TQHBoxLayout( _vtqlayout );
 	_protocolLayout->addWidget( this->lbProtocol );
 	_protocolLayout->addWidget( this->cbProtocol );
 
@@ -189,7 +189,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	for( it = groupBoxes->begin(); it != groupBoxes->end(); ++it )
 	{
 		_groupBoxes->insert( counter, new TQGroupBox( (*it), this->server_tab, "groupbox" ) );
-		_vlayout->addWidget( _groupBoxes->at( counter ) );
+		_vtqlayout->addWidget( _groupBoxes->at( counter ) );
 		++counter;
 	}
 	delete groupBoxes;
diff --git a/korn/kornaccountcfgimpl.h b/korn/kornaccountcfgimpl.h
index c17885d6d..10c1cbf71 100644
--- a/korn/kornaccountcfgimpl.h
+++ b/korn/kornaccountcfgimpl.h
@@ -60,7 +60,7 @@ private:
 	int _urlfields;
 	int _boxnr, _accountnr;
 		
-	TQVBoxLayout *_vlayout;
+	TQVBoxLayout *_vtqlayout;
 	TQHBoxLayout *_protocolLayout;
 	TQPtrVector< TQWidget > *_groupBoxes;
 	
diff --git a/korn/kornboxcfg.ui b/korn/kornboxcfg.ui
index f47b0f3e4..3d9ca6092 100644
--- a/korn/kornboxcfg.ui
+++ b/korn/kornboxcfg.ui
@@ -33,7 +33,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="1" column="2">
                         <property name="name">
-                            <cstring>layout32</cstring>
+                            <cstring>tqlayout32</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -69,7 +69,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="2" column="1">
                         <property name="name">
-                            <cstring>layout34</cstring>
+                            <cstring>tqlayout34</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -124,7 +124,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="2" column="2">
                         <property name="name">
-                            <cstring>layout33</cstring>
+                            <cstring>tqlayout33</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -161,13 +161,13 @@
                         <property name="text">
                             <string>Normal</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="2">
                         <property name="name">
-                            <cstring>layout36</cstring>
+                            <cstring>tqlayout36</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -201,7 +201,7 @@
                         <property name="text">
                             <string>New Mail</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -215,7 +215,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>layout31</cstring>
+                            <cstring>tqlayout31</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -251,7 +251,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="1">
                         <property name="name">
-                            <cstring>layout35</cstring>
+                            <cstring>tqlayout35</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -288,7 +288,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>41</width>
                                 <height>160</height>
@@ -297,7 +297,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="5" column="1">
                         <property name="name">
-                            <cstring>layout29</cstring>
+                            <cstring>tqlayout29</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -326,7 +326,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="5" column="2">
                         <property name="name">
-                            <cstring>layout28</cstring>
+                            <cstring>tqlayout28</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -371,7 +371,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="4" column="2">
                         <property name="name">
-                            <cstring>layout28_2</cstring>
+                            <cstring>tqlayout28_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -400,7 +400,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="4" column="1">
                         <property name="name">
-                            <cstring>layout29_2</cstring>
+                            <cstring>tqlayout29_2</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -442,7 +442,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout31</cstring>
+                            <cstring>tqlayout31</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -455,13 +455,13 @@
                                 <property name="text">
                                     <string>Left</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget" row="5" column="2">
                                 <property name="name">
-                                    <cstring>layout52_7</cstring>
+                                    <cstring>tqlayout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -477,7 +477,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -502,7 +502,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -518,13 +518,13 @@
                                 <property name="text">
                                     <string>Right</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="2">
                                 <property name="name">
-                                    <cstring>layout52</cstring>
+                                    <cstring>tqlayout52</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -540,7 +540,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -565,7 +565,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -576,7 +576,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="3" column="1">
                                 <property name="name">
-                                    <cstring>layout52_4</cstring>
+                                    <cstring>tqlayout52_4</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -592,7 +592,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -617,7 +617,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -628,7 +628,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="5" column="3">
                                 <property name="name">
-                                    <cstring>layout52_9</cstring>
+                                    <cstring>tqlayout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -644,7 +644,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -669,7 +669,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -680,7 +680,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="1">
                                 <property name="name">
-                                    <cstring>layout52</cstring>
+                                    <cstring>tqlayout52</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -696,7 +696,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -721,7 +721,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -745,13 +745,13 @@
                                 <property name="text">
                                     <string>Mousebutton</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget" row="4" column="3">
                                 <property name="name">
-                                    <cstring>layout52_9</cstring>
+                                    <cstring>tqlayout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -767,7 +767,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -792,7 +792,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -803,7 +803,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="5" column="1">
                                 <property name="name">
-                                    <cstring>layout52_5</cstring>
+                                    <cstring>tqlayout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -819,7 +819,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -844,7 +844,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -860,13 +860,13 @@
                                 <property name="text">
                                     <string>Middle</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget" row="6" column="1">
                                 <property name="name">
-                                    <cstring>layout52_5</cstring>
+                                    <cstring>tqlayout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -882,7 +882,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -907,7 +907,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -926,7 +926,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="3" column="3">
                                 <property name="name">
-                                    <cstring>layout52_8</cstring>
+                                    <cstring>tqlayout52_8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -942,7 +942,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -967,7 +967,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -986,7 +986,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="6" column="2">
                                 <property name="name">
-                                    <cstring>layout52_7</cstring>
+                                    <cstring>tqlayout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1002,7 +1002,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1027,7 +1027,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1046,7 +1046,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="4" column="1">
                                 <property name="name">
-                                    <cstring>layout52_5</cstring>
+                                    <cstring>tqlayout52_5</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1062,7 +1062,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1087,7 +1087,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1098,7 +1098,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="3">
                                 <property name="name">
-                                    <cstring>layout52_3</cstring>
+                                    <cstring>tqlayout52_3</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1114,7 +1114,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1139,7 +1139,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1150,7 +1150,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="3" column="2">
                                 <property name="name">
-                                    <cstring>layout52_6</cstring>
+                                    <cstring>tqlayout52_6</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1166,7 +1166,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1191,7 +1191,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1202,7 +1202,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="4" column="2">
                                 <property name="name">
-                                    <cstring>layout52_7</cstring>
+                                    <cstring>tqlayout52_7</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1218,7 +1218,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1243,7 +1243,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1262,7 +1262,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="6" column="3">
                                 <property name="name">
-                                    <cstring>layout52_9</cstring>
+                                    <cstring>tqlayout52_9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -1278,7 +1278,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>20</height>
@@ -1303,7 +1303,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>21</width>
                                                 <height>21</height>
@@ -1316,7 +1316,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout31_3</cstring>
+                            <cstring>tqlayout31_3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1356,7 +1356,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout33</cstring>
+                                    <cstring>tqlayout33</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index ab6671427..4cb911bef 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" ).arg( index ) );
+	_config->setGroup( TQString( "korn-%1" ).tqarg( 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" ).arg( index ) );
+	config->setGroup( TQString( "korn-%1" ).tqarg( index ) );
 	
 	writeViewConfig( config );
 	writeEventConfig( config );
@@ -155,7 +155,7 @@ void KornBoxCfgImpl::readEventConfig()
 
 void KornBoxCfgImpl::readAccountsConfig()
 {
-	elbAccounts->setGroupName( TQString( "korn-%1-%2" ).arg( _index ) );
+	elbAccounts->setGroupName( TQString( "korn-%1-%2" ).tqarg( _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" ).
-			arg( _index ).arg(elbAccounts->listBox()->currentItem() ) );
+			tqarg( _index ).tqarg(elbAccounts->listBox()->currentItem() ) );
 	
 	TQMap< TQString, TQString > *map = new TQMap< TQString, TQString >( _config->entryMap( TQString( "korn-%1-%2" ).
-			                        arg( _index ).arg(elbAccounts->listBox()->currentItem() ) ) );
+			                        tqarg( _index ).tqarg(elbAccounts->listBox()->currentItem() ) ) );
 	widget->readConfig( _group, map, _index, elbAccounts->listBox()->currentItem() );
 	delete map;
 
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;
 		}
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index dc823779d..eb3a0253b 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -95,12 +95,12 @@ void KornShell::readConfig()
 	static bool shownConfig = false;
 	
 	_config->setGroup( "korn" );
-	TQChar layout = _config->readEntry( "layout", "Docked" )[0].upper();
+	TQChar tqlayout = _config->readEntry( "tqlayout", "Docked" )[0].upper();
 	KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) );
 	
-	if( layout == 'H' )
+	if( tqlayout == 'H' )
 		_box = new HVContainer( Qt::Horizontal, TQT_TQOBJECT(this), "horizontal container" );
-	else if( layout == 'V' )
+	else if( tqlayout == 'V' )
 		_box = new HVContainer( Qt::Vertical, TQT_TQOBJECT(this), "vertical container" );
 	else
 		_box = new DockedContainer( TQT_TQOBJECT(this), "docked container" );
diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp
index bcd22888d..3424e19e4 100644
--- a/korn/maildlg.cpp
+++ b/korn/maildlg.cpp
@@ -1,5 +1,5 @@
 #include "maildlg.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include<kdebug.h>
 #include<klocale.h>
 #include<tqapplication.h>
diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp
index 9d2f12f67..d0818962c 100644
--- a/korn/maildrop.cpp
+++ b/korn/maildrop.cpp
@@ -40,10 +40,10 @@ KMailDrop::KMailDrop()
   connect(this, TQT_SIGNAL(changed( int, KMailDrop* )), TQT_SLOT(setCount( int, KMailDrop* )));
   
   //Set default colours; this prevents black (TQColor::invalid) boxes after creating a new box.
-  _bgColour  = TQApplication::palette().active().background();
-  _fgColour  = TQApplication::palette().active().text();
-  _nbgColour = TQApplication::palette().active().background();
-  _nfgColour = TQApplication::palette().active().text();
+  _bgColour  = TQApplication::tqpalette().active().background();
+  _fgColour  = TQApplication::tqpalette().active().text();
+  _nbgColour = TQApplication::tqpalette().active().background();
+  _nfgColour = TQApplication::tqpalette().active().text();
 }
 
 KMailDrop::~KMailDrop()
@@ -87,10 +87,10 @@ bool KMailDrop::readConfigGroup(const KConfigBase & c)
   _caption    = c.readEntry(fu(CaptionConfigKey));
   _clickCmd   = c.readPathEntry(fu(ClickConfigKey));
   _style      = Style(c.readUnsignedNumEntry(fu(DisplayStyleConfigKey), Plain));
-  _bgColour   = c.readColorEntry(fu(BgColourConfigKey), &TQApplication::palette().active().background());
-  _fgColour   = c.readColorEntry(fu(FgColourConfigKey), &TQApplication::palette().active().text());
-  _nbgColour  = c.readColorEntry(fu(NBgColourConfigKey), &TQApplication::palette().active().background());
-  _nfgColour  = c.readColorEntry(fu(NFgColourConfigKey), &TQApplication::palette().active().text());
+  _bgColour   = c.readColorEntry(fu(BgColourConfigKey), &TQApplication::tqpalette().active().background());
+  _fgColour   = c.readColorEntry(fu(FgColourConfigKey), &TQApplication::tqpalette().active().text());
+  _nbgColour  = c.readColorEntry(fu(NBgColourConfigKey), &TQApplication::tqpalette().active().background());
+  _nfgColour  = c.readColorEntry(fu(NFgColourConfigKey), &TQApplication::tqpalette().active().text());
   _icon       = c.readEntry(fu(IconConfigKey));
   _nIcon      = c.readEntry(fu(NewMailIconConfigKey));
   _realName   = c.readEntry(fu(RealNameConfigKey));
diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp
index c7c98d82c..747d9ec7c 100644
--- a/korn/mailsubject.cpp
+++ b/korn/mailsubject.cpp
@@ -6,7 +6,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqdatetime.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <ctype.h>
 
 KornMailSubject::KornMailSubject() : _id(0), _drop(0), _size(-1), _date(-1), _fullMessage(false)
diff --git a/korn/mbox_proto.cpp b/korn/mbox_proto.cpp
index 880f86a82..eb53449d0 100644
--- a/korn/mbox_proto.cpp
+++ b/korn/mbox_proto.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrvector.h>
 #include <tqstringlist.h>
 
diff --git a/korn/password.cpp b/korn/password.cpp
index 764b90f98..bc997d51a 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" ).arg( accountnr ), password ) != 0 )
+	if( m_wallet->readPassword( TQString( "account-%1" ).tqarg( 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" ).arg( box ).arg( account ) ) != 0 )
+	if( m_wallet->removeEntry( TQString( "account-%1-%2" ).tqarg( box ).tqarg( 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" ).arg( box ).arg( account ), password ) != 0 )
+	if( m_wallet->readPassword( TQString( "account-%1-%2" ).tqarg( box ).tqarg( 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" ).arg( box ).arg( account ), password ) != 0 )
+	if( m_wallet->writePassword( TQString( "account-%1-%2" ).tqarg( box ).tqarg( account ), password ) != 0 )
 		//Writing failed
 		return false;
 
@@ -241,7 +241,7 @@ TQString KOrnPassword::KMailDecrypt( const TQString& enc )
 {
 	TQString result;
 	for (uint i = 0; i < enc.length(); i++)
-		result += (enc[i].unicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].unicode());
+		result += (enc[i].tqunicode() <= 0x21) ? enc[i] : TQChar(0x1001F - enc[i].tqunicode());
 
 	return result;
 }
diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp
index 8d05a03be..7cc6bc572 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 children.
+		recheck(); // should be reimplemented by tqchildren.
 	}
 	else {
 		TQObject::timerEvent( ev );
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index b42a63ec2..c4ecd6b16 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" ).arg( *metadata->find( "tls" ) ) );
+		map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->find( "tls" ) ) );
 	if( metadata->contains( "auth" ) )
 		map->insert( "auth", TQString( "auth=APOP" ) );
 }
diff --git a/korn/process_proto.cpp b/korn/process_proto.cpp
index 60740320d..2d4885fdf 100644
--- a/korn/process_proto.cpp
+++ b/korn/process_proto.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrvector.h>
 #include <tqstringlist.h>
 
diff --git a/korn/progress_dialog.ui b/korn/progress_dialog.ui
index 9c8910286..e56703418 100644
--- a/korn/progress_dialog.ui
+++ b/korn/progress_dialog.ui
@@ -39,7 +39,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -55,7 +55,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
@@ -80,7 +80,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>31</height>
diff --git a/korn/qmail_proto.cpp b/korn/qmail_proto.cpp
index 0663e1ff5..c902ad497 100644
--- a/korn/qmail_proto.cpp
+++ b/korn/qmail_proto.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kurlrequester.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrvector.h>
 #include <tqstringlist.h>
 
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index 45e239936..43e5102dc 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -3,7 +3,7 @@
 #include <tqapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdatetime.h>
 #include <tqtimer.h>
 #include "mailsubject.h"
@@ -88,7 +88,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
 	_list->addColumn(i18n("Date"));
 	_list->addColumn(i18n("Size (Bytes)"));
 
-	// column 3 contains a number (change alignment)
+	// column 3 contains a number (change tqalignment)
 	_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").arg( name ) );
+	setCaption( i18n("Mails in Box: %1").tqarg( name ) );
 
 	// load the subjects
 	reloadSubjects();