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

7 files changed, 28 insertions, 27 deletions

diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index 135e11a09..eb11d0c22 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -181,8 +181,8 @@ void KonqInfoListViewWidget::rebuildView()
 
     if ( !viewport()->isUpdatesEnabled() )
     {
-        viewport()->setUpdatesEnabled( true );
-        setUpdatesEnabled( true );
+        viewport()->tqsetUpdatesEnabled( true );
+        tqsetUpdatesEnabled( true );
         triggerUpdate();
     }
 }
@@ -215,8 +215,8 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
 
     if ( !viewport()->isUpdatesEnabled() )
     {
-        viewport()->setUpdatesEnabled( true );
-        setUpdatesEnabled( true );
+        viewport()->tqsetUpdatesEnabled( true );
+        tqsetUpdatesEnabled( true );
         triggerUpdate();
     }
 
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 3307073de..a01a7aa2c 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -169,7 +169,7 @@ void ListViewBrowserExtension::rename()
      const TQString txt = le->text();
      TQString pattern;
      KMimeType::diagnoseFileName( txt, pattern );
-     if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.tqfind('*',1)==-1)
+     if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.tqfind('*',1)==-1)
          le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1);
      else
      {
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc
index a66dbb06c..a8f92c0d3 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -234,7 +234,7 @@ const TQPixmap* KonqListViewItem::pixmap( int column ) const
    if ((int)m_pixmaps.count() <= column)
       return 0;
 
-   TQPixmap *pm = m_pixmaps.at( column, &ok );
+   TQPixmap *pm = m_pixmaps.tqat( column, &ok );
    if( !ok )
       return 0;
    return pm;
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index d61518767..a39796579 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -259,7 +259,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
       //search the column in confColumns
       for ( unsigned int j = 0; j < NumberOfAtoms; j++ )
       {
-         if ( confColumns[j].name == *lstColumns.at(i) )
+         if ( confColumns[j].name == *lstColumns.tqat(i) )
          {
             confColumns[j].displayThisOne = true;
             confColumns[j].displayInColumn = currentColumn;
@@ -268,7 +268,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url )
             currentColumn++;
 
             if ( i < lstColumnWidths.count() )
-               confColumns[j].width = *lstColumnWidths.at(i);
+               confColumns[j].width = *lstColumnWidths.tqat(i);
             else
             {
                // Default Column widths
@@ -984,7 +984,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
 
 	 if (_item->pixmap(0) != 0)
 	 {
-	   // Rect of the QListViewItem's pixmap area.
+	   // Rect of the TQListViewItem's pixmap area.
            TQRect rect = _item->listView()->tqitemRect(_item);
 
 	   // calculate nesting depth
@@ -1192,8 +1192,8 @@ void KonqBaseListViewWidget::setComplete()
 
    if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() )
    {
-      viewport()->setUpdatesEnabled( true );
-      setUpdatesEnabled( true );
+      viewport()->tqsetUpdatesEnabled( true );
+      tqsetUpdatesEnabled( true );
       triggerUpdate();
    }
 
@@ -1237,8 +1237,8 @@ void KonqBaseListViewWidget::slotClear()
    m_pBrowserView->resetCount();
    m_pBrowserView->lstPendingMimeIconItems().clear();
 
-   viewport()->setUpdatesEnabled( false );
-   setUpdatesEnabled( false );
+   viewport()->tqsetUpdatesEnabled( false );
+   tqsetUpdatesEnabled( false );
    clear();
 }
 
@@ -1268,8 +1268,8 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
 
    if ( !viewport()->isUpdatesEnabled() )
    {
-      viewport()->setUpdatesEnabled( true );
-      setUpdatesEnabled( true );
+      viewport()->tqsetUpdatesEnabled( true );
+      tqsetUpdatesEnabled( true );
       triggerUpdate();
    }
    slotUpdateBackground();
@@ -1301,7 +1301,7 @@ void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem )
       }
 
       delete &(*it);
-      // HACK HACK HACK: QListViewItem/KonqBaseListViewItem should
+      // HACK HACK HACK: TQListViewItem/KonqBaseListViewItem should
       // take care and the source looks like it does; till the
       // real bug is found, this fixes some crashes (malte)
       emit selectionChanged();
@@ -1314,8 +1314,8 @@ void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem )
   // OK, but this code also gets activated when deleting a hidden file... (dfaure)
   if ( !viewport()->isUpdatesEnabled() )
   {
-    viewport()->setUpdatesEnabled( true );
-    setUpdatesEnabled( true );
+    viewport()->tqsetUpdatesEnabled( true );
+    tqsetUpdatesEnabled( true );
     triggerUpdate();
   }
   slotUpdateBackground();
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 7d57c202f..0ad11fc17 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -80,6 +80,7 @@ class KonqBaseListViewWidget : public KListView
    friend class ListViewBrowserExtension;
 
    Q_OBJECT
+   TQ_OBJECT
 public:
    KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget );
    virtual ~KonqBaseListViewWidget();
@@ -161,7 +162,7 @@ public slots:
 protected slots:
    void slotAutoScroll();
 
-   // from QListView
+   // from TQListView
    virtual void slotReturnPressed( TQListViewItem *_item );
    virtual void slotCurrentChanged( TQListViewItem *_item ) { slotOnItem( _item ); }
 
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc
index f3e9140d3..2012b6480 100644
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cc
@@ -101,8 +101,8 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries )
 
    if ( !viewport()->isUpdatesEnabled() )
    {
-      viewport()->setUpdatesEnabled( true );
-      setUpdatesEnabled( true );
+      viewport()->tqsetUpdatesEnabled( true );
+      tqsetUpdatesEnabled( true );
       triggerUpdate();
    }
    slotUpdateBackground();
@@ -146,8 +146,8 @@ void KonqTextViewWidget::setComplete()
 
    if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() )
    {
-      viewport()->setUpdatesEnabled( true );
-      setUpdatesEnabled( true );
+      viewport()->tqsetUpdatesEnabled( true );
+      tqsetUpdatesEnabled( true );
       triggerUpdate();
    }
 }
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc
index 5fefc8133..1f19cf979 100644
--- a/konqueror/listview/konq_treeviewwidget.cc
+++ b/konqueror/listview/konq_treeviewwidget.cc
@@ -121,8 +121,8 @@ void KonqTreeViewWidget::slotCompleted( const KURL & _url )
 
     if ( !viewport()->isUpdatesEnabled() )
     {
-        viewport()->setUpdatesEnabled( true );
-        setUpdatesEnabled( true );
+        viewport()->tqsetUpdatesEnabled( true );
+        tqsetUpdatesEnabled( true );
         triggerUpdate();
     }
 }
@@ -268,8 +268,8 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
 
     if ( !viewport()->isUpdatesEnabled() )
     {
-        viewport()->setUpdatesEnabled( true );
-        setUpdatesEnabled( true );
+        viewport()->tqsetUpdatesEnabled( true );
+        tqsetUpdatesEnabled( true );
         triggerUpdate();
     }