Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 176 insertions, 166 deletions

diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 5c8ccf827..9149c6536 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 
@@ -39,11 +39,11 @@
 
 #define MIN_ITEM_WIDTH 80
 
-class CardViewTip : public QLabel
+class CardViewTip : public TQLabel
 {
   public:
-    CardViewTip( TQWidget *parent = 0, const char *name = 0 )
-      : TQLabel( parent, name )
+    CardViewTip( TQWidget *tqparent = 0, const char *name = 0 )
+      : TQLabel( tqparent, name )
     {
       setPalette( TQToolTip::palette() );
       setFrameStyle( Panel | Plain );
@@ -61,7 +61,7 @@ class CardViewTip : public QLabel
 };
 
 //
-// Warning: make sure you use findRef() instead of find() to find an
+// Warning: make sure you use findRef() instead of tqfind() to find an
 //          item! Only the pointer value is unique in the list.
 //
 class CardViewItemList : public TQPtrList<CardViewItem>
@@ -136,7 +136,7 @@ class CardViewPrivate
        mCurrentItem( 0L ),
        mLastClickPos( TQPoint(0, 0) ),
        mRubberBandAnchor( 0 ),
-       mCompText( TQString::null )
+       mCompText( TQString() )
     {};
 
     CardViewItemList mItemList;
@@ -192,8 +192,8 @@ class CardViewItemPrivate
 };
 
 
-CardViewItem::CardViewItem( CardView *parent, const TQString &caption )
-  : d( new CardViewItemPrivate() ), mView( parent )
+CardViewItem::CardViewItem( CardView *tqparent, const TQString &caption )
+  : d( new CardViewItemPrivate() ), mView( tqparent )
 {
   d->mCaption = caption;
 
@@ -238,7 +238,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
   int h = height() - ( mg * 2 );
   const int colonWidth( fm.width( ":" ) );
   int labelXPos = 2 + mg;
-  int labelWidth = QMIN( w / 2 - 4 - mg, d->maxLabelWidth + colonWidth + 4 );
+  int labelWidth = TQMIN( w / 2 - 4 - mg, d->maxLabelWidth + colonWidth + 4 );
   int valueXPos = labelWidth + 4 + mg;
   int valueWidth = w - labelWidth - 4 - mg;
 
@@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const
   for ( iter.toFirst(); iter.current(); ++iter ) {
     if ( !sef && (*iter)->second.isEmpty() )
       continue;
-    lines = QMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines );
+    lines = TQMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines );
     fieldHeight += ( lines * fh ) + 2;
   }
 
@@ -383,7 +383,7 @@ void CardViewItem::insertField( const TQString &label, const TQString &value )
 
   if ( mView ) {
     mView->setLayoutDirty( true );
-    d->maxLabelWidth = QMAX( mView->d->mFm->width( label ), d->maxLabelWidth );
+    d->maxLabelWidth = TQMAX( mView->d->mFm->width( label ), d->maxLabelWidth );
   }
 }
 
@@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     Field *_f;
     for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() )
       if ( se || ! _f->second.isEmpty() )
-        y += ( QMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2;
+        y += ( TQMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2;
 
     if ( isLabel && itempos.y() > y + fh )
       return;
@@ -515,13 +515,13 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     s = isLabel ? f->first : f->second;
 
     int colonWidth = mView->d->mFm->width(":");
-    lw = drawLabels ? QMIN( w / 2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) : 0;
+    lw = drawLabels ? TQMIN( w / 2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) : 0;
     int mw = isLabel ? lw - colonWidth : w - lw - ( mrg * 2 );
     if ( isLabel ) {
       trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
     } else {
-      TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) );
-      trimmed = r.width() > mw || r.height() / fh >  QMIN( s.tqcontains( '\n' ) + 1, maxLines );
+      TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, TQt::AlignTop|TQt::AlignLeft, s ) );
+      trimmed = r.width() > mw || r.height() / fh >  TQMIN( s.tqcontains( '\n' ) + 1, maxLines );
     }
   }
 
@@ -539,7 +539,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip )
     if ( pnt.x() + tip->width() > mView->visibleWidth() )
       pnt.setX( mView->visibleWidth() - tip->width() );
     if ( pnt.y() + tip->height() > mView->visibleHeight() )
-      pnt.setY( QMAX( 0, mView->visibleHeight() - tip->height() ) );
+      pnt.setY( TQMAX( 0, mView->visibleHeight() - tip->height() ) );
     // show
     tip->move( pnt );
     tip->show();
@@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
   Field *f;
   for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) {
     if ( showEmpty || !f->second.isEmpty() )
-      ypos += (QMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2;
+      ypos += (TQMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2;
     if ( iy <= ypos )
       break;
   }
@@ -569,8 +569,8 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const
 }
 
 
-CardView::CardView( TQWidget *parent, const char *name )
-  : TQScrollView( parent, name ),
+CardView::CardView( TQWidget *tqparent, const char *name )
+  : TQScrollView( tqparent, name ),
     d( new CardViewPrivate() )
 {
   d->mItemList.setAutoDelete( true );
@@ -805,7 +805,7 @@ int CardView::childCount() const
 }
 
 CardViewItem *CardView::findItem( const TQString &text, const TQString &label,
-                                  Qt::StringComparisonMode compare ) const
+                                  TQt::StringComparisonMode compare ) const
 {
   // If the text is empty, we will return null, since empty text will
   // match anything!
@@ -813,7 +813,7 @@ CardViewItem *CardView::findItem( const TQString &text, const TQString &label,
     return 0;
 
   TQPtrListIterator<CardViewItem> iter( d->mItemList );
-  if ( compare & Qt::BeginsWith ) {
+  if ( compare & TQt::BeginsWith ) {
     TQString value;
     for ( iter.toFirst(); iter.current(); ++iter ) {
       value = (*iter)->fieldValue( label ).upper();
@@ -915,7 +915,7 @@ void CardView::calcLayout()
     yPos += cardSpacing;
 
     if ( yPos + item->height() + cardSpacing >= height() - horizontalScrollBar()->height() ) {
-      maxHeight = QMAX( maxHeight, yPos );
+      maxHeight = TQMAX( maxHeight, yPos );
 
       // Drawing in this column would be greater than the height
       // of the scroll view, so move to next column
@@ -936,7 +936,7 @@ void CardView::calcLayout()
     item->d->y = yPos;
 
     yPos += item->height();
-    maxWidth = QMAX( maxWidth, d->mItemWidth );
+    maxWidth = TQMAX( maxWidth, d->mItemWidth );
   }
 
   xPos += maxWidth;
@@ -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->tqrepaintCard();
     emit selectionChanged();
   } else if ( d->mSelectionMode == CardView::Extended ) {
-    if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::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() & Qt::ControlButton) ) {
+    } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) {
       item->setSelected( !item->isSelected() );
       item->tqrepaintCard();
       emit selectionChanged();
-    } else if ( e->button() & Qt::LeftButton ) {
+    } else if ( e->button() & TQt::LeftButton ) {
       bool b = signalsBlocked();
       blockSignals( true );
       selectAll( false );
@@ -1111,7 +1111,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e )
     drawRubberBands( 0 );
     // we should move to reflect the new position if we are scrolled.
     if ( contentsX() ) {
-      int newX = QMAX( 0, ( d->mPressed * ( newiw + d->mColspace + d->mSepWidth ) ) - e->x() );
+      int newX = TQMAX( 0, ( d->mPressed * ( newiw + d->mColspace + d->mSepWidth ) ) - e->x() );
       setContentsPos( newX, contentsY() );
     }
     // set new item width
@@ -1123,7 +1123,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e )
   }
 
   // If there are accel keys, we will not emit signals
-  if ( (e->state() & Qt::ShiftButton) || (e->state() & Qt::ControlButton) )
+  if ( (e->state() & TQt::ShiftButton) || (e->state() & TQt::ControlButton) )
     return;
 
   // Get the item at this position
@@ -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();
@@ -1283,7 +1283,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
       if ( contentsX() <= 0 )
         return;
       int cw = columnWidth();
-      int theCol = ( QMAX( 0, ( contentsX() / cw) * cw ) ) + d->mItemSpacing;
+      int theCol = ( TQMAX( 0, ( contentsX() / cw) * cw ) ) + d->mItemSpacing;
       aItem = itemAt( TQPoint( theCol + 1, d->mItemSpacing + 1 ) );
       if ( aItem )
         setCurrentItem( aItem );
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index a5410419a..0001fcfb9 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CARDVIEW_H
@@ -55,21 +55,21 @@ class CardViewItem
       A single field in the card view. The first item is the label
       and the second item is the value.
      */
-    typedef QPair<TQString, TQString> Field;
+    typedef TQPair<TQString, TQString> Field;
 
     /**
       Constructor.
 
-      @param parent The CardView that this card should be displayed on.
+      @param tqparent The CardView that this card should be displayed on.
       @param caption The caption of the card. This is the text that will
       appear at the top of the card. This is also the string that will
       be used to sort the cards in the view.
      */
-    CardViewItem( CardView *parent, const TQString &caption = TQString() );
+    CardViewItem( CardView *tqparent, const TQString &caption = TQString() );
     virtual ~CardViewItem();
 
     /**
-      @return The caption of the card, or TQString::null if none was ever set.
+      @return The caption of the card, or TQString() if none was ever set.
      */
     const TQString &caption() const;
 
@@ -129,7 +129,7 @@ class CardViewItem
     bool isSelected() const;
 
     /**
-      Called by the parent card view when the mouse has been resting for
+      Called by the tqparent card view when the mouse has been resting for
       a certain amount of time. If the label or value at pos is obscured
       (trimmed) make the label display the full text.
      */
@@ -191,22 +191,23 @@ class CardViewItem
   can be used elsewhere. With the exception of a few simple config checks,
   the CardView is also 100% independant of KDE.
  */
-class CardView : public QScrollView
+class CardView : public TQScrollView
 {
   friend class CardViewItem;
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
       Constructor.
      */
-    CardView( TQWidget *parent, const char *name );
+    CardView( TQWidget *tqparent, const char *name );
     virtual ~CardView();
 
     /**
       Inserts the item into the card view. This method does not have
-      to be called if you created the item with a proper parent. Once
+      to be called if you created the item with a proper tqparent. Once
       inserted, the CardView takes ownership of the item.
      */
     void insertItem( CardViewItem *item );
@@ -261,7 +262,7 @@ class CardView : public QScrollView
     /**
       Sets the selection mode.
 
-      @see QListView
+      @see TQListView
      */
     void setSelectionMode( SelectionMode mode );
 
@@ -321,7 +322,7 @@ class CardView : public QScrollView
       @return The first matching item, or 0 if no items match.
      */
     CardViewItem *findItem( const TQString &text, const TQString &label,
-                            Qt::StringComparisonMode compare = Qt::BeginsWith ) const;
+                            TQt::StringComparisonMode compare = TQt::BeginsWith ) const;
 
     /**
       Returns the amounts of pixels required for one column.
@@ -391,7 +392,7 @@ class CardView : public QScrollView
       will probably mean a crash in the items painting routine.
      */
     // Note: I looked for a value in TQStyle::PixelMetric to use, but I could
-    // not see a useful one. One may turn up in a future version of Qt.
+    // not see a useful one. One may turn up in a future version of TQt.
     uint itemMargin() const;
 
     /**
@@ -436,7 +437,7 @@ class CardView : public QScrollView
     TQFont headerFont() const;
 
     /**
-      Reimplementation from QWidget
+      Reimplementation from TQWidget
      */
     void setFont( const TQFont &fnt );
 
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index 8043eacde..df190d3c6 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -25,8 +25,8 @@
 
 #include "colorlistbox.h"
 
-ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f )
-  :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
+ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f )
+  :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
   setAcceptDrops( true);
@@ -173,7 +173,7 @@ void ColorListItem::paint( TQPainter *p )
 
   p->drawText( mBoxWidth+3*2, fm.ascent() + fm.leading()/2, text() );
 
-  p->setPen( Qt::black );
+  p->setPen( TQt::black );
   p->drawRect( 3, 1, mBoxWidth, h-1 );
   p->fillRect( 4, 2, mBoxWidth-2, h-3, mColor );
 }
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index 053f06fff..566ec8b0a 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -26,9 +26,10 @@
 class ColorListBox : public KListBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );
+    ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 );
     void setColor( uint index, const TQColor &color );
     TQColor color( uint index ) const;
 
@@ -50,10 +51,10 @@ class ColorListBox : public KListBox
 };
 
 
-class ColorListItem : public QListBoxItem
+class ColorListItem : public TQListBoxItem
 {
   public:
-    ColorListItem( const TQString &text, const TQColor &color=Qt::black );
+    ColorListItem( const TQString &text, const TQColor &color=TQt::black );
     const TQColor &color( void );
     void  setColor( const TQColor &color );
 
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 919e49878..fdccd52f0 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
@@ -47,11 +47,11 @@
 /////////////////////////////////
 // ConfigureCardViewDialog
 
-ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent,
+ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                                   const char *name )
-  : ViewConfigureWidget( ab, parent, name )
+  : ViewConfigureWidget( ab, tqparent, name )
 {
-  TQWidget *page = addPage( i18n( "Look & Feel" ), TQString::null,
+  TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
                            DesktopIcon( "looknfeel" ) );
   mAdvancedPage = new CardViewLookNFeelPage( page );
 }
@@ -76,8 +76,8 @@ void ConfigureCardViewWidget::saveSettings( KConfig *config )
 
 ////////////////////////
 // CardViewLookNFeelPage
-CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *parent, const char *name )
-  : TQVBox( parent, name )
+CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *tqparent, const char *name )
+  : TQVBox( tqparent, name )
 {
   initGUI();
 }
@@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI()
   loTab->setSpacing( spacing );
   loTab->setMargin( margin );
 
-  TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
+  TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab );
 
   cbDrawSeps = new TQCheckBox( i18n("Draw &separators"), gbGeneral );
 
@@ -215,7 +215,7 @@ void CardViewLookNFeelPage::initGUI()
   sbSpacing = new TQSpinBox( 0, 100, 1, hbPadding );
   lSpacing->setBuddy( sbSpacing );
 
-  TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
+  TQGroupBox *gbCards = new TQGroupBox( 1, TQt::Horizontal, i18n("Cards"), loTab );
 
   TQHBox *hbMargin = new TQHBox( gbCards );
   TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin );
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 441a1e89c..52ec9cbbe 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CONFIGURECARDVIEWDIALOG_H
@@ -48,7 +48,7 @@ class CardViewLookAndFeelPage;
 class ConfigureCardViewWidget : public ViewConfigureWidget
 {
   public:
-    ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
+    ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name );
     virtual ~ConfigureCardViewWidget();
 
     virtual void restoreSettings( KConfig* );
@@ -80,9 +80,10 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
 class CardViewLookNFeelPage : public TQVBox {
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 );
+    CardViewLookNFeelPage( TQWidget *tqparent=0, const char *name=0 );
     ~CardViewLookNFeelPage();
 
     void restoreSettings( KConfig* );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index d65f42d38..309244e5d 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
@@ -41,11 +41,11 @@
 #include "configuretableviewdialog.h"
 
 ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab,
-                                                    TQWidget *parent,
+                                                    TQWidget *tqparent,
                                                     const char *name )
-  : ViewConfigureWidget( ab, parent, name )
+  : ViewConfigureWidget( ab, tqparent, name )
 {
-  TQWidget *page = addPage( i18n( "Look & Feel" ), TQString::null,
+  TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(),
                            KGlobal::iconLoader()->loadIcon( "looknfeel",
                            KIcon::Panel ) );
 
@@ -72,8 +72,8 @@ void ConfigureTableViewWidget::saveSettings( KConfig *config )
 
 
 
-LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name)
-  : TQWidget(parent, name)
+LookAndFeelPage::LookAndFeelPage(TQWidget *tqparent, const char *name)
+  : TQWidget(tqparent, name)
 {
   initGUI();
 
@@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI()
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
 
-  TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
+  TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal,
                                          i18n("Row Separator"), this);
   tqlayout->addWidget(group);
 
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 2e3378b4c..a0228cba6 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CONFIGURETABLEVIEWDIALOG_H
@@ -45,7 +45,7 @@ class LookAndFeelPage;
 class ConfigureTableViewWidget : public ViewConfigureWidget
 {
   public:
-    ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name );
+    ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name );
     virtual ~ConfigureTableViewWidget();
 
     virtual void restoreSettings( KConfig* );
@@ -60,12 +60,13 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
 /**
   Internal class. It is only defined here for tqmoc
 */
-class LookAndFeelPage : public QWidget
+class LookAndFeelPage : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    LookAndFeelPage( TQWidget *parent, const char *name = 0 );
+    LookAndFeelPage( TQWidget *tqparent, const char *name = 0 );
     ~LookAndFeelPage() {}
 
     void restoreSettings( KConfig* );
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 5b9ecbf11..548ad5f98 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqheader.h>
@@ -47,8 +47,8 @@
 /////////////////////////////////
 // DynamicTip Methods
 
-DynamicTip::DynamicTip( ContactListView *parent)
-  : TQToolTip( parent )
+DynamicTip::DynamicTip( ContactListView *tqparent)
+  : TQToolTip( tqparent )
 {
 }
 
@@ -116,7 +116,7 @@ void DynamicTip::maybeTip( const TQPoint &pos )
             linew = lastw;
           }
           else
-            i = QMAX( a, i-1 );
+            i = TQMAX( a, i-1 );
         }
 
       if ( notes[i] == '\n' || doBreak ) {
@@ -147,12 +147,12 @@ void DynamicTip::maybeTip( const TQPoint &pos )
 // ContactListViewItem Methods
 
 ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
-                                         ContactListView *parent,
+                                         ContactListView *tqparent,
                                          KABC::AddressBook *doc,
                                          const KABC::Field::List &fields,
                                          KIMProxy *proxy )
-  : KListViewItem(parent), mAddressee(a), mFields( fields ),
-    parentListView( parent ), mDocument(doc), mIMProxy( proxy )
+  : KListViewItem(tqparent), mAddressee(a), mFields( fields ),
+    tqparentListView( tqparent ), mDocument(doc), mIMProxy( proxy )
 {
   if ( mIMProxy )
     mHasIM = mIMProxy->isPresent( mAddressee.uid() );
@@ -164,15 +164,15 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
 TQString ContactListViewItem::key(int column, bool ascending) const
 {
   // Preserve behaviour of TQListViewItem::key(), otherwise we cause a crash if the column does not exist
-  if ( column >= parentListView->columns() )
-    return TQString::null;
+  if ( column >= tqparentListView->columns() )
+    return TQString();
 
 #if KDE_VERSION >= 319
   Q_UNUSED( ascending )
-  if ( parentListView->showIM() ) {
+  if ( tqparentListView->showIM() ) {
     // in this case, one column is reserved for IM presence
     // so we have to process it differently
-    if ( column == parentListView->imColumn() ) {
+    if ( column == tqparentListView->imColumn() ) {
       // increment by one before converting to string so that -1 is not greater than 1
       // create the sort key by taking the numeric status 0 low, 5 high, and subtracting it from 5
       // so that the default ascending gives online before offline, etc.
@@ -201,16 +201,16 @@ void ContactListViewItem::paintCell(TQPainter * p,
   if ( !p )
     return;
 
-  if (parentListView->singleLine()) {
-    p->setPen( parentListView->alternateColor() );
+  if (tqparentListView->singleLine()) {
+    p->setPen( tqparentListView->alternateColor() );
     p->drawLine( 0, height() - 1, width, height() - 1 );
   }
 }
 
 
-ContactListView *ContactListViewItem::parent()
+ContactListView *ContactListViewItem::tqparent()
 {
-  return parentListView;
+  return tqparentListView;
 }
 
 
@@ -222,7 +222,7 @@ void ContactListViewItem::refresh()
   }
 
   // Update our addressee, since it may have changed elsewhere
-  mAddressee = mDocument->tqfindByUid(mAddressee.uid());
+  mAddressee = mDocument->findByUid(mAddressee.uid());
   if (mAddressee.isEmpty())
     return;
 
@@ -230,9 +230,9 @@ void ContactListViewItem::refresh()
   // don't show unknown presence, it's not interesting
   if ( mHasIM ) {
     if ( mIMProxy->presenceNumeric( mAddressee.uid() ) > 0 )
-      setPixmap( parentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) );
+      setPixmap( tqparentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) );
     else
-      setPixmap( parentListView->imColumn(), TQPixmap() );
+      setPixmap( tqparentListView->imColumn(), TQPixmap() );
   }
 
   KABC::Field::List::ConstIterator it;
@@ -258,9 +258,9 @@ void ContactListViewItem::setHasIM( bool hasIM )
 
 ContactListView::ContactListView(KAddressBookTableView *view,
                                  KABC::AddressBook* /* doc */,
-                                 TQWidget *parent,
+                                 TQWidget *tqparent,
                                  const char *name )
-  : KListView( parent, name ),
+  : KListView( tqparent, name ),
     pabWidget( view ),
     oldColumn( 0 )
 {
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 7936333aa..65c927026 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef CONTACTLISTVIEW_H
@@ -41,10 +41,10 @@ class KIMProxy;
 /** The whole tooltip design needs a lot of work. Currently it is
 * hacked together to function.
 */
-class DynamicTip : public QToolTip
+class DynamicTip : public TQToolTip
 {
   public:
-    DynamicTip( ContactListView * parent );
+    DynamicTip( ContactListView * tqparent );
 
   protected:
     void maybeTip( const TQPoint & );
@@ -56,11 +56,11 @@ class ContactListViewItem : public KListViewItem
 {
 
 public:
-  ContactListViewItem(const KABC::Addressee &a, ContactListView* parent,
+  ContactListViewItem(const KABC::Addressee &a, ContactListView* tqparent,
                       KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy );
   const KABC::Addressee &addressee() const { return mAddressee; }
   virtual void refresh();
-  virtual ContactListView* parent();
+  virtual ContactListView* tqparent();
   virtual TQString key ( int, bool ) const;
   void setHasIM( bool hasIM );
   /** Adds the border around the cell if the user wants it.
@@ -72,7 +72,7 @@ public:
 private:
   KABC::Addressee mAddressee;
   KABC::Field::List mFields;
-  ContactListView *parentListView;
+  ContactListView *tqparentListView;
   KABC::AddressBook *mDocument;
   KIMProxy *mIMProxy;
   bool mHasIM;
@@ -85,11 +85,12 @@ private:
 class ContactListView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   ContactListView(KAddressBookTableView *view,
                   KABC::AddressBook *doc,
-                  TQWidget *parent,
+                  TQWidget *tqparent,
                   const char *name = 0L );
   virtual ~ContactListView() {}
   //void resort();
@@ -138,7 +139,7 @@ public:
 
 protected:
   /** Paints the background pixmap in the empty area. This method is needed
-  * since Qt::FixedPixmap will not scroll with the list view.
+  * since TQt::FixedPixmap will not scroll with the list view.
   */
   virtual void paintEmptyArea( TQPainter * p, const TQRect & rect );
   virtual void contentsMousePressEvent(TQMouseEvent*);
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 2f0c859c5..1c7f2806d 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -43,19 +43,19 @@
 class CardViewFactory : public ViewFactory
 {
   public:
-    KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
+    KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new KAddressBookCardView( core, parent, name );
+      return new KAddressBookCardView( core, tqparent, name );
     }
 
     TQString type() const { return I18N_NOOP("Card"); }
 
     TQString description() const { return i18n( "Rolodex style cards represent contacts." ); }
 
-    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent,
+    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                           const char *name = 0 )
     {
-      return new ConfigureCardViewWidget( ab, parent, name );
+      return new ConfigureCardViewWidget( ab, tqparent, name );
     }
 };
 
@@ -72,8 +72,8 @@ class AddresseeCardViewItem : public CardViewItem
     AddresseeCardViewItem( const KABC::Field::List &fields,
                            bool showEmptyFields,
                            KABC::AddressBook *doc, const KABC::Addressee &addr,
-                           CardView *parent )
-      : CardViewItem( parent, addr.realName() ),
+                           CardView *tqparent )
+      : CardViewItem( tqparent, addr.realName() ),
         mFields( fields ), mShowEmptyFields( showEmptyFields ),
         mDocument( doc ), mAddressee( addr )
       {
@@ -87,7 +87,7 @@ class AddresseeCardViewItem : public CardViewItem
 
     void refresh()
     {
-      mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
+      mAddressee = mDocument->findByUid( mAddressee.uid() );
 
       if ( !mAddressee.isEmpty() ) {
         clearFields();
@@ -116,8 +116,8 @@ class AddresseeCardViewItem : public CardViewItem
 };
 
 
-AddresseeCardView::AddresseeCardView( TQWidget *parent, const char *name )
-  : CardView( parent, name )
+AddresseeCardView::AddresseeCardView( TQWidget *tqparent, const char *name )
+  : CardView( tqparent, name )
 {
   setAcceptDrops( true );
 }
@@ -144,8 +144,8 @@ void AddresseeCardView::startDrag()
 
 
 KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
-                                            TQWidget *parent, const char *name )
-    : KAddressBookView( core, parent, name )
+                                            TQWidget *tqparent, const char *name )
+    : KAddressBookView( core, tqparent, name )
 {
   mShowEmptyFields = false;
 
@@ -282,7 +282,7 @@ void KAddressBookCardView::refresh( const TQString &uid )
     mCardView->viewport()->update();
 
     // by default nothing is selected
-    emit selected( TQString::null );
+    emit selected( TQString() );
   } else {
     // Try to find the one to refresh
     bool found = false;
@@ -349,7 +349,7 @@ void KAddressBookCardView::addresseeSelected()
   }
 
   if ( !found )
-    emit selected( TQString::null );
+    emit selected( TQString() );
 }
 
 void KAddressBookCardView::rmbClicked( CardViewItem*, const TQPoint &point )
@@ -359,12 +359,12 @@ void KAddressBookCardView::rmbClicked( CardViewItem*, const TQPoint &point )
 
 void KAddressBookCardView::scrollUp()
 {
-  TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) );
+  TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) );
 }
 
 void KAddressBookCardView::scrollDown()
 {
-  TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) );
+  TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) );
 }
 
 #include "kaddressbookcardview.moc"
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 045c1e051..9ccc8a40e 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -20,8 +20,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqstring.h>
@@ -30,7 +30,7 @@
 #include "cardview.h"
 #include "kaddressbookview.h"
 
-class QDragEntryEvent;
+class TQDragEntryEvent;
 class TQDropEvent;
 class KConfig;
 class AddresseeCardView;
@@ -43,9 +43,10 @@ class AddresseeCardView;
 class KAddressBookCardView : public KAddressBookView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KAddressBookCardView( KAB::Core *core, TQWidget *parent,
+    KAddressBookCardView( KAB::Core *core, TQWidget *tqparent,
                           const char *name = 0 );
     virtual ~KAddressBookCardView();
 
@@ -77,8 +78,9 @@ class KAddressBookCardView : public KAddressBookView
 class AddresseeCardView : public CardView
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    AddresseeCardView( TQWidget *parent, const char *name = 0 );
+    AddresseeCardView( TQWidget *tqparent, const char *name = 0 );
     ~AddresseeCardView();
 
   signals:
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index 58b4a3409..16fe5cad0 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -42,9 +42,9 @@
 class IconViewFactory : public ViewFactory
 {
   public:
-    KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
+    KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new KAddressBookIconView( core, parent, name );
+      return new KAddressBookIconView( core, tqparent, name );
     }
 
     TQString type() const { return I18N_NOOP( "Icon" ); }
@@ -59,8 +59,8 @@ extern "C" {
   }
 }
 
-AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name )
-  : KIconView( parent, name )
+AddresseeIconView::AddresseeIconView( TQWidget *tqparent, const char *name )
+  : KIconView( tqparent, name )
 {
   setSelectionMode( TQIconView::Extended );
   setResizeMode( TQIconView::Adjust );
@@ -96,8 +96,8 @@ class AddresseeIconViewItem : public KIconViewItem
 {
   public:
     AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc,
-                           const KABC::Addressee &addr, TQIconView *parent )
-      : KIconViewItem( parent ), mDocument( doc ), mAddressee( addr )
+                           const KABC::Addressee &addr, TQIconView *tqparent )
+      : KIconViewItem( tqparent ), mDocument( doc ), mAddressee( addr )
       {
         refresh();
       }
@@ -106,7 +106,7 @@ class AddresseeIconViewItem : public KIconViewItem
 
     void refresh()
     {
-      mAddressee = mDocument->tqfindByUid( mAddressee.uid() );
+      mAddressee = mDocument->findByUid( mAddressee.uid() );
 
       if ( !mAddressee.isEmpty() )
         setText( mAddressee.givenName() + " " + mAddressee.familyName() );
@@ -136,8 +136,8 @@ class AddresseeIconViewItem : public KIconViewItem
 
 
 KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
-                                            TQWidget *parent, const char *name)
-  : KAddressBookView( core, parent, name )
+                                            TQWidget *tqparent, const char *name)
+  : KAddressBookView( core, tqparent, name )
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
 
@@ -233,7 +233,7 @@ void KAddressBookIconView::refresh( const TQString &uid )
       }
     }
 
-    refresh( TQString::null );
+    refresh( TQString() );
   }
 }
 
@@ -291,7 +291,7 @@ void KAddressBookIconView::addresseeSelected()
   }
 
   if ( !found )
-    emit selected( TQString::null );
+    emit selected( TQString() );
 }
 
 void KAddressBookIconView::rmbClicked( TQIconViewItem*, const TQPoint &point )
@@ -301,12 +301,12 @@ void KAddressBookIconView::rmbClicked( TQIconViewItem*, const TQPoint &point )
 
 void KAddressBookIconView::scrollUp()
 {
-  TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) );
+  TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) );
 }
 
 void KAddressBookIconView::scrollDown()
 {
-  TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) );
+  TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) );
 }
 
 #include "kaddressbookiconview.moc"
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index dc6dddae0..5b9c8c7cc 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKICONVIEW_H
@@ -42,9 +42,10 @@ namespace KABC { class AddressBook; }
 class KAddressBookIconView : public KAddressBookView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KAddressBookIconView( KAB::Core *core, TQWidget *parent,
+    KAddressBookIconView( KAB::Core *core, TQWidget *tqparent,
                           const char *name = 0 );
     virtual ~KAddressBookIconView();
 
@@ -75,9 +76,10 @@ class KAddressBookIconView : public KAddressBookView
 class AddresseeIconView : public KIconView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    AddresseeIconView( TQWidget *parent, const char *name = 0 );
+    AddresseeIconView( TQWidget *tqparent, const char *name = 0 );
     ~AddresseeIconView();
 
   signals:
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 89caa0455..65bcd36cf 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include <tqapplication.h>
@@ -61,9 +61,9 @@
 class TableViewFactory : public ViewFactory
 {
   public:
-    KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name )
+    KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name )
     {
-      return new KAddressBookTableView( core, parent, name );
+      return new KAddressBookTableView( core, tqparent, name );
     }
 
     TQString type() const { return I18N_NOOP( "Table" ); }
@@ -71,10 +71,10 @@ class TableViewFactory : public ViewFactory
     TQString description() const { return i18n( "A listing of contacts in a table. Each cell of "
                                   "the table holds a field of the contact." ); }
 
-    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent,
+    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent,
                                           const char *name = 0 )
     {
-      return new ConfigureTableViewWidget( ab, parent, name );
+      return new ConfigureTableViewWidget( ab, tqparent, name );
     }
 };
 
@@ -86,8 +86,8 @@ extern "C" {
 }
 
 KAddressBookTableView::KAddressBookTableView( KAB::Core *core,
-                                              TQWidget *parent, const char *name )
-  : KAddressBookView( core, parent, name )
+                                              TQWidget *tqparent, const char *name )
+  : KAddressBookView( core, tqparent, name )
 {
   mMainLayout = new TQVBoxLayout( viewWidget(), 2 );
 
@@ -262,7 +262,7 @@ void KAddressBookTableView::refresh( const TQString &uid )
         return;
       }
     }
-    refresh( TQString::null );
+    refresh( TQString() );
   }
 }
 
@@ -330,7 +330,7 @@ void KAddressBookTableView::addresseeSelected()
   }
 
   if ( !found )
-      emit selected( TQString::null );
+      emit selected( TQString() );
 }
 
 void KAddressBookTableView::addresseeExecuted( TQListViewItem *item )
@@ -341,9 +341,9 @@ void KAddressBookTableView::addresseeExecuted( TQListViewItem *item )
     if ( ceItem )
       emit executed( ceItem->addressee().uid() );
     else
-      emit executed( TQString::null );
+      emit executed( TQString() );
   } else {
-    emit executed( TQString::null );
+    emit executed( TQString() );
   }
 }
 
@@ -372,12 +372,12 @@ void KAddressBookTableView::updatePresence( const TQString &uid )
 
 void KAddressBookTableView::scrollUp()
 {
-  TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) );
+  TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) );
 }
 
 void KAddressBookTableView::scrollDown()
 {
-  TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) );
+  TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) );
 }
 
 
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index d45314123..f212829f3 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -17,8 +17,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKTABLEVIEW_H
@@ -62,9 +62,10 @@ class KAddressBookTableView : public KAddressBookView
 friend class ContactListView;
 
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KAddressBookTableView( KAB::Core *core, TQWidget *parent,
+    KAddressBookTableView( KAB::Core *core, TQWidget *tqparent,
                            const char *name = 0 );
     virtual ~KAddressBookTableView();