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, 10 insertions, 10 deletions

diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc
index 9bd39a86e..0f13236e5 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cc
@@ -272,14 +272,14 @@ void KonqCombo::updateItem( const TQPixmap& pix, const TQString& t, int index, c
     listBox()->changeItem( item, index );
 
     /*
-    setUpdatesEnabled( false );
-    lineEdit()->setUpdatesEnabled( false );
+    tqsetUpdatesEnabled( false );
+    lineEdit()->tqsetUpdatesEnabled( false );
 
     removeItem( index );
     insertItem( pix, t, index );
 
-    setUpdatesEnabled( true );
-    lineEdit()->setUpdatesEnabled( true );
+    tqsetUpdatesEnabled( true );
+    lineEdit()->tqsetUpdatesEnabled( true );
     update();
     */
 }
@@ -301,12 +301,12 @@ void KonqCombo::updatePixmaps()
 {
     saveState();
 
-    setUpdatesEnabled( false );
+    tqsetUpdatesEnabled( false );
     KonqPixmapProvider *prov = KonqPixmapProvider::self();
     for ( int i = 1; i < count(); i++ ) {
         updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) );
     }
-    setUpdatesEnabled( true );
+    tqsetUpdatesEnabled( true );
     tqrepaint();
 
     restoreState();
@@ -521,15 +521,15 @@ void KonqCombo::slotRemoved( const TQString& item )
 
 void KonqCombo::removeURL( const TQString& url )
 {
-    setUpdatesEnabled( false );
-    lineEdit()->setUpdatesEnabled( false );
+    tqsetUpdatesEnabled( false );
+    lineEdit()->tqsetUpdatesEnabled( false );
 
     removeFromHistory( url );
     applyPermanent();
     setTemporary( currentText() );
 
-    setUpdatesEnabled( true );
-    lineEdit()->setUpdatesEnabled( true );
+    tqsetUpdatesEnabled( true );
+    lineEdit()->tqsetUpdatesEnabled( true );
     update();
 }