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

1 files changed, 12 insertions, 12 deletions

diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index 584780c8e..e982330b8 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -23,7 +23,7 @@
 #include <tqhbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpixmap.h>
 #include <tqsplitter.h>
@@ -518,7 +518,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
   TQObjectList l = mSwallowPage->childrenListObject(); // silence please
   for( uint i=0; i < l.count(); i++ )
   {
-    TQObject *o = l.tqat(i);
+    TQObject *o = l.at(i);
     if( o->isWidgetType() )
     {
       ((TQWidget*)o)->hide();
@@ -542,7 +542,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
     }
     gbox->addWidget(widget, 0, 0 );
     gbox->activate();
-    mSwallowPage->setMinimumSize( widget->tqminimumSize() );
+    mSwallowPage->setMinimumSize( widget->minimumSize() );
   }
 
   return true;
@@ -769,20 +769,20 @@ TQSize KJanusWidget::minimumSizeHint() const
 
     if( mFace == TreeList )
     {
-      s1.rwidth() += tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth );
-      s2 = mTreeList->tqminimumSize();
+      s1.rwidth() += tqstyle().pixelMetric( TQStyle::PM_SplitterWidth );
+      s2 = mTreeList->minimumSize();
     }
     else
     {
       mIconList->updateMinimumHeight();
       mIconList->updateWidth();
-      s2 = mIconList->tqminimumSize();
+      s2 = mIconList->minimumSize();
     }
 
     if( mTitleLabel->isVisible() )
     {
       s3 += mTitleLabel->sizeHint();
-      s3.rheight() += mTitleSep->tqminimumSize().height();
+      s3.rheight() += mTitleSep->minimumSize().height();
     }
 
     //
@@ -799,7 +799,7 @@ TQSize KJanusWidget::minimumSizeHint() const
   }
   else if( mFace == Swallow )
   {
-    return mSwallowPage->tqminimumSize();
+    return mSwallowPage->minimumSize();
   }
   else if( mFace == Plain )
   {
@@ -1074,13 +1074,13 @@ void KJanusWidget::IconListItem::highlight( bool erase )
    // For now, always disable highlighting
    erase = true;
 
-   TQRect r = listBox()->tqitemRect( this );
+   TQRect r = listBox()->itemRect( this );
    r.addCoords( 1, 1, -1, -1 );
 
    TQPainter p( listBox()->viewport() );
    p.setClipRegion( r );
 
-   const TQColorGroup &cg = listBox()->tqcolorGroup();
+   const TQColorGroup &cg = listBox()->colorGroup();
    if ( erase )
    {
       p.setPen( cg.base() );
@@ -1129,7 +1129,7 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap()
 
 void KJanusWidget::IconListItem::paint( TQPainter *painter )
 {
-  TQRect itemPaintRegion( listBox()->tqitemRect( this ) );
+  TQRect itemPaintRegion( listBox()->itemRect( this ) );
   TQRect r( 1, 1, itemPaintRegion.width() - 2, itemPaintRegion.height() - 2);
 
   if ( isSelected() )
@@ -1137,7 +1137,7 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter )
     painter->eraseRect( r );
 
     painter->save();
-    painter->setPen( listBox()->tqcolorGroup().highlight().dark( 160 ) );
+    painter->setPen( listBox()->colorGroup().highlight().dark( 160 ) );
     painter->drawRect( r );
     painter->restore();
   }