1 files changed, 11 insertions, 11 deletions

diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 96e1e032..19f49200 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -142,9 +142,9 @@ public:
     {
         m_img = m_item->tooltipPreview();
         m_timer.start( 15000, true );
-        if( !isVisible() || tqsizeHint() != size() )
+        if( !isVisible() || sizeHint() != size() )
         {
-            resize( tqsizeHint() );
+            resize( sizeHint() );
             position();
         }
         if( !isVisible() )
@@ -168,8 +168,8 @@ public:
     {
         TQPixmap buf( width(), height() );
         TQPainter p( &buf );
-        buf.fill( tqcolorGroup().background() );
-        p.setPen( tqcolorGroup().foreground() );
+        buf.fill( colorGroup().background() );
+        p.setPen( colorGroup().foreground() );
         p.drawRect( buf.rect() );
 
         TQSimpleRichText text( m_item->tooltip(), TQToolTip::font() );
@@ -188,12 +188,12 @@ public:
             p.translate( m_img.width() + 10, 0 );
         }
 
-        text.draw( &p, 0, 0, rect(), tqcolorGroup() );
+        text.draw( &p, 0, 0, rect(), colorGroup() );
 
         painter->drawPixmap( 0, 0, buf );
     }
 
-    virtual TQSize tqsizeHint() const
+    virtual TQSize sizeHint() const
     {
         if( !m_item )
             return TQSize( 0, 0 );
@@ -217,7 +217,7 @@ public:
     void position()
     {
         const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() );
-        const TQSize size = tqsizeHint();
+        const TQSize size = sizeHint();
         const int width = size.width(), height = size.height();
         const TQRect tmp = m_item->rect();
         const TQRect irect( m_list->viewport()->mapToGlobal( m_list->contentsToViewport(tmp.topLeft()) ), tmp.size() );
@@ -1219,15 +1219,15 @@ TQString LayerItem::tooltip() const
 {
     TQString tip;
     tip += "<table cellspacing=\"0\" cellpadding=\"0\">";
-    tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").tqarg( displayName() );
+    tip += TQString("<tr><td colspan=\"2\" align=\"center\"><b>%1</b></td></tr>").arg( displayName() );
     TQString row = "<tr><td>%1</td><td>%2</td></tr>";
     for( int i = 0, n = listView()->d->properties.count(); i < n; ++i )
         if( !isFolder() || listView()->d->properties[i].validForFolders )
         {
             if( d->properties[i] )
-                tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "Yes" ) );
+                tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "Yes" ) );
             else
-                tip += row.tqarg( i18n( "%1:" ).tqarg( listView()->d->properties[i].displayName ) ).tqarg( i18n( "No" ) );
+                tip += row.arg( i18n( "%1:" ).arg( listView()->d->properties[i].displayName ) ).arg( i18n( "No" ) );
         }
     tip += "</table>";
     return tip;
@@ -1277,7 +1277,7 @@ void LayerItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int colum
 
     p.setFont( font() );
 
-    const TQColorGroup cg_ = isEnabled() ? listView()->tqpalette().active() : listView()->tqpalette().disabled();
+    const TQColorGroup cg_ = isEnabled() ? listView()->palette().active() : listView()->palette().disabled();
 
     const TQColor bg = isSelected()  ? cg_.highlight()
                     : isAlternate() ? listView()->alternateBackground()