4 files changed, 10 insertions, 10 deletions
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index df956398e..66ec75d16 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -681,7 +681,7 @@ CardViewItem *CardView::itemAt( const TQPoint &viewPos ) const
   return 0;
 }
 
-TQRect CardView::tqitemRect( const CardViewItem *item ) const
+TQRect CardView::itemRect( const CardViewItem *item ) const
 {
   return TQRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
 }
@@ -1324,7 +1324,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
       break;
     case Key_Menu:
       emit contextMenuRequested( d->mCurrentItem, viewport()->mapToGlobal(
-                                 tqitemRect(d->mCurrentItem).center() ) );
+                                 itemRect(d->mCurrentItem).center() ) );
       break;
     default:
       if ( (e->state() & ControlButton) && e->key() == Key_A ) {
@@ -1462,7 +1462,7 @@ void CardView::tryShowFullText()
   CardViewItem *item = itemAt( cpos );
   if ( item ) {
     // query it for a value to display
-    TQPoint ipos = cpos - tqitemRect( item ).topLeft();
+    TQPoint ipos = cpos - itemRect( item ).topLeft();
     item->showFullString( ipos, d->mTip );
   }
 }
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index e3c29e5a4..4b6bbe7e1 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -245,7 +245,7 @@ class CardView : public TQScrollView
     /**
       @return The bounding rect of the given item.
      */
-    TQRect tqitemRect( const CardViewItem *item ) const;
+    TQRect itemRect( const CardViewItem *item ) const;
 
     /**
       Ensures that the given item is in the viewable area of the widget
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 8cacbfec6..de28c5d17 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -94,19 +94,19 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   c = KGlobalSettings::baseColor();
   lbColors->insertItem( new ColorListItem( i18n("Background Color"),
         config->readColorEntry( "BackgroundColor", &c ) ) );
-  c = tqcolorGroup().foreground();
+  c = colorGroup().foreground();
   lbColors->insertItem( new ColorListItem( i18n("Text Color"),
         config->readColorEntry( "TextColor", &c ) ) );
-  c = tqcolorGroup().button();
+  c = colorGroup().button();
   lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"),
         config->readColorEntry( "HeaderColor", &c ) ) );
-  c = tqcolorGroup().buttonText();
+  c = colorGroup().buttonText();
   lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
         config->readColorEntry( "HeaderTextColor", &c ) ) );
-  c = tqcolorGroup().highlight();
+  c = colorGroup().highlight();
   lbColors->insertItem( new ColorListItem( i18n("Highlight Color"),
         config->readColorEntry( "HighlightColor", &c ) ) );
-  c = tqcolorGroup().highlightedText();
+  c = colorGroup().highlightedText();
   lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"),
         config->readColorEntry( "HighlightedTextColor", &c ) ) );
 
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 0807cce64..c2b527945 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -72,7 +72,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
     return;
 
   TQString s;
-  TQRect r = plv->tqitemRect( lvi );
+  TQRect r = plv->itemRect( lvi );
   r.moveBy( posVp.x(), posVp.y() );
 
     //kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width()