3 files changed, 11 insertions, 11 deletions
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 14202cabe..16146f2c7 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <dcopref.h>
 
@@ -75,7 +75,7 @@ void KCMKMailSummary::modified()
 
 void KCMKMailSummary::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   mFolderView = new KListView( this );
   mFolderView->setRootIsDecorated( true );
@@ -85,8 +85,8 @@ void KCMKMailSummary::initGUI()
 
   mFullPath = new TQCheckBox( i18n( "Show full path for folders" ), this );
 
-  layout->addWidget( mFolderView );
-  layout->addWidget( mFullPath );
+  tqlayout->addWidget( mFolderView );
+  tqlayout->addWidget( mFullPath );
 }
 
 void KCMKMailSummary::initFolders()
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 266823ff7..01cef3a6d 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -83,7 +83,7 @@ bool KMailPlugin::canDecodeDrag( TQMimeSource *qms )
 void KMailPlugin::processDropEvent( TQDropEvent * de )
 {
   kdDebug() << k_funcinfo << endl;
-  CalendarLocal cal( TQString::fromLatin1("UTC") );
+  CalendarLocal cal( TQString::tqfromLatin1("UTC") );
   KABC::Addressee::List list;
 
   if ( VCalDrag::decode( de, &cal ) || ICalDrag::decode( de, &cal ) ) {
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 42625f705..195d853a3 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <dcopref.h>
 #include <kapplication.h>
@@ -132,7 +132,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 
       KURLLabel *urlLabel = new KURLLabel( *it, folderPath, this );
       urlLabel->installEventFilter( this );
-      urlLabel->setAlignment( AlignLeft );
+      urlLabel->tqsetAlignment( AlignLeft );
       urlLabel->show();
       connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
                TQT_SLOT( selectFolder( const TQString& ) ) );
@@ -142,8 +142,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
       TQLabel *label =
         new TQLabel( TQString( i18n("%1: number of unread messages "
                                   "%2: total number of messages", "%1 / %2") )
-                    .arg( numUnreadMsg ).arg( numMsg ), this );
-      label->setAlignment( AlignLeft );
+                    .tqarg( numUnreadMsg ).tqarg( numMsg ), this );
+      label->tqsetAlignment( AlignLeft );
       label->show();
       mLayout->addWidget( label, counter, 2 );
       mLabels.append( label );
@@ -154,7 +154,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 
   if ( counter == 0 ) {
     TQLabel *label = new TQLabel( i18n( "No unread messages in your monitored folders" ), this );
-    label->setAlignment( AlignHCenter | AlignVCenter );
+    label->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addMultiCellWidget( label, 0, 0, 0, 2 );
     label->show();
     mLabels.append( label );
@@ -166,7 +166,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
   if ( obj->inherits( "KURLLabel" ) ) {
     KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
-      emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
+      emit message( i18n( "Open Folder: \"%1\"" ).tqarg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }