1 files changed, 21 insertions, 21 deletions

diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index 6e6aad72..1f23da15 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -1227,17 +1227,17 @@ class Item::Private
 {
 public:
 	Private( Item *item )
-	 : tqlayoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) )
+	 : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) )
 	 , animateLayout( true ), opacity( 1.0 )
 	 , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) )
 	 , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true )
 	{
 	}
 
-	TQTimer tqlayoutTimer;
+	TQTimer layoutTimer;
 
-	//TQTimer tqlayoutAnimateTimer;
-	SharedTimerRef tqlayoutAnimateTimer;
+	//TQTimer layoutAnimateTimer;
+	SharedTimerRef layoutAnimateTimer;
 	SharedTimer &theLayoutAnimateTimer()
 	{
 		static SharedTimer timer( 10 );
@@ -1245,8 +1245,8 @@ public:
 	}
 	
 	bool animateLayout;
-	int tqlayoutAnimateSteps;
-	static const int tqlayoutAnimateStepsTotal = 10;
+	int layoutAnimateSteps;
+	static const int layoutAnimateStepsTotal = 10;
 
 	float opacity;
 
@@ -1306,8 +1306,8 @@ void Item::setEffects( bool animation, bool fading, bool folding )
 void Item::initLVI()
 {
 	connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) );
-	connect( &d->tqlayoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) );
-	//connect( &d->tqlayoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) );
+	connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) );
+	//connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) );
 	//connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) );
 	setVisible( false );
 	setTargetVisibility( true );
@@ -1323,13 +1323,13 @@ void Item::slotColumnResized()
 void Item::scheduleLayout()
 {
 	// perform a delayed tqlayout in order to speed it all up
-	if ( ! d->tqlayoutTimer.isActive() )
-		d->tqlayoutTimer.start( 30, true );
+	if ( ! d->layoutTimer.isActive() )
+		d->layoutTimer.start( 30, true );
 }
 
 void Item::slotLayoutItems()
 {
-	d->tqlayoutTimer.stop();
+	d->layoutTimer.stop();
 
 	for ( uint n = 0; n < components(); ++n )
 	{
@@ -1347,14 +1347,14 @@ void Item::slotLayoutItems()
 
 	if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() )
 	{
-		d->tqlayoutAnimateTimer.start();
-		//if ( !d->tqlayoutAnimateTimer.isActive() )
-		//	d->tqlayoutAnimateTimer.start( 10 );
-		d->tqlayoutAnimateSteps = 0;
+		d->layoutAnimateTimer.start();
+		//if ( !d->layoutAnimateTimer.isActive() )
+		//	d->layoutAnimateTimer.start( 10 );
+		d->layoutAnimateSteps = 0;
 	}
 	else
 	{
-		d->tqlayoutAnimateSteps = Private::tqlayoutAnimateStepsTotal;
+		d->layoutAnimateSteps = Private::layoutAnimateStepsTotal;
 		d->animateLayout = true;
 	}
 	slotLayoutAnimateItems();
@@ -1362,11 +1362,11 @@ void Item::slotLayoutItems()
 
 void Item::slotLayoutAnimateItems()
 {
-	if ( ++d->tqlayoutAnimateSteps >= Private::tqlayoutAnimateStepsTotal )
-		d->tqlayoutAnimateTimer.stop();
+	if ( ++d->layoutAnimateSteps >= Private::layoutAnimateStepsTotal )
+		d->layoutAnimateTimer.stop();
 
-	const int s = Private::tqlayoutAnimateStepsTotal;
-	const int p = TQMIN( d->tqlayoutAnimateSteps, s );
+	const int s = Private::layoutAnimateStepsTotal;
+	const int p = TQMIN( d->layoutAnimateSteps, s );
 
 	updateAnimationPosition( p, s );
 	setHeight(0);
@@ -1457,7 +1457,7 @@ void Item::slotUpdateVisibility()
 void Item::tqrepaint()
 {
 	// if we're about to retqlayout, don't bother painting yet.
-	if ( d->tqlayoutTimer.isActive() )
+	if ( d->layoutTimer.isActive() )
 		return;
 	listView()->repaintItem( this );
 }