Allow kdebase to (mostly) function correctly with TQt for Qt4

Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch)
Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)


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

1 files changed, 7 insertions, 7 deletions

diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 72dca2567..1fb2d6ad3 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -414,7 +414,7 @@ void KasBar::updateLayout()
     if ( !isUpdatesEnabled() )
 	return;
     bool updates = isUpdatesEnabled();
-    setUpdatesEnabled( false );
+    tqsetUpdatesEnabled( false );
 
 // This is for testing a rectangular layout
 //    boxesPerLine_ = (uint) ceil(sqrt( items.count() ));
@@ -443,7 +443,7 @@ void KasBar::updateLayout()
        resize( sz );
    }
 
-   setUpdatesEnabled( updates );
+   tqsetUpdatesEnabled( updates );
 
    TQWidget *top = tqtopLevelWidget();
    TQRegion mask;
@@ -451,24 +451,24 @@ void KasBar::updateLayout()
    KasItem *i;
    if ( orient == Qt::Horizontal ) {
        for ( i = items.first(); i; i = items.next() ) {
-	   int x = (items.at() % c) * itemExtent();
+	   int x = (items.tqat() % c) * itemExtent();
 
 	   if ( direction_ == TQBoxLayout::RightToLeft )
 	       x = width() - x - itemExtent();
 
-	   i->setPos( x, (items.at() / c) * itemExtent() );
+	   i->setPos( x, (items.tqat() / c) * itemExtent() );
 	   i->update();
 	   mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) );
        }
    }
    else {
        for ( i = items.first(); i; i = items.next() ) {
-	   int y = (items.at() / r) * itemExtent();
+	   int y = (items.tqat() / r) * itemExtent();
 
 	   if ( direction_ == TQBoxLayout::BottomToTop )
 	       y = height() - y - itemExtent();
 
-	   i->setPos( (items.at() % r) * itemExtent(), y );
+	   i->setPos( (items.tqat() % r) * itemExtent(), y );
 	   i->update();
 	   mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) );
        }
@@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev)
     TQPainter p( &offscreen );
     paintBackground( &p, TQRect(TQPoint(0,0),size()) );
     TQWidget::resizeEvent(ev);
-    emit layoutChanged();
+    emit tqlayoutChanged();
 }