Rename a number of old tq methods that are no longer tq specific

12 files changed, 50 insertions, 50 deletions

diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc
index 842f870ec..b06baaf7d 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cc
@@ -206,7 +206,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled )
     setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) );
 }
 
-void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
+void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
 {
     TQColorGroup cg( _cg );
 
@@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup &
         _width = newWidth;
     }
 
-    KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
+    KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
 }
 
 void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h
index 2ba7b8067..e81928118 100644
--- a/konqueror/listview/konq_infolistviewitem.h
+++ b/konqueror/listview/konq_infolistviewitem.h
@@ -56,7 +56,7 @@ class KonqInfoListViewItem : public KonqBaseListViewItem
       virtual ~KonqInfoListViewItem() { }
 
       virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
-                              int column, int width, int tqalignment );
+                              int column, int width, int alignment );
       virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
       virtual void updateContents();
       virtual void setDisabled( bool disabled );
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index 6adf36feb..ff829c4c0 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -181,8 +181,8 @@ void KonqInfoListViewWidget::rebuildView()
 
     if ( !viewport()->isUpdatesEnabled() )
     {
-        viewport()->tqsetUpdatesEnabled( true );
-        tqsetUpdatesEnabled( true );
+        viewport()->setUpdatesEnabled( true );
+        setUpdatesEnabled( true );
         triggerUpdate();
     }
 }
@@ -215,8 +215,8 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
 
     if ( !viewport()->isUpdatesEnabled() )
     {
-        viewport()->tqsetUpdatesEnabled( true );
-        tqsetUpdatesEnabled( true );
+        viewport()->setUpdatesEnabled( true );
+        setUpdatesEnabled( true );
         triggerUpdate();
     }
 
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 61e30d269..040da4b10 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -37,7 +37,7 @@
 #include <kmimetype.h>
 
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqheader.h>
 #include <tqregexp.h>
 
@@ -144,7 +144,7 @@ void ListViewBrowserExtension::updateActions()
 void ListViewBrowserExtension::copySelection( bool move )
 {
   KonqDrag *urlData = new KonqDrag( m_listView->listViewWidget()->selectedUrls(false), m_listView->listViewWidget()->selectedUrls(true), move );
-  TQApplication::tqclipboard()->setData( urlData );
+  TQApplication::clipboard()->setData( urlData );
 }
 
 void ListViewBrowserExtension::paste()
@@ -169,7 +169,7 @@ void ListViewBrowserExtension::rename()
      const TQString txt = le->text();
      TQString pattern;
      KMimeType::diagnoseFileName( txt, pattern );
-     if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.find('*',1)==-1)
+     if (!pattern.isEmpty() && pattern.at(0)=='*' && pattern.find('*',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 b47e43ede..016f3d77a 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cc
@@ -173,7 +173,7 @@ void KonqListViewItem::setActive( bool active )
     if ( m_bActive == active )
         return;
 
-    //#### Optimize away tqrepaint if possible, like the iconview does?
+    //#### Optimize away repaint if possible, like the iconview does?
     KonqBaseListViewItem::setActive( active );
     int iconSize = m_pListViewWidget->iconSize();
     iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small
@@ -203,7 +203,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm )
    int newWidth = pm.isNull() ? 0 : pm.width();
    int newHeight = pm.isNull() ? 0 : pm.height();
 
-   // If the height or width have changed then we're going to have to tqrepaint
+   // If the height or width have changed then we're going to have to repaint
    // this whole thing.  Fortunately since most of the calls are coming from
    // setActive() this is the uncommon case.
 
@@ -234,7 +234,7 @@ const TQPixmap* KonqListViewItem::pixmap( int column ) const
    if ((int)m_pixmaps.count() <= column)
       return 0;
 
-   TQPixmap *pm = m_pixmaps.tqat( column, &ok );
+   TQPixmap *pm = m_pixmaps.at( column, &ok );
    if( !ok )
       return 0;
    return pm;
@@ -294,7 +294,7 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending
    }
 }
 
-void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
+void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
 {
     TQColorGroup cg( _cg );
 
@@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
         _width = newWidth;
     }
 
-    KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
+    KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
 }
 
 void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r )
@@ -421,7 +421,7 @@ KonqBaseListViewItem::~KonqBaseListViewItem()
 
 TQRect KonqBaseListViewItem::rect() const
 {
-    TQRect r = m_pListViewWidget->tqitemRect(this);
+    TQRect r = m_pListViewWidget->itemRect(this);
     return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) );
 }
 
diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h
index 8e78b10f0..b54f1c2db 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -107,7 +107,7 @@ class KonqListViewItem : public KonqBaseListViewItem
       virtual ~KonqListViewItem();
 
       virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg,
-                              int column, int width, int tqalignment );
+                              int column, int width, int alignment );
       virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r );
       virtual void updateContents();
       virtual void setDisabled( bool disabled );
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index 97bddf559..04e56d34b 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -107,7 +107,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
 {
    kdDebug(1202) << "+KonqBaseListViewWidget" << endl;
 
-   m_dirLister->setMainWindow(tqtopLevelWidget());
+   m_dirLister->setMainWindow(topLevelWidget());
 
    m_bTopLevelComplete  = true;
 
@@ -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.tqat(i) )
+         if ( confColumns[j].name == *lstColumns.at(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.tqat(i);
+               confColumns[j].width = *lstColumnWidths.at(i);
             else
             {
                // Default Column widths
@@ -489,7 +489,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
          emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() );
          m_pBrowserView->emitMouseOver( item->item() );
 
-         vp.setY( tqitemRect( item ).y() );
+         vp.setY( itemRect( item ).y() );
          TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
          m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) );
          m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) );
@@ -553,7 +553,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
    pt = contentsToViewport( pt );
    tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
                           TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
-                          tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base() );
+                          colorGroup(), TQStyle::Style_Default, colorGroup().base() );
    
 }
 
@@ -591,9 +591,9 @@ void KonqBaseListViewWidget::slotAutoScroll()
    {
          TQRect rect;
       if ( allColumnsShowFocus() )
-          rect = tqitemRect( cur );
+          rect = itemRect( cur );
       else {
-          rect = tqitemRect( cur );
+          rect = itemRect( cur );
           rect.setWidth( executeArea( cur ) );
       }
   
@@ -623,7 +623,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 	    {
                setSelected( cur, true );
                changed = TRUE;
-               rr = rr.unite( tqitemRect( cur ) );
+               rr = rr.unite( itemRect( cur ) );
 	    }
          } 
 	 else 
@@ -631,7 +631,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
             if ( cur->isSelected() )
 	    {
                changed = TRUE;
-               rr = rr.unite( tqitemRect( cur ) );
+               rr = rr.unite( itemRect( cur ) );
 	    }
 	    
 	    if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
@@ -659,7 +659,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 	    {
                setSelected( cur, true );
                changed = TRUE;
-               rr = rr.unite( tqitemRect( cur ) );
+               rr = rr.unite( itemRect( cur ) );
 	    }
 	 }
 	 else 
@@ -667,7 +667,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
             if ( cur->isSelected() )
 	    {
                changed = TRUE;
-              rr = rr.unite( tqitemRect( cur ) );
+              rr = rr.unite( itemRect( cur ) );
 	    }
 
             if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
@@ -985,7 +985,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
 	 if (_item->pixmap(0) != 0)
 	 {
 	   // Rect of the TQListViewItem's pixmap area.
-           TQRect rect = _item->listView()->tqitemRect(_item);
+           TQRect rect = _item->listView()->itemRect(_item);
 
 	   // calculate nesting depth
 	   int nestingDepth = 0;
@@ -1111,7 +1111,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url )
       args.yOffset = contentsY();
       m_pBrowserView->extension()->setURLArgs( args );
 
-      if ( currentItem() && tqitemRect( currentItem() ).isValid() )
+      if ( currentItem() && itemRect( currentItem() ).isValid() )
          m_itemToGoTo = currentItem()->text(0);
 
       m_pBrowserView->m_filesToSelect.clear();
@@ -1192,8 +1192,8 @@ void KonqBaseListViewWidget::setComplete()
 
    if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() )
    {
-      viewport()->tqsetUpdatesEnabled( true );
-      tqsetUpdatesEnabled( true );
+      viewport()->setUpdatesEnabled( true );
+      setUpdatesEnabled( true );
       triggerUpdate();
    }
 
@@ -1237,8 +1237,8 @@ void KonqBaseListViewWidget::slotClear()
    m_pBrowserView->resetCount();
    m_pBrowserView->lstPendingMimeIconItems().clear();
 
-   viewport()->tqsetUpdatesEnabled( false );
-   tqsetUpdatesEnabled( false );
+   viewport()->setUpdatesEnabled( false );
+   setUpdatesEnabled( false );
    clear();
 }
 
@@ -1268,8 +1268,8 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
 
    if ( !viewport()->isUpdatesEnabled() )
    {
-      viewport()->tqsetUpdatesEnabled( true );
-      tqsetUpdatesEnabled( true );
+      viewport()->setUpdatesEnabled( true );
+      setUpdatesEnabled( true );
       triggerUpdate();
    }
    slotUpdateBackground();
@@ -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()->tqsetUpdatesEnabled( true );
-    tqsetUpdatesEnabled( true );
+    viewport()->setUpdatesEnabled( true );
+    setUpdatesEnabled( true );
     triggerUpdate();
   }
   slotUpdateBackground();
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index c55996306..6224be965 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -177,7 +177,7 @@ protected slots:
    virtual void slotRedirection( const KURL & );
    void slotPopupMenu( TQListViewItem *, const TQPoint&, int );
 
-   // forces a tqrepaint on column size changes / branch expansion
+   // forces a repaint on column size changes / branch expansion
    // when there is a background pixmap
    void slotUpdateBackground();
 
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc
index 0d40ecfce..8e03e171e 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cc
@@ -200,7 +200,7 @@ void KonqTextViewItem::updateContents()
    };
 }
 
-void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment )
+void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment )
 {
    TQColorGroup cg( _cg );
    cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]);
@@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg,
 //   cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]);
 //   cg.setColor(TQColorGroup::Highlight, Qt::darkGray);
 
-   KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment );
+   KListViewItem::paintCell( _painter, cg, _column, _width, _alignment );
 }
 
 /*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r )
diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h
index 02a534688..f091781e2 100644
--- a/konqueror/listview/konq_textviewitem.h
+++ b/konqueror/listview/konq_textviewitem.h
@@ -57,7 +57,7 @@ class KonqTextViewItem : public KonqBaseListViewItem
 //      virtual TQString key( int _column, bool asc) const;
       /** Call this before destroying the text view (decreases reference count
        * on the view)*/
-      virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment );
+      virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment );
 //      virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r );
       virtual void updateContents();
 
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc
index 3076aa7ac..32de25351 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()->tqsetUpdatesEnabled( true );
-      tqsetUpdatesEnabled( true );
+      viewport()->setUpdatesEnabled( true );
+      setUpdatesEnabled( true );
       triggerUpdate();
    }
    slotUpdateBackground();
@@ -146,8 +146,8 @@ void KonqTextViewWidget::setComplete()
 
    if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() )
    {
-      viewport()->tqsetUpdatesEnabled( true );
-      tqsetUpdatesEnabled( true );
+      viewport()->setUpdatesEnabled( true );
+      setUpdatesEnabled( true );
       triggerUpdate();
    }
 }
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc
index 624e74eaf..4d04f2fa4 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()->tqsetUpdatesEnabled( true );
-        tqsetUpdatesEnabled( true );
+        viewport()->setUpdatesEnabled( true );
+        setUpdatesEnabled( true );
         triggerUpdate();
     }
 }
@@ -268,8 +268,8 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
 
     if ( !viewport()->isUpdatesEnabled() )
     {
-        viewport()->tqsetUpdatesEnabled( true );
-        tqsetUpdatesEnabled( true );
+        viewport()->setUpdatesEnabled( true );
+        setUpdatesEnabled( true );
         triggerUpdate();
     }