1 files changed, 12 insertions, 12 deletions

diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 4dec01904..c4976f232 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -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( objId() ).arg( accountName )
+	TQVBox *mainvtqlayout = popup->standardView( i18n( "KOrn - %1/%2 (total: %3)" ).arg( objId() ).arg( accountName )
 			.arg( total ), "", TQPixmap(), 0 );
-	TQGrid *mainglayout = new TQGrid( date ? 3 : 2 ,mainvlayout, "Grid-Layout" );
+	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( Qt::AlignHCenter | Qt::AlignVCenter );
+		label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
 		label->setText( TQString::number( count ) );
 	}
 	
@@ -358,7 +358,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 		for( int yy = 0; yy < numberImage.width(); ++yy )
 		{
 			//Set colour and alpha channel
-			rgbline[ yy ] = qRgba( fgColour.red(), fgColour.green(), fgColour.blue(), qRed( rgbline[ yy ] ) ); 
+			rgbline[ yy ] = tqRgba( fgColour.red(), fgColour.green(), fgColour.blue(), tqRed( rgbline[ yy ] ) ); 
 		}
 	}
 
@@ -371,7 +371,7 @@ TQPixmap BoxContainerItem::calcComplexPixmap( const TQPixmap &icon, const TQColo
 
 void BoxContainerItem::setAnimIcon( TQLabel* label, const TQString& anim )
 {
-	label->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+	label->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
 	label->setMovie( TQMovie( anim ) );
 	label->show();
 }