1 files changed, 8 insertions, 8 deletions

diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9b1ef52a..749dc13f 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
 
   // if we are the current item and the view has focus, draw focus rect
   if ( mView->currentItem() == this && mView->hasFocus() ) {
-    mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
+    mView->style().drawPrimitive( TQStyle::PE_FocusRect, p,
         TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg,
         TQStyle::Style_FocusAtBorder,
         TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
@@ -587,10 +587,10 @@ CardView::CardView( TQWidget *parent, const char *name )
 
   viewport()->setMouseTracking( true );
   viewport()->setFocusProxy( this );
-  viewport()->setFocusPolicy(TQ_WheelFocus );
+  viewport()->setFocusPolicy(TQWidget::WheelFocus );
   viewport()->setBackgroundMode( PaletteBase );
 
-  connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) );
+  connect( d->mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryShowFullText() ) );
 
   setBackgroundMode( PaletteBackground, PaletteBase );
 
@@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
   emit clicked( item );
 
   // The RMB click
-  if ( e->button() & Qt::RightButton ) {
+  if ( e->button() & TQt::RightButton ) {
     // clear previous selection
     bool blocked = signalsBlocked();
     blockSignals( true );
@@ -1056,7 +1056,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
     item->repaintCard();
     emit selectionChanged();
   } else if ( d->mSelectionMode == CardView::Extended ) {
-    if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
+    if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
       if ( item == other )
         return;
 
@@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       }
 
       emit selectionChanged();
-    } else if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ControlButton) ) {
+    } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) {
       item->setSelected( !item->isSelected() );
       item->repaintCard();
       emit selectionChanged();
-    } else if ( e->button() & Qt::LeftButton ) {
+    } else if ( e->button() & TQt::LeftButton ) {
       bool b = signalsBlocked();
       blockSignals( true );
       selectAll( false );
@@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e )
       return;
   }
 
-  if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
+  if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) &&
        ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
 
     startDrag();