Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

27 files changed, 109 insertions, 110 deletions

diff --git a/korn/account_input.cpp b/korn/account_input.cpp
index e10f66598..e3cb48f91 100644
--- a/korn/account_input.cpp
+++ b/korn/account_input.cpp
@@ -65,7 +65,7 @@ TextInput::TextInput( TQWidget *tqparent, const TQString& title, int min, int ma
 {
 	_left = new TQLabel( title, tqparent, "label" );
 	_right = new KLineEdit( "", tqparent, "edit" );
-	_right->setValidator( new TQIntValidator( min, max, _right, "validator" ) );
+	_right->setValidator( new TQIntValidator( min, max, TQT_TQOBJECT(_right), "validator" ) );
 	setValue( defaul );
 }
 
@@ -137,7 +137,7 @@ TQString ComboInput::value() const
 void ComboInput::setValue( const TQString& value )
 {
 	if( _list->tqcontains( value ) )
-		_right->setCurrentItem( _list->keys().findIndex( value ) );
+		_right->setCurrentItem( _list->keys().tqfindIndex( value ) );
 	else
 		_right->setCurrentItem( -1 );
 }
diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index 9c2d3fd4d..5a93ec679 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 e8649d13a..4f8312177 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 c357fd4f4..1f4be46a2 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
@@ -171,11 +171,11 @@ void BoxContainerItem::runCommand( const TQString& cmd )
 void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state )
 {
 	int button;
-	if( state & TQt::LeftButton )
+	if( state & Qt::LeftButton )
 		button = 0;
-	else if( state & TQt::RightButton )
+	else if( state & Qt::RightButton )
 		button = 2;
-	else if( state & TQt::MidButton )
+	else if( state & Qt::MidButton )
 		button = 1;
 	else
 		return; //Invalid mouse button
@@ -216,8 +216,8 @@ void BoxContainerItem::showPassivePopup( TQWidget* tqparent, TQPtrList< KornMail
 {
 	KPassivePopup *popup = new KPassivePopup( tqparent, "Passive popup" );
 		
-	TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName )
-			.arg( total ), "", TQPixmap(), 0 );
+	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"), 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.begin( &numberPixmap, false );
+	p.tqbegin( &numberPixmap, false );
 	p.setPen( TQt::white );
 	if( font )
 		p.setFont( *font );
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 03c0db430..9cc4a9f05 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" ).arg( *_name ) );
+	mailsubject->setSender( TQString( "DCOP: %1" ).tqarg( *_name ) );
 	mailsubject->setHeader( message, true );
 	mailsubject->setSize( message.length() );
 	mailsubject->setDate( TQDateTime::tqcurrentDateTime().toTime_t() );
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index 9849155f1..dc55b3c08 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -37,7 +37,7 @@
 #include <tqmovie.h>
 
 DockedItem::DockedItem( TQWidget * tqparent, const char * name )
-	: BoxContainerItem( tqparent, name ),
+	: BoxContainerItem( TQT_TQOBJECT(tqparent), name ),
 	_systemtray( new SystemTray( tqparent, "System tray" ) )	
 {
 	this->fillKPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() );
@@ -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( 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/hvcontainer.cpp b/korn/hvcontainer.cpp
index 991f66eb0..636a9a8fc 100644
--- a/korn/hvcontainer.cpp
+++ b/korn/hvcontainer.cpp
@@ -28,7 +28,7 @@ HVContainer::HVContainer( Qt::Orientation orientation, TQObject * tqparent, cons
 	: BoxContainer( tqparent, name ),
 	box( 0 )	
 {
-	if( orientation == TQt::Horizontal )
+	if( orientation == Qt::Horizontal )
 		box = new TQHBox( 0, "hbox" );
 	else
 		box = new TQVBox( 0, "vbox" );
diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp
index 36551ae11..bc47e9e77 100644
--- a/korn/hvitem.cpp
+++ b/korn/hvitem.cpp
@@ -39,7 +39,7 @@ HVItem::HVItem( TQWidget *tqparent, const char *name )
 	_popup->insertTitle( kapp->miniIcon(), kapp->caption() );
 	this->fillKPopupMenu( _popup, _actions );
 	_popup->insertSeparator();
-	KStdAction::quit( kapp, TQT_SLOT( quit() ), _actions )->plug( _popup );
+	KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), _actions )->plug( _popup );
 	
 	connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
 }
@@ -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( 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 78a42b685..7d0f9873a 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->tqcontains( "ssl" ) && *map->tqfind( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
 	if( metadata->tqcontains( "tls" ) )
-		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->tqfind( "tls" ) ) );
+		map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->tqfind( "tls" ) ) );
 	if( metadata->tqcontains( "auth" ) )
-		map->insert( "auth", TQString( "auth=%1" ).arg( *metadata->tqfind( "auth" ) ) );
+		map->insert( "auth", TQString( "auth=%1" ).tqarg( *metadata->tqfind( "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 0cea4577d..4d0c46679 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]" ).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 cb3066727..44ef514c4 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_count.cpp b/korn/kio_count.cpp
index 683f88291..faac9390b 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 fa31ad750..b506f0b2c 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 e87fa822e..840c09f27 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 782b1bde9..7d6e87987 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_single_subject.h b/korn/kio_single_subject.h
index 9057a09e1..800638cb6 100644
--- a/korn/kio_single_subject.h
+++ b/korn/kio_single_subject.h
@@ -22,6 +22,7 @@
 //This function reads a single subject
 
 #include <tqobject.h>
+#include <tqcstring.h>
 
 class KornMailSubject;
 
@@ -30,8 +31,6 @@ namespace KIO { class MetaData; class Job; class TransferJob; class Slave; }
 class KIO_Protocol;
 
 class TQString;
-template<class T> class TQMemArray;
-typedef TQMemArray<char> TQByteArray;
 
 class KIO_Single_Subject : public TQObject
 { Q_OBJECT
diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp
index ae0ab8fd2..91da7a823 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/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 0346f3e8a..149fd55b0 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -195,7 +195,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 	delete groupBoxes;
 
 	AccountInput *input;
-	protocol->configFields( _groupBoxes, this, _accountinput );
+	protocol->configFields( _groupBoxes, TQT_TQOBJECT(this), _accountinput );
 	
 	for( unsigned int groupCounter = 0; groupCounter < _groupBoxes->count(); ++groupCounter )
 	{
@@ -205,14 +205,14 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
 		grid->setMargin( 15 );
 		for( input = _accountinput->first(); input; input = _accountinput->next() )
 		{
-			if( input->leftWidget() && _groupBoxes->at( groupCounter ) == input->leftWidget()->tqparent() )
+			if( input->leftWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->leftWidget()->tqparent()) )
 			{
 				grid->addWidget( input->leftWidget(), counter, 0 );
-				if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->tqparent() )
+				if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->tqparent()) )
 					grid->addWidget( input->rightWidget(), counter, 1 );
 				++counter;
 			} else {
-				if( input->rightWidget() && _groupBoxes->at( groupCounter ) == input->rightWidget()->tqparent() )
+				if( input->rightWidget() && TQT_BASE_OBJECT(_groupBoxes->at( groupCounter )) == TQT_BASE_OBJECT(input->rightWidget()->tqparent()) )
 				{
 					grid->addWidget( input->rightWidget(), counter, 1 );
 					++counter;
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index 58ffd4daf..ff6b034fd 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 487c48ba2..219cbcc0f 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() );
@@ -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 f7d30358f..78db0b256 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -99,11 +99,11 @@ void KornShell::readConfig()
 	KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) );
 	
 	if( tqlayout == 'H' )
-		_box = new HVContainer( TQt::Horizontal, this, "horizontal container" );
+		_box = new HVContainer( Qt::Horizontal, TQT_TQOBJECT(this), "horizontal container" );
 	else if( tqlayout == 'V' )
-		_box = new HVContainer( TQt::Vertical, this, "vertical container" );
+		_box = new HVContainer( Qt::Vertical, TQT_TQOBJECT(this), "vertical container" );
 	else
-		_box = new DockedContainer( this, "docked container" );
+		_box = new DockedContainer( TQT_TQOBJECT(this), "docked container" );
 
 	connect( _box, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( optionDlg() ) );
 			
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 b71205b14..ee675906f 100644
--- a/korn/mailsubject.cpp
+++ b/korn/mailsubject.cpp
@@ -54,7 +54,7 @@ TQString KornMailSubject::toString() const
 	date.setTime_t(_date);
 	return TQString("KornMailSubject, Id: ") + (_id?_id->toString():TQString("NULL")) + ", " + i18n("Subject:") + " " + _subject
 		+ ", " + i18n("Sender:") + " " + _sender + ", " + i18n("Size:") + " " + TQString::number(_size)
-		+ ", " + i18n("Date:") + " " + date.toString(TQt::ISODate);
+		+ ", " + i18n("Date:") + " " + date.toString(Qt::ISODate);
 }
 
 TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr)
diff --git a/korn/password.cpp b/korn/password.cpp
index f0ae5d8f3..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;
 
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index e97fd82ce..c42076426 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->tqcontains( "ssl" ) && *map->tqfind( "ssl" ) == "true" )
 		map->insert( "encryption", "ssl" );
 	if( metadata->tqcontains( "tls" ) )
-		map->insert( "encryption", TQString( "tls=%1" ).arg( *metadata->tqfind( "tls" ) ) );
+		map->insert( "encryption", TQString( "tls=%1" ).tqarg( *metadata->tqfind( "tls" ) ) );
 	if( metadata->tqcontains( "auth" ) )
 		map->insert( "auth", TQString( "auth=APOP" ) );
 }
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index f770d0750..333021c52 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -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();