1 files changed, 13 insertions, 13 deletions
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 5b18e044b..2a21d7f05 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -39,14 +39,14 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqscrollview.h>
 #include <tqcombobox.h>
 #include <tqhbox.h>
 #include <tqtimer.h>
 #include <tqpushbutton.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 Recipient::Recipient( const TQString &email, Recipient::Type type )
   : mEmail( email ), mType( type )
@@ -288,7 +288,7 @@ void RecipientLine::keyPressEvent( TQKeyEvent *ev )
 
 int RecipientLine::setComboWidth( int w )
 {
-  w = TQMAX( w, mCombo->tqsizeHint().width() );
+  w = TQMAX( w, mCombo->sizeHint().width() );
   mCombo->setFixedWidth( w );
   mCombo->updateGeometry();
   parentWidget()->updateGeometry();
@@ -331,7 +331,7 @@ RecipientsView::RecipientsView( TQWidget *parent )
 
   addLine();
   setResizePolicy( TQScrollView::Manual );
-  tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+  setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
   viewport()->setPaletteBackgroundColor( paletteBackgroundColor() );
 }
@@ -400,7 +400,7 @@ RecipientLine *RecipientsView::addLine()
 
   mFirstColumnWidth = line->setComboWidth( mFirstColumnWidth );
 
-  mLineHeight = line->tqminimumSizeHint().height();
+  mLineHeight = line->minimumSizeHint().height();
 
   line->resize( viewport()->width(), mLineHeight );
 
@@ -536,7 +536,7 @@ void RecipientsView::resizeView()
 //    setFixedHeight( mLineHeight * mLines.count() );
   }
 
-  parentWidget()->tqlayout()->activate();
+  parentWidget()->layout()->activate();
   emit sizeHintChanged();
   TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) );
 }
@@ -555,12 +555,12 @@ void RecipientsView::viewportResizeEvent ( TQResizeEvent *ev )
   ensureVisible( 0, mLines.count() * mLineHeight );
 }
 
-TQSize RecipientsView::tqsizeHint() const
+TQSize RecipientsView::sizeHint() const
 {
   return TQSize( 200, mLineHeight * mLines.count() );
 }
 
-TQSize RecipientsView::tqminimumSizeHint() const
+TQSize RecipientsView::minimumSizeHint() const
 {
   int height;
   uint numLines = 5;
@@ -742,9 +742,9 @@ void RecipientsToolTip::maybeTip( const TQPoint & p )
 
   text.append( "</qt>" );
 
-  TQRect tqgeometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
+  TQRect geometry( p + TQPoint( 2, 2 ), TQPoint( 400, 100 ) );
 
-  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, tqgeometry );
+  tip( TQRect( p.x() - 20, p.y() - 20, 40, 40 ), text, geometry );
 }
 
 
@@ -757,7 +757,7 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent )
   topLayout->addStretch( 1 );
 
   mTotalLabel = new TQLabel( this );
-  mTotalLabel->tqsetAlignment( AlignCenter );
+  mTotalLabel->setAlignment( AlignCenter );
   topLayout->addWidget( mTotalLabel );
   mTotalLabel->hide();
 
@@ -915,8 +915,8 @@ void RecipientsEditor::setRecipientString( const TQString &str,
     if ( count++ > GlobalSettings::self()->maximumRecipients() ) {
       KMessageBox::sorry( this,
         i18n("Truncating recipients list to %1 of %2 entries.")
-        .tqarg( GlobalSettings::self()->maximumRecipients() )
-        .tqarg( r.count() ) );
+        .arg( GlobalSettings::self()->maximumRecipients() )
+        .arg( r.count() ) );
       break;
     }
     addRecipient( *it, type );