Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

4 files changed, 26 insertions, 26 deletions

diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9149c653..110d3be8 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -61,7 +61,7 @@ class CardViewTip : public TQLabel
 };
 
 //
-// Warning: make sure you use findRef() instead of tqfind() to find an
+// Warning: make sure you use tqfindRef() instead of tqfind() to find an
 //          item! Only the pointer value is unique in the list.
 //
 class CardViewItemList : public TQPtrList<CardViewItem>
@@ -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().drawPrimitive( TQStyle::PE_FocusRect, p,
+    mView->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
         TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg,
         TQStyle::Style_FocusAtBorder,
         TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
@@ -587,7 +587,7 @@ CardView::CardView( TQWidget *tqparent, const char *name )
 
   viewport()->setMouseTracking( true );
   viewport()->setFocusProxy( this );
-  viewport()->setFocusPolicy( WheelFocus );
+  viewport()->setFocusPolicy(Qt::WheelFocus );
   viewport()->setBackgroundMode( PaletteBase );
 
   connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) );
@@ -616,7 +616,7 @@ void CardView::takeItem( CardViewItem *item )
 {
   if ( d->mCurrentItem == item )
     d->mCurrentItem = item->nextItem();
-  d->mItemList.take( d->mItemList.findRef( item ) );
+  d->mItemList.take( d->mItemList.tqfindRef( item ) );
 
   setLayoutDirty( true );
 }
@@ -843,7 +843,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
    calcLayout();
 
   // allow setting costum colors in the viewport pale
-  TQColorGroup cg = viewport()->palette().active();
+  TQColorGroup cg = viewport()->tqpalette().active();
 
   TQRect clipRect( clipx, clipy, clipw, cliph );
   TQRect cardRect;
@@ -953,7 +953,7 @@ void CardView::calcLayout()
 
 CardViewItem *CardView::itemAfter( const CardViewItem *item ) const
 {
-  d->mItemList.findRef( item );
+  d->mItemList.tqfindRef( item );
   return d->mItemList.next();
 }
 
@@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
   emit clicked( item );
 
   // The RMB click
-  if ( e->button() & TQt::RightButton ) {
+  if ( e->button() & Qt::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() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
+    if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ShiftButton) ) {
       if ( item == other )
         return;
 
@@ -1070,8 +1070,8 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       }
 
       int from, to, a, b;
-      a = d->mItemList.findRef( item );
-      b = d->mItemList.findRef( other );
+      a = d->mItemList.tqfindRef( item );
+      b = d->mItemList.tqfindRef( other );
       from = a < b ? a : b;
       to = a > b ? a : b;
 
@@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e )
       }
 
       emit selectionChanged();
-    } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) {
+    } else if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ControlButton) ) {
       item->setSelected( !item->isSelected() );
       item->tqrepaintCard();
       emit selectionChanged();
-    } else if ( e->button() & TQt::LeftButton ) {
+    } else if ( e->button() & Qt::LeftButton ) {
       bool b = signalsBlocked();
       blockSignals( true );
       selectAll( false );
@@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e )
       return;
   }
 
-  if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) &&
+  if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
        ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
 
     startDrag();
@@ -1218,7 +1218,7 @@ void CardView::keyPressEvent( TQKeyEvent *e )
     return;
   }
 
-  uint pos = d->mItemList.findRef( d->mCurrentItem );
+  uint pos = d->mItemList.tqfindRef( d->mCurrentItem );
   CardViewItem *aItem = 0;
   CardViewItem *old = d->mCurrentItem;
 
@@ -1347,8 +1347,8 @@ void CardView::keyPressEvent( TQKeyEvent *e )
         // otherwise, ??????
         bool s = ! aItem->isSelected();
         int from, to, a, b;
-        a = d->mItemList.findRef( aItem );
-        b = d->mItemList.findRef( old );
+        a = d->mItemList.tqfindRef( aItem );
+        b = d->mItemList.tqfindRef( old );
         from = a < b ? a : b;
         to = a > b ? a : b;
 
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index fdccd52f..834431af 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI()
   loTab->setSpacing( spacing );
   loTab->setMargin( margin );
 
-  TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab );
+  TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::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, TQt::Horizontal, i18n("Cards"), loTab );
+  TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
 
   TQHBox *hbMargin = new TQHBox( gbCards );
   TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin );
@@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI()
 void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l )
 {
   l->setFont( fnt );
-  l->setText(  TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
+  l->setText(  TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) );
 }
 
 #include "configurecardviewdialog.moc"
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 309244e5..179a819a 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI()
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
 
-  TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal,
+  TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
                                          i18n("Row Separator"), this);
   tqlayout->addWidget(group);
 
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 548ad5f9..31f0ac6c 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -82,17 +82,17 @@ void DynamicTip::maybeTip( const TQPoint &pos )
   if (a.isEmpty())
     return;
 
-  s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel())
-                                     .arg(a.formattedName());
+  s += i18n("label: value", "%1: %2").tqarg(a.formattedNameLabel())
+                                     .tqarg(a.formattedName());
 
   s += '\n';
-  s += i18n("label: value", "%1: %2").arg(a.organizationLabel())
-                                       .arg(a.organization());
+  s += i18n("label: value", "%1: %2").tqarg(a.organizationLabel())
+                                       .tqarg(a.organization());
 
   TQString notes = a.note().stripWhiteSpace();
   if ( !notes.isEmpty() ) {
     notes += '\n';
-    s += '\n' + i18n("label: value", "%1: \n").arg(a.noteLabel());
+    s += '\n' + i18n("label: value", "%1: \n").tqarg(a.noteLabel());
     TQFontMetrics fm( font() );
 
     // Begin word wrap code based on TQMultiLineEdit code
@@ -314,7 +314,7 @@ void ContactListView::contentsMousePressEvent(TQMouseEvent* e)
 // To initiate a drag operation
 void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e )
 {
-  if ((e->state() & LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
+  if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
     emit startAddresseeDrag();
   }
   else