Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

39 files changed, 431 insertions, 431 deletions

diff --git a/kontact/Thoughts b/kontact/Thoughts
index 16aa9c4a7..6fca8f43c 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -203,7 +203,7 @@ Don:
 Don: And the same for all other loadX apps.
 
 
-Status Bar
+tqStatus Bar
 ----------
 
 d We need a more sophisticated handling (progressbar, etc)
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 92e0f624d..e4e44e704 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -42,7 +42,7 @@ Core::Core( TQWidget *parent, const char *name )
 {
   d = new Private;
   TQTimer* timer = new TQTimer( this );
-  mLastDate = TQDate::currentDate();
+  mLastDate = TQDate::tqcurrentDate();
   connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) );
   timer->start( 1000*60 );
 }
@@ -86,10 +86,10 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
       d->lastErrorMessage = KLibLoader::self()->lastErrorMessage();
       break;
     case KParts::ComponentFactory::ErrNoFactory:
-      d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).arg( libname );
+      d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).tqarg( libname );
       break;
     case KParts::ComponentFactory::ErrNoComponent:
-      d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).arg( libname );
+      d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).tqarg( libname );
       break;
     }
     kdWarning(5601) << d->lastErrorMessage << endl;
@@ -114,10 +114,10 @@ void Core::slotPartDestroyed( TQObject * obj )
 
 void Core::checkNewDay()
 {
-  if ( mLastDate != TQDate::currentDate() )
-    emit dayChanged( TQDate::currentDate() );
+  if ( mLastDate != TQDate::tqcurrentDate() )
+    emit dayChanged( TQDate::tqcurrentDate() );
 
-  mLastDate = TQDate::currentDate();
+  mLastDate = TQDate::tqcurrentDate();
 }
 
 TQString Core::lastErrorMessage() const
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index 6192dd4c4..085125222 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -55,20 +55,20 @@ TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQ
 
   TQLabel *label = new TQLabel( hbox );
   label->setPixmap( icon );
-  label->setFixedSize( label->sizeHint() );
-  label->setPaletteBackgroundColor( colorGroup().mid() );
+  label->setFixedSize( label->tqsizeHint() );
+  label->setPaletteBackgroundColor( tqcolorGroup().mid() );
   label->setAcceptDrops( true );
 
   label = new TQLabel( heading, hbox );
-  label->setAlignment( AlignLeft|AlignVCenter );
+  label->tqsetAlignment( AlignLeft|AlignVCenter );
   label->setIndent( KDialog::spacingHint() );
   label->setFont( boldFont );
-  label->setPaletteForegroundColor( colorGroup().light() );
-  label->setPaletteBackgroundColor( colorGroup().mid() );
+  label->setPaletteForegroundColor( tqcolorGroup().light() );
+  label->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
-  hbox->setPaletteBackgroundColor( colorGroup().mid() );
+  hbox->setPaletteBackgroundColor( tqcolorGroup().mid() );
 
-  hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
+  hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() );
 
   return hbox;
 }
@@ -109,8 +109,8 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event )
 
 void Summary::dropEvent( TQDropEvent *event )
 {
-  int alignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom);
-  emit summaryWidgetDropped( this, event->source(), alignment );
+  int tqalignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom);
+  emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
 #include "summary.moc"
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index f490f517e..f50507ce7 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -74,7 +74,7 @@ class KDE_EXPORT Summary : public TQWidget
 
   signals:
     void message( const TQString &message );
-    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
 
   protected:
     virtual void mousePressEvent( TQMouseEvent* );
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 88a975b70..34bec493e 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -171,7 +171,7 @@ void KAddressbookPlugin::processDropEvent( TQDropEvent *event )
   }
 
   KMessageBox::sorry( core(), i18n( "Cannot handle drop events of type '%1'." )
-                      .arg( event->format() ) );
+                      .tqarg( event->format() ) );
 }
 
 
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() );
   }
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index a723ef31d..769c1acf5 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqpopupmenu.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -139,7 +139,7 @@ void KNotesPart::printSelectedNotes()
     //printer.setFont( m_config->font() );
     //printer.setContext( m_editor->context() );
     //printer.setStyleSheet( m_editor->styleSheet() );
-    printer.setColorGroup( colorGroup() );
+    printer.tqsetColorGroup( tqcolorGroup() );
     printer.printNote( , content );
 #endif
 }
@@ -161,7 +161,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text )
   if ( !name.isEmpty() )
       journal->setSummary( name );
   else
-      journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) );
+      journal->setSummary( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) );
 
   // the body of the note
   journal->setDescription( text );
@@ -201,7 +201,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text )
 
 TQString KNotesPart::newNoteFromClipboard( const TQString& name )
 {
-  const TQString& text = KApplication::clipboard()->text();
+  const TQString& text = KApplication::tqclipboard()->text();
   return newNote( name, text );
 }
 
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 7ae154859..274d140e1 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -32,7 +32,7 @@
 #ifndef KNOTES_PART_P_H
 #define KNOTES_PART_P_H
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <kactioncollection.h>
@@ -130,9 +130,9 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       actionCollection()->setWidget( this );
 
       TQWidget *page = plainPage();
-      TQVBoxLayout *layout = new TQVBoxLayout( page );
+      TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
 
-      TQHBoxLayout *hbl = new TQHBoxLayout( layout, marginHint() );
+      TQHBoxLayout *hbl = new TQHBoxLayout( tqlayout, marginHint() );
       TQLabel *label = new TQLabel( page);
       label->setText( i18n( "Name:" ) );
       hbl->addWidget( label,0 );
@@ -149,8 +149,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
 
       mTool = static_cast<KToolBar *>(factory.container( "note_tool", this ));
 
-      layout->addWidget( mTool );
-      layout->addWidget( mNoteEdit );
+      tqlayout->addWidget( mTool );
+      tqlayout->addWidget( mNoteEdit );
     }
 
     TQString text() const
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 17638d0cb..79a45d21e 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -30,8 +30,8 @@
 */
 
 #include <tqtooltip.h>
-#include <layout.h>
-#include <textedit.h>
+#include <tqlayout.h>
+#include <tqtextedit.h>
 
 #include <kapplication.h>
 #include <kglobalsettings.h>
@@ -52,8 +52,8 @@ KNoteTip::KNoteTip( KIconView *parent )
   mPreview->setHScrollBarMode( TQScrollView::AlwaysOff );
   mPreview->setVScrollBarMode( TQScrollView::AlwaysOff );
 
-  TQBoxLayout *layout = new TQVBoxLayout( this );
-  layout->addWidget( mPreview );
+  TQBoxLayout *tqlayout = new TQVBoxLayout( this );
+  tqlayout->addWidget( mPreview );
 
   setPalette( TQToolTip::palette() );
   setMargin( 1 );
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 0fbd7d9a9..2bd0456ca 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqobject.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
@@ -58,7 +58,7 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
   mLayout = new TQGridLayout( mainLayout, 7, 3, 3 );
   mLayout->setRowStretch( 6, 1 );
 
-  mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
+  mCalendar = new KCal::CalendarLocal( TQString::tqfromLatin1("UTC") );
   KNotesResourceManager *manager = new KNotesResourceManager();
 
   TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
@@ -92,8 +92,8 @@ void KNotesSummaryWidget::updateView()
       // Fill Note Pixmap Field
       label = new TQLabel( this );
       label->setPixmap( pm );
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView()
       KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this );
       urlLabel->installEventFilter( this );
       urlLabel->setTextFormat(RichText);
-      urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 1 );
       mLabels.append( urlLabel );
 
@@ -118,7 +118,7 @@ void KNotesSummaryWidget::updateView()
 
   } else {
       TQLabel *noNotes = new TQLabel( i18n( "No Notes Available" ), this );
-      noNotes->setAlignment( AlignHCenter | AlignVCenter );
+      noNotes->tqsetAlignment( AlignHCenter | AlignVCenter );
       mLayout->addWidget( noNotes, 0, 1 );
       mLabels.append( noNotes );
   }
@@ -140,7 +140,7 @@ bool KNotesSummaryWidget::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( "Read Note: \"%1\"" ).arg( label->text() ) );
+      emit message( i18n( "Read Note: \"%1\"" ).tqarg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 115de0e9a..4466c5c6d 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -23,7 +23,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 
@@ -90,10 +90,10 @@ void KCMKOrgSummary::customDaysChanged( int value )
 
 void KCMKOrgSummary::initGUI()
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(),
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->tqlayout(),
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "How many days should the calendar show at once?" ), mCalendarGroup );
@@ -122,15 +122,15 @@ void KCMKOrgSummary::initGUI()
 
   hbox->addStretch( 1 );
 
-  layout->addWidget( mCalendarGroup );
+  tqlayout->addWidget( mCalendarGroup );
 
   mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this );
   new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup );
   new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup );
 
-  layout->addWidget( mTodoGroup );
+  tqlayout->addWidget( mTodoGroup );
 
-  layout->addStretch();
+  tqlayout->addStretch();
 }
 
 void KCMKOrgSummary::load()
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 2262dcef3..7c2140b36 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -195,7 +195,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
               KCal::Incidence *i = incidences.first();
               TQString summary;
               if ( dynamic_cast<KCal::Journal*>( i ) )
-                  summary = i18n( "Note: %1" ).arg( i->summary() );
+                  summary = i18n( "Note: %1" ).tqarg( i->summary() );
               else
                   summary = i->summary();
               interface()->openEventEditor( summary, i->description(), TQString() );
@@ -219,22 +219,22 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
                           i18n("Drops of multiple mails are not supported." ) );
     } else {
       KPIM::MailSummary mail = mails.first();
-      TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() )
-                    .arg( mail.to() ).arg( mail.subject() );
+      TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() )
+                    .tqarg( mail.to() ).tqarg( mail.subject() );
 
       KTempFile tf;
       tf.setAutoDelete( true );
-      TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() );
-      tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
+      TQString uri = TQString::tqfromLatin1("kmail:") + TQString::number( mail.serialNumber() );
+      tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) );
       tf.close();
-      interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt,
+      interface()->openEventEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt,
                                     uri, tf.name(), TQStringList(), "message/rfc822" );
     }
     return;
   }
 
   KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.")
-                              .arg( event->format() ) );
+                              .tqarg( event->format() ) );
 }
 
 bool KOrganizerPlugin::queryClose() const {
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 8803f05f9..7c3a1bed9 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 #include <kdialog.h>
@@ -97,9 +97,9 @@ void SummaryWidget::updateView()
   TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small );
 
   TQDate dt;
-  TQDate currentDate = TQDate::currentDate();
-  for ( dt=currentDate;
-        dt<=currentDate.addDays( days - 1 );
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
+  for ( dt=tqcurrentDate;
+        dt<=tqcurrentDate.addDays( days - 1 );
         dt=dt.addDays(1) ) {
 
     KCal::Event::List events = mCalendar->events( dt );
@@ -123,8 +123,8 @@ void SummaryWidget::updateView()
       int span=1; int dayof=1;
       if ( ev->isMultiDay() ) {
         TQDate d = ev->dtStart().date();
-        if ( d < currentDate ) {
-          d = currentDate;
+        if ( d < tqcurrentDate ) {
+          d = tqcurrentDate;
         }
         while ( d < ev->dtEnd().date() ) {
           if ( d < dt ) {
@@ -148,8 +148,8 @@ void SummaryWidget::updateView()
       } else {
         label->setPixmap( pm );
       }
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -159,12 +159,12 @@ void SummaryWidget::updateView()
 
       // Modify event date for printing
       TQDate sD = TQDate( dt.year(), dt.month(), dt.day() );
-      if ( ( sD.month() == currentDate.month() ) &&
-           ( sD.day()   == currentDate.day() ) ) {
+      if ( ( sD.month() == tqcurrentDate.month() ) &&
+           ( sD.day()   == tqcurrentDate.day() ) ) {
         datestr = i18n( "Today" );
         makeBold = true;
-      } else if ( ( sD.month() == currentDate.addDays( 1 ).month() ) &&
-                  ( sD.day()   == currentDate.addDays( 1 ).day() ) ) {
+      } else if ( ( sD.month() == tqcurrentDate.addDays( 1 ).month() ) &&
+                  ( sD.day()   == tqcurrentDate.addDays( 1 ).day() ) ) {
         datestr = i18n( "Tomorrow" );
       } else {
         datestr = KGlobal::locale()->formatDate( sD );
@@ -179,7 +179,7 @@ void SummaryWidget::updateView()
       }
 
       label = new TQLabel( datestr, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       if ( makeBold ) {
         TQFont font = label->font();
         font.setBold( true );
@@ -191,14 +191,14 @@ void SummaryWidget::updateView()
       // Fill Event Summary Field
       TQString newtext = ev->summary();
       if ( ev->isMultiDay() &&  !ev->doesFloat() ) {
-        newtext.append( TQString(" (%1/%2)").arg( dayof ).arg( span ) );
+        newtext.append( TQString(" (%1/%2)").tqarg( dayof ).tqarg( span ) );
       }
 
       KURLLabel *urlLabel = new KURLLabel( this );
       urlLabel->setText( newtext );
       urlLabel->setURL( ev->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak );
+      urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -225,10 +225,10 @@ void SummaryWidget::updateView()
           }
         }
         datestr = i18n( "Time from - to", "%1 - %2" )
-                  .arg( KGlobal::locale()->formatTime( sST ) )
-                  .arg( KGlobal::locale()->formatTime( sET ) );
+                  .tqarg( KGlobal::locale()->formatTime( sST ) )
+                  .tqarg( KGlobal::locale()->formatTime( sET ) );
         label = new TQLabel( datestr, this );
-        label->setAlignment( AlignLeft | AlignVCenter );
+        label->tqsetAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 3 );
         mLabels.append( label );
       }
@@ -242,7 +242,7 @@ void SummaryWidget::updateView()
       i18n( "No appointments pending within the next day",
             "No appointments pending within the next %n days",
             days ), this, "nothing to see" );
-    noEvents->setAlignment( AlignHCenter | AlignVCenter );
+    noEvents->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addWidget( noEvents, 0, 2 );
     mLabels.append( noEvents );
   }
@@ -288,7 +288,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( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
+      emit message( i18n( "Edit Appointment: \"%1\"" ).tqarg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index e3ff2ba8f..caaaaf91d 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -187,7 +187,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
         KCal::Incidence *i = incidences.first();
         TQString summary;
         if ( dynamic_cast<KCal::Journal*>( i ) )
-          summary = i18n( "Note: %1" ).arg( i->summary() );
+          summary = i18n( "Note: %1" ).tqarg( i->summary() );
         else
           summary = i->summary();
         interface()->openTodoEditor( summary, i->description(), TQString() );
@@ -210,23 +210,23 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
                           i18n("Drops of multiple mails are not supported." ) );
     } else {
       KPIM::MailSummary mail = mails.first();
-      TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() )
-                    .arg( mail.to() ).arg( mail.subject() );
+      TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() )
+                    .tqarg( mail.to() ).tqarg( mail.subject() );
 
       KTempFile tf;
       tf.setAutoDelete( true );
       TQString uri = "kmail:" + TQString::number( mail.serialNumber() ) + "/" +
                     mail.messageId();
-      tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
+      tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) );
       tf.close();
-      interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ),
+      interface()->openTodoEditor( i18n("Mail: %1").tqarg( mail.subject() ),
                                    txt, uri, tf.name(), TQStringList(), "message/rfc822", false );
     }
     return;
   }
 
   KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.")
-                              .arg( event->format() ) );
+                              .tqarg( event->format() ) );
 }
 
 #include "todoplugin.moc"
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index b16b638c9..0849dde74 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 #include <kdialog.h>
@@ -94,7 +94,7 @@ void TodoSummaryWidget::updateView()
   TQLabel *label = 0;
   int counter = 0;
 
-  TQDate currentDate = TQDate::currentDate();
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
   KCal::Todo::List todos = mCalendar->todos();
   if ( todos.count() > 0 ) {
     TQPixmap pm = loader.loadIcon( "todo", KIcon::Small );
@@ -111,27 +111,27 @@ void TodoSummaryWidget::updateView()
 
       // show uncomplete todos from the last days
       if ( todo->hasDueDate() && !todo->isCompleted() &&
-           todo->dtDue().date() < currentDate ) {
+           todo->dtDue().date() < tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "overdue" );
       }
 
       // show todos which started somewhere in the past and has to be finished in future
       if ( todo->hasStartDate() && todo->hasDueDate() &&
-           todo->dtStart().date() < currentDate &&
-           currentDate < todo->dtDue().date() ) {
+           todo->dtStart().date() < tqcurrentDate &&
+           tqcurrentDate < todo->dtDue().date() ) {
         accepted = true;
         stateText = i18n( "in progress" );
       }
 
       // all todos which start today
-      if ( todo->hasStartDate() && todo->dtStart().date() == currentDate ) {
+      if ( todo->hasStartDate() && todo->dtStart().date() == tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "starts today" );
       }
 
       // all todos which end today
-      if ( todo->hasDueDate() && todo->dtDue().date() == currentDate ) {
+      if ( todo->hasDueDate() && todo->dtDue().date() == tqcurrentDate ) {
         accepted = true;
         stateText = i18n( "ends today" );
       }
@@ -141,13 +141,13 @@ void TodoSummaryWidget::updateView()
 
       label = new TQLabel( this );
       label->setPixmap( pm );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
       label = new TQLabel( TQString::number( todo->percentComplete() ) + "%", this );
-      label->setAlignment( AlignHCenter | AlignVCenter );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetAlignment( AlignHCenter | AlignVCenter );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 1 );
       mLabels.append( label );
 
@@ -168,14 +168,14 @@ void TodoSummaryWidget::updateView()
       connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
                this, TQT_SLOT( popupMenu( const TQString& ) ) );
 
-      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) );
+      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, tqcurrentDate, true ) );
       if ( !tipText.isEmpty() ) {
         TQToolTip::add( urlLabel, tipText );
       }
 
       label = new TQLabel( stateText, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
-      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
+      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 3 );
       mLabels.append( label );
 
@@ -185,7 +185,7 @@ void TodoSummaryWidget::updateView()
 
   if ( counter == 0 ) {
     TQLabel *noTodos = new TQLabel( i18n( "No to-dos pending" ), this );
-    noTodos->setAlignment( AlignHCenter | AlignVCenter );
+    noTodos->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addWidget( noTodos, 0, 1 );
     mLabels.append( noTodos );
   }
@@ -214,7 +214,7 @@ void TodoSummaryWidget::completeTodo( const TQString &uid )
   IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) );
   if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
     KCal::Todo *oldTodo = todo->clone();
-    todo->setCompleted( TQDateTime::currentDateTime() );
+    todo->setCompleted( TQDateTime::tqcurrentDateTime() );
     changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this );
     changer->endChange( todo, 0, TQString() );
     delete oldTodo;
@@ -253,7 +253,7 @@ bool TodoSummaryWidget::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( "Edit To-do: \"%1\"" ).arg( label->text() ) );
+      emit message( i18n( "Edit To-do: \"%1\"" ).tqarg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 51539f598..46ec7fdfe 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -24,11 +24,11 @@
 
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqvbox.h>
 
 #include <dcopclient.h>
@@ -88,7 +88,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mPilotDeviceLabel = new TQLabel( i18n( "Unknown" ), this );
   mLayout->addMultiCellWidget( mPilotDeviceLabel, row, row, 1, 3 );
 
-  // Status
+  // tqStatus
   row++;
   mDaemonStatusTextLabel = new TQLabel( i18n( "<i>Status:</i>" ), this);
   mLayout->addWidget( mDaemonStatusTextLabel, row, 0 );
@@ -98,10 +98,10 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   // Conduits:
   row++;
   mConduitsTextLabel = new TQLabel( i18n( "<i>Conduits:</i>" ), this );
-  mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs );
+  mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
   mLayout->addWidget( mConduitsTextLabel, row, 0 );
   mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
-  mConduitsLabel->setAlignment( mConduitsLabel->alignment() | TQt::WordBreak );
+  mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak );
   mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
 
   // widgets shown if kpilotDaemon is not running
@@ -141,7 +141,7 @@ void SummaryWidget::receiveDaemonStatusDetails(TQDateTime lastSyncTime, TQString
 {
   mDCOPSuccess = true;
   mLastSyncTime = lastSyncTime;
-  mDaemonStatus = status;
+  mDaemontqStatus = status;
   mConduits = conduits;
   mSyncLog = logFileName;
   mUserName = userName;
@@ -166,7 +166,7 @@ void SummaryWidget::updateView()
     }
     mPilotUserLabel->setText( mUserName.isEmpty() ? i18n( "unknown" ) : mUserName );
     mPilotDeviceLabel->setText( mPilotDevice.isEmpty() ? i18n( "unknown" ) : mPilotDevice );
-    mDaemonStatusLabel->setText( mDaemonStatus );
+    mDaemonStatusLabel->setText( mDaemontqStatus );
     mConduitsLabel->setText( mConduits.join( ", " ) );
   } else {
     mSyncTimeLabel->setText( i18n( "No information available (Daemon not running?)" ) );
@@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename )
 
   TQFile f(filename);
   if ( !f.open( IO_ReadOnly ) ) {
-    KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) );
+    KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) );
     return;
   }
 
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index 3e04ed88d..b1b60a053 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.h
@@ -85,7 +85,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
     TQGridLayout *mLayout;
 
     TQDateTime mLastSyncTime;
-    TQString mDaemonStatus;
+    TQString mDaemontqStatus;
     TQStringList mConduits;
     TQString mSyncLog;
     TQString mUserName;
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 4f0bbd38d..fe2a20c63 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -23,7 +23,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqvaluevector.h>
 #include <tqspinbox.h>
@@ -60,22 +60,22 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
                  Ok, parent, 0, true, true )
 {
   TQWidget *page = plainPage();
-  TQGridLayout *layout = new TQGridLayout( page, 2, 3, marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(),
                                          spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Name:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mTitle = new TQLineEdit( page );
   label->setBuddy( mTitle );
-  layout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
+  tqlayout->addMultiCellWidget( mTitle, 0, 0, 1, 2 );
 
   label = new TQLabel( i18n( "URL:" ), page );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mURL = new TQLineEdit( page );
   label->setBuddy( mURL );
-  layout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
+  tqlayout->addMultiCellWidget( mURL, 1, 1, 1, 2 );
 
   mTitle->setText( title );
   mURL->setText( url );
@@ -331,16 +331,16 @@ void KCMKontactKNT::modified()
 
 void KCMKontactKNT::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   mAllNews = new KListView( this );
   mAllNews->addColumn( i18n( "All" ) );
   mAllNews->setRootIsDecorated( true );
   mAllNews->setFullWidth( true );
-  layout->addWidget( mAllNews, 0, 0 );
+  tqlayout->addWidget( mAllNews, 0, 0 );
 
-  TQVBoxLayout *vbox = new TQVBoxLayout( layout, KDialog::spacingHint() );
+  TQVBoxLayout *vbox = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
 
   vbox->addStretch();
   mAddButton = new KPushButton( i18n( "Add" ), this );
@@ -354,12 +354,12 @@ void KCMKontactKNT::initGUI()
   mSelectedNews = new KListView( this );
   mSelectedNews->addColumn( i18n( "Selected" ) );
   mSelectedNews->setFullWidth( true );
-  layout->addWidget( mSelectedNews, 0, 2 );
+  tqlayout->addWidget( mSelectedNews, 0, 2 );
 
   TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
                                   i18n( "News Feed Settings" ), this );
 
-  TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3,
+  TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Refresh time:" ), box );
@@ -384,7 +384,7 @@ void KCMKontactKNT::initGUI()
   mDeleteButton->setEnabled( false );
   boxLayout->addWidget( mDeleteButton, 1, 2 );
 
-  layout->addMultiCellWidget( box, 1, 1, 0, 2 );
+  tqlayout->addMultiCellWidget( box, 1, 1, 0, 2 );
 }
 
 bool KCMKontactKNT::dcopActive() const
diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h
index 0fe52d3b7..b092469aa 100644
--- a/kontact/plugins/newsticker/newsfeeds.h
+++ b/kontact/plugins/newsticker/newsfeeds.h
@@ -58,257 +58,257 @@ class NewsSourceData
 static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
   // Arts ---------------
     NewsSourceData(
-    TQString::fromLatin1("Bureau 42"),
-    TQString::fromLatin1("http://www.bureau42.com/rdf/"),
-    TQString::fromLatin1("http://www.bureau42.com/favicon.ico"),
+    TQString::tqfromLatin1("Bureau 42"),
+    TQString::tqfromLatin1("http://www.bureau42.com/rdf/"),
+    TQString::tqfromLatin1("http://www.bureau42.com/favicon.ico"),
     NewsSourceData::Arts ),
     NewsSourceData(
-    TQString::fromLatin1("eFilmCritic"),
-    TQString::fromLatin1("http://efilmcritic.com/fo.rdf"),
-    TQString::fromLatin1("http://efilmcritic.com/favicon.ico"),
+    TQString::tqfromLatin1("eFilmCritic"),
+    TQString::tqfromLatin1("http://efilmcritic.com/fo.rdf"),
+    TQString::tqfromLatin1("http://efilmcritic.com/favicon.ico"),
     NewsSourceData::Arts ),
   // Business -----------
     NewsSourceData(
-    TQString::fromLatin1("Internet.com Business"),
-    TQString::fromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
+    TQString::tqfromLatin1("Internet.com Business"),
+    TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
     TQString(),
     NewsSourceData::Business ),
     NewsSourceData(
-    TQString::fromLatin1("TradeSims"),
-    TQString::fromLatin1("http://www.tradesims.com/AEX.rdf"),
+    TQString::tqfromLatin1("TradeSims"),
+    TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"),
     TQString(),
     NewsSourceData::Business ),
   // Computers ----------
     NewsSourceData(
-    TQString::fromLatin1("KDE Deutschland"),
-    TQString::fromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
-    TQString::fromLatin1("http://www.kde.de/favicon.ico"),
+    TQString::tqfromLatin1("KDE Deutschland"),
+    TQString::tqfromLatin1("http://www.kde.de/nachrichten/nachrichten.rdf"),
+    TQString::tqfromLatin1("http://www.kde.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("KDE France"),
-    TQString::fromLatin1("http://www.kde-france.org/backend-breves.php3"),
+    TQString::tqfromLatin1("KDE France"),
+    TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"),
     TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreeBSD Project News"),
-    TQString::fromLatin1("http://www.freebsd.org/news/news.rdf"),
-    TQString::fromLatin1("http://www.freebsd.org/favicon.ico"),
+    TQString::tqfromLatin1("FreeBSD Project News"),
+    TQString::tqfromLatin1("http://www.freebsd.org/news/news.rdf"),
+    TQString::tqfromLatin1("http://www.freebsd.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("dot.kde.org"),
-    TQString::fromLatin1("http://www.kde.org/dotkdeorg.rdf"),
-    TQString::fromLatin1("http://www.kde.org/favicon.ico"),
+    TQString::tqfromLatin1("dot.kde.org"),
+    TQString::tqfromLatin1("http://www.kde.org/dotkdeorg.rdf"),
+    TQString::tqfromLatin1("http://www.kde.org/favicon.ico"),
     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("KDE-Look.org"),
-                    TQString::fromLatin1("http://www.kde.org/kde-look-content.rdf"),
-                    TQString::fromLatin1("http://kde-look.org/img/favicon-1-1.ico"),
+    NewsSourceData( TQString::tqfromLatin1("KDE-Look.org"),
+                    TQString::tqfromLatin1("http://www.kde.org/kde-look-content.rdf"),
+                    TQString::tqfromLatin1("http://kde-look.org/img/favicon-1-1.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("KDE-Apps.org"),
-                    TQString::fromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"),
-                    TQString::fromLatin1("http://kde-apps.org/img/favicon-1-1.ico"),
+    NewsSourceData( TQString::tqfromLatin1("KDE-Apps.org"),
+                    TQString::tqfromLatin1("http://www.kde.org/dot/kde-apps-content.rdf"),
+                    TQString::tqfromLatin1("http://kde-apps.org/img/favicon-1-1.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("DesktopLinux"),
-                    TQString::fromLatin1("http://www.desktoplinux.com/backend/index.html"),
-                    TQString::fromLatin1("http://www.desktoplinux.com/images/favicon.ico"),
+    NewsSourceData( TQString::tqfromLatin1("DesktopLinux"),
+                    TQString::tqfromLatin1("http://www.desktoplinux.com/backend/index.html"),
+                    TQString::tqfromLatin1("http://www.desktoplinux.com/images/favicon.ico"),
                     NewsSourceData::Computers ),
-    NewsSourceData( TQString::fromLatin1("DistroWatch"),
-                    TQString::fromLatin1("http://distrowatch.com/news/dw.xml"),
-                    TQString::fromLatin1("http://distrowatch.com/favicon.ico"),
+    NewsSourceData( TQString::tqfromLatin1("DistroWatch"),
+                    TQString::tqfromLatin1("http://distrowatch.com/news/dw.xml"),
+                    TQString::tqfromLatin1("http://distrowatch.com/favicon.ico"),
                     NewsSourceData::Computers ),
     /*URL changed*/
     NewsSourceData(
-    TQString::fromLatin1("GNOME News"),
-    TQString::fromLatin1("http://www.gnomedesktop.org/node/feed"),
+    TQString::tqfromLatin1("GNOME News"),
+    TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"),
     TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot"),
-    TQString::fromLatin1("http://slashdot.org/slashdot.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot"),
+    TQString::tqfromLatin1("http://slashdot.org/slashdot.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Ask Slashdot"),
-    TQString::fromLatin1("http://slashdot.org/askslashdot.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Ask Slashdot"),
+    TQString::tqfromLatin1("http://slashdot.org/askslashdot.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Features"),
-    TQString::fromLatin1("http://slashdot.org/features.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Features"),
+    TQString::tqfromLatin1("http://slashdot.org/features.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Apache"),
-    TQString::fromLatin1("http://slashdot.org/apache.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Apache"),
+    TQString::tqfromLatin1("http://slashdot.org/apache.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Slashdot: Books"),
-    TQString::fromLatin1("http://slashdot.org/books.rdf"),
-    TQString::fromLatin1("http://slashdot.org/favicon.ico"),
+    TQString::tqfromLatin1("Slashdot: Books"),
+    TQString::tqfromLatin1("http://slashdot.org/books.rdf"),
+    TQString::tqfromLatin1("http://slashdot.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Jabber News"),
-    TQString::fromLatin1("http://www.jabber.org/news/rss.xml"),
+    TQString::tqfromLatin1("Jabber News"),
+    TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"),
     TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Freshmeat"),
-    TQString::fromLatin1("http://freshmeat.net/backend/fm.rdf"),
-    TQString::fromLatin1("http://freshmeat.net/favicon.ico"),
+    TQString::tqfromLatin1("Freshmeat"),
+    TQString::tqfromLatin1("http://freshmeat.net/backend/fm.rdf"),
+    TQString::tqfromLatin1("http://freshmeat.net/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Linux Weekly News"),
-    TQString::fromLatin1("http://www.lwn.net/headlines/rss"),
-    TQString::fromLatin1("http://www.lwn.net/favicon.ico"),
+    TQString::tqfromLatin1("Linux Weekly News"),
+    TQString::tqfromLatin1("http://www.lwn.net/headlines/rss"),
+    TQString::tqfromLatin1("http://www.lwn.net/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("heise online news"),
-    TQString::fromLatin1("http://www.heise.de/newsticker/heise.rdf"),
-    TQString::fromLatin1("http://www.heise.de/favicon.ico"),
+    TQString::tqfromLatin1("heise online news"),
+    TQString::tqfromLatin1("http://www.heise.de/newsticker/heise.rdf"),
+    TQString::tqfromLatin1("http://www.heise.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("RUS-CERT Ticker"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
+    TQString::tqfromLatin1("RUS-CERT Ticker"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert.rdf"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("RUS-CERT Elsewhere"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"),
-    TQString::fromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
+    TQString::tqfromLatin1("RUS-CERT Elsewhere"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/ticker/rus-cert-elsewhere.rdf"),
+    TQString::tqfromLatin1("http://cert.uni-stuttgart.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Kuro5hin"),
-    TQString::fromLatin1("http://kuro5hin.org/backend.rdf"),
-    TQString::fromLatin1("http://kuro5hin.org/favicon.ico"),
+    TQString::tqfromLatin1("Kuro5hin"),
+    TQString::tqfromLatin1("http://kuro5hin.org/backend.rdf"),
+    TQString::tqfromLatin1("http://kuro5hin.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Prolinux"),
-    TQString::fromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
-    TQString::fromLatin1("http://www.prolinux.de/favicon.ico"),
+    TQString::tqfromLatin1("Prolinux"),
+    TQString::tqfromLatin1("http://www.pl-forum.de/backend/pro-linux.rdf"),
+    TQString::tqfromLatin1("http://www.prolinux.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("LinuxSecurity.com"),
-    TQString::fromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
-    TQString::fromLatin1("http://www.linuxsecurity.com/favicon.ico"),
+    TQString::tqfromLatin1("LinuxSecurity.com"),
+    TQString::tqfromLatin1("http://www.linuxsecurity.com/linuxsecurity_hybrid.rdf"),
+    TQString::tqfromLatin1("http://www.linuxsecurity.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Linux Game Tome"),
-    TQString::fromLatin1("http://happypenguin.org/html/news.rdf"),
+    TQString::tqfromLatin1("Linux Game Tome"),
+    TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"),
     TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Mozilla"),
-    TQString::fromLatin1("http://www.mozilla.org/news.rdf"),
-    TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"),
+    TQString::tqfromLatin1("Mozilla"),
+    TQString::tqfromLatin1("http://www.mozilla.org/news.rdf"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("MozillaZine"),
-    TQString::fromLatin1("http://www.mozillazine.org/contents.rdf"),
-    TQString::fromLatin1("http://www.mozillazine.org/favicon.ico"),
+    TQString::tqfromLatin1("MozillaZine"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/contents.rdf"),
+    TQString::tqfromLatin1("http://www.mozillazine.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Daemon News"),
-    TQString::fromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
+    TQString::tqfromLatin1("Daemon News"),
+    TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
     TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("use Perl;"),
-    TQString::fromLatin1("http://use.perl.org/useperl.rdf"),
+    TQString::tqfromLatin1("use Perl;"),
+    TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"),
     TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Root prompt"),
-    TQString::fromLatin1("http://www.rootprompt.org/rss/"),
-    TQString::fromLatin1("http://www.rootprompt.org/favicon.ico"),
+    TQString::tqfromLatin1("Root prompt"),
+    TQString::tqfromLatin1("http://www.rootprompt.org/rss/"),
+    TQString::tqfromLatin1("http://www.rootprompt.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("SecurityFocus"),
-    TQString::fromLatin1("http://www.securityfocus.com/topnews-rdf.html"),
-    TQString::fromLatin1("http://www.securityfocus.com/favicon.ico"),
+    TQString::tqfromLatin1("SecurityFocus"),
+    TQString::tqfromLatin1("http://www.securityfocus.com/topnews-rdf.html"),
+    TQString::tqfromLatin1("http://www.securityfocus.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("Arstechnica"),
-    TQString::fromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"),
-    TQString::fromLatin1("http://arstechnica.com/favicon.ico"),
+    TQString::tqfromLatin1("Arstechnica"),
+    TQString::tqfromLatin1("http://arstechnica.com/etc/rdf/ars.rdf"),
+    TQString::tqfromLatin1("http://arstechnica.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"),
-    TQString::fromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"),
-    TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"),
+    TQString::tqfromLatin1("amiga-news.de - deutschsprachige Amiga Nachrichten"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/de/backends/news/index.rss"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("amiga-news.de - english Amiga news"),
-    TQString::fromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"),
-    TQString::fromLatin1("http://www.amiga-news.de/favicon.ico"),
+    TQString::tqfromLatin1("amiga-news.de - english Amiga news"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/en/backends/news/index.rss"),
+    TQString::tqfromLatin1("http://www.amiga-news.de/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreshPorts - the place for ports"),
-    TQString::fromLatin1("http://www.freshports.org/news.php3"),
-    TQString::fromLatin1("http://www.freshports.org/favicon.ico"),
+    TQString::tqfromLatin1("FreshPorts - the place for ports"),
+    TQString::tqfromLatin1("http://www.freshports.org/news.php3"),
+    TQString::tqfromLatin1("http://www.freshports.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("zez.org - about code "),
-    TQString::fromLatin1("http://zez.org/article/rssheadlines"),
+    TQString::tqfromLatin1("zez.org - about code "),
+    TQString::tqfromLatin1("http://zez.org/article/rssheadlines"),
     TQString(),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("BSDatwork.com"),
-    TQString::fromLatin1("http://BSDatwork.com/backend.php"),
-    TQString::fromLatin1("http://BSDatwork.com/favicon.ico"),
+    TQString::tqfromLatin1("BSDatwork.com"),
+    TQString::tqfromLatin1("http://BSDatwork.com/backend.php"),
+    TQString::tqfromLatin1("http://BSDatwork.com/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("FreshSource - the place for source"),
-    TQString::fromLatin1("http://www.freshsource.org/news.php"),
-    TQString::fromLatin1("http://www.freshsource.org/favicon.ico"),
+    TQString::tqfromLatin1("FreshSource - the place for source"),
+    TQString::tqfromLatin1("http://www.freshsource.org/news.php"),
+    TQString::tqfromLatin1("http://www.freshsource.org/favicon.ico"),
     NewsSourceData::Computers ),
     NewsSourceData(
-    TQString::fromLatin1("The FreeBSD Diary"),
-    TQString::fromLatin1("http://www.freebsddiary.org/news.php"),
-    TQString::fromLatin1("http://www.freebsddiary.org/favicon.ico"),
+    TQString::tqfromLatin1("The FreeBSD Diary"),
+    TQString::tqfromLatin1("http://www.freebsddiary.org/news.php"),
+    TQString::tqfromLatin1("http://www.freebsddiary.org/favicon.ico"),
     NewsSourceData::Computers ),
   // Miscellaneous ------
     NewsSourceData(
-    TQString::fromLatin1("tagesschau.de"),
-    TQString::fromLatin1("http://www.tagesschau.de/newsticker.rdf"),
-    TQString::fromLatin1("http://www.tagesschau.de/favicon.ico"),
+    TQString::tqfromLatin1("tagesschau.de"),
+    TQString::tqfromLatin1("http://www.tagesschau.de/newsticker.rdf"),
+    TQString::tqfromLatin1("http://www.tagesschau.de/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1("CNN Top Stories"),
-    TQString::fromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"),
-    TQString::fromLatin1("http://www.cnn.com/favicon.ico"),
+    TQString::tqfromLatin1("CNN Top Stories"),
+    TQString::tqfromLatin1("http://rss.cnn.com/rss/cnn_topstories.rss"),
+    TQString::tqfromLatin1("http://www.cnn.com/favicon.ico"),
     NewsSourceData::Misc ),
     /*feed URL changed*/
     NewsSourceData(
-    TQString::fromLatin1("HotWired"),
-    TQString::fromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"),
-    TQString::fromLatin1("http://www.hotwired.com/favicon.ico"),
+    TQString::tqfromLatin1("HotWired"),
+    TQString::tqfromLatin1("http://www.wired.com/news/feeds/rss2/0,2610,,00.xml"),
+    TQString::tqfromLatin1("http://www.hotwired.com/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1("The Register"),
-    TQString::fromLatin1("http://www.theregister.co.uk/headlines.rss"),
-    TQString::fromLatin1("http://www.theregister.co.uk/favicon.ico"),
+    TQString::tqfromLatin1("The Register"),
+    TQString::tqfromLatin1("http://www.theregister.co.uk/headlines.rss"),
+    TQString::tqfromLatin1("http://www.theregister.co.uk/favicon.ico"),
     NewsSourceData::Misc ),
     NewsSourceData(
-    TQString::fromLatin1( "Christian Science Monitor" ),
-    TQString::fromLatin1( "http://www.csmonitor.com/rss/csm.rss"),
-    TQString::fromLatin1( "http://www.csmonitor.com/favicon.ico"),
+    TQString::tqfromLatin1( "Christian Science Monitor" ),
+    TQString::tqfromLatin1( "http://www.csmonitor.com/rss/csm.rss"),
+    TQString::tqfromLatin1( "http://www.csmonitor.com/favicon.ico"),
     NewsSourceData::Misc ),
   // Recreation
    // Society
     NewsSourceData(
-    TQString::fromLatin1("nippon.it"),
-    TQString::fromLatin1("http://www.nippon.it/backend.it.php"),
-    TQString::fromLatin1("http://www.nippon.it/favicon.ico"),
+    TQString::tqfromLatin1("nippon.it"),
+    TQString::tqfromLatin1("http://www.nippon.it/backend.it.php"),
+    TQString::tqfromLatin1("http://www.nippon.it/favicon.ico"),
     NewsSourceData::Society ),
     NewsSourceData(
-    TQString::fromLatin1( "gflash" ),
-    TQString::fromLatin1( "http://www.gflash.de/backend.php"),
-    TQString::fromLatin1( "http://www.gflash.de/favicon.ico"),
+    TQString::tqfromLatin1( "gflash" ),
+    TQString::tqfromLatin1( "http://www.gflash.de/backend.php"),
+    TQString::tqfromLatin1( "http://www.gflash.de/favicon.ico"),
     NewsSourceData::Society ),
     NewsSourceData(
-    TQString::fromLatin1( "Quintessenz" ),
-    TQString::fromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
-    TQString::fromLatin1( "http://quintessenz.at/favicon.ico"),
+    TQString::tqfromLatin1( "Quintessenz" ),
+    TQString::tqfromLatin1( "http://quintessenz.at/cgi-bin/rdf"),
+    TQString::tqfromLatin1( "http://quintessenz.at/favicon.ico"),
     NewsSourceData::Society )
 };
 
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 40eddd2f5..2ba0dfcfa 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -21,10 +21,10 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqeventloop.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
@@ -220,7 +220,7 @@ void SummaryWidget::updateView()
     KURLLabel *urlLabel = new KURLLabel( hbox );
     urlLabel->setURL( (*it).url );
     urlLabel->setPixmap( (*it).logo );
-    urlLabel->setMaximumSize( urlLabel->minimumSizeHint() );
+    urlLabel->setMaximumSize( urlLabel->tqminimumSizeHint() );
     mLabels.append( urlLabel );
 
     connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
@@ -231,13 +231,13 @@ void SummaryWidget::updateView()
     // header
     TQLabel *label = new TQLabel( hbox );
     label->setText( KCharsets::resolveEntities( (*it).title ) );
-    label->setAlignment( AlignLeft|AlignVCenter );
+    label->tqsetAlignment( AlignLeft|AlignVCenter );
     label->setFont( boldFont );
     label->setIndent( 6 );
-    label->setMaximumSize( label->minimumSizeHint() );
+    label->setMaximumSize( label->tqminimumSizeHint() );
     mLabels.append( label );
 
-    hbox->setMaximumWidth( hbox->minimumSizeHint().width() );
+    hbox->setMaximumWidth( hbox->tqminimumSizeHint().width() );
     hbox->show();
 
     // articles
@@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
   menu.insertItem( i18n( "Copy URL to Clipboard" ) );
   int id = menu.exec( TQCursor::pos() );
   if ( id != -1 )
-    kapp->clipboard()->setText( url, TQClipboard::Clipboard );
+    kapp->tqclipboard()->setText( url, TQClipboard::Clipboard );
 }
 
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index eb954ccf2..a59406590 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -25,7 +25,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 
@@ -85,10 +85,10 @@ void KCMSDSummary::customDaysChanged( int value )
 
 void KCMSDSummary::initGUI()
 {
-  TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
 
   mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(),
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->tqlayout(),
                                             KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "How many days should the special dates summary show at once?" ), mDaysGroup );
@@ -117,7 +117,7 @@ void KCMSDSummary::initGUI()
 
   hbox->addStretch( 1 );
 
-  layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
 
   mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this );
 
@@ -132,10 +132,10 @@ void KCMSDSummary::initGUI()
   mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup );
   mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup );
 
-  layout->addWidget( mCalendarGroup, 1, 0 );
-  layout->addWidget( mContactGroup, 1, 1 );
+  tqlayout->addWidget( mCalendarGroup, 1, 0 );
+  tqlayout->addWidget( mContactGroup, 1, 1 );
 
-  layout->setRowStretch( 2, 1 );
+  tqlayout->setRowStretch( 2, 1 );
 }
 
 void KCMSDSummary::load()
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 733ef1ac4..3fbac9d2e 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqimage.h>
 #include <tqtooltip.h>
 
@@ -183,8 +183,8 @@ int SDSummaryWidget::span( KCal::Event *event )
   int span=1;
   if ( event->isMultiDay() && event->doesFloat() ) {
     TQDate d = event->dtStart().date();
-    if ( d < TQDate::currentDate() ) {
-      d = TQDate::currentDate();
+    if ( d < TQDate::tqcurrentDate() ) {
+      d = TQDate::tqcurrentDate();
     }
     while ( d < event->dtEnd().date() ) {
       span++;
@@ -199,8 +199,8 @@ int SDSummaryWidget::dayof( KCal::Event *event, const TQDate& date )
 {
   int dayof=1;
   TQDate d = event->dtStart().date();
-  if ( d < TQDate::currentDate() ) {
-    d = TQDate::currentDate();
+  if ( d < TQDate::tqcurrentDate() ) {
+    d = TQDate::tqcurrentDate();
   }
   while ( d < event->dtEnd().date() ) {
     if ( d < date ) {
@@ -269,9 +269,9 @@ void SDSummaryWidget::updateView()
   // Search for Birthdays, Anniversaries, Holidays, and Special Occasions
   // in the Calendar
   TQDate dt;
-  TQDate currentDate = TQDate::currentDate();
-  for ( dt=currentDate;
-        dt<=currentDate.addDays( mDaysAhead - 1 );
+  TQDate tqcurrentDate = TQDate::tqcurrentDate();
+  for ( dt=tqcurrentDate;
+        dt<=tqcurrentDate.addDays( mDaysAhead - 1 );
         dt=dt.addDays(1) ) {
     KCal::Event::List events = mCalendar->events( dt,
                                                   KCal::EventSortStartDate,
@@ -358,8 +358,8 @@ void SDSummaryWidget::updateView()
   // Seach for Holidays
   if ( mShowHolidays ) {
     if ( initHolidays() ) {
-      for ( dt=currentDate;
-            dt<=currentDate.addDays( mDaysAhead - 1 );
+      for ( dt=tqcurrentDate;
+            dt<=tqcurrentDate.addDays( mDaysAhead - 1 );
             dt=dt.addDays(1) ) {
         TQValueList<KHoliday> holidays = mHolidays->getHolidays( dt );
         TQValueList<KHoliday>::ConstIterator it = holidays.begin();
@@ -429,8 +429,8 @@ void SDSummaryWidget::updateView()
       } else {
         label->setPixmap( icon_img );
       }
-      label->setMaximumWidth( label->minimumSizeHint().width() );
-      label->setAlignment( AlignVCenter );
+      label->setMaximumWidth( label->tqminimumSizeHint().width() );
+      label->tqsetAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -438,7 +438,7 @@ void SDSummaryWidget::updateView()
       TQString datestr;
 
       //Muck with the year -- change to the year 'daysTo' days away
-      int year = currentDate.addDays( (*addrIt).daysTo ).year();
+      int year = tqcurrentDate.addDays( (*addrIt).daysTo ).year();
       TQDate sD = TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() );
 
       if ( (*addrIt).daysTo == 0 ) {
@@ -457,7 +457,7 @@ void SDSummaryWidget::updateView()
       }
 
       label = new TQLabel( datestr, this );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 1 );
       mLabels.append( label );
       if ( makeBold ) {
@@ -474,7 +474,7 @@ void SDSummaryWidget::updateView()
         label->setText( i18n( "in 1 day", "in %n days", (*addrIt).daysTo ) );
       }
 
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 2 );
       mLabels.append( label );
 
@@ -492,7 +492,7 @@ void SDSummaryWidget::updateView()
       }
       label = new TQLabel( this );
       label->setText( what );
-      label->setAlignment( AlignLeft | AlignVCenter );
+      label->tqsetAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 3 );
       mLabels.append( label );
 
@@ -530,7 +530,7 @@ void SDSummaryWidget::updateView()
         } else {
           label->setText( i18n( "one year", "%n years", (*addrIt).yearsOld  ) );
         }
-        label->setAlignment( AlignLeft | AlignVCenter );
+        label->tqsetAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 5 );
         mLabels.append( label );
       }
@@ -542,7 +542,7 @@ void SDSummaryWidget::updateView()
         i18n( "No special dates within the next 1 day",
               "No special dates pending within the next %n days",
               mDaysAhead ), this, "nothing to see" );
-    label->setAlignment( AlignHCenter | AlignVCenter );
+    label->tqsetAlignment( AlignHCenter | AlignVCenter );
     mLayout->addMultiCellWidget( label, 0, 0, 0, 4 );
     mLabels.append( label );
   }
@@ -595,7 +595,7 @@ bool SDSummaryWidget::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( "Mail to:\"%1\"" ).arg( label->text() ) );
+      emit message( i18n( "Mail to:\"%1\"" ).tqarg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
@@ -605,27 +605,27 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 
 void SDSummaryWidget::dateDiff( const TQDate &date, int &days, int &years )
 {
-  TQDate currentDate;
+  TQDate tqcurrentDate;
   TQDate eventDate;
 
   if ( TQDate::leapYear( date.year() ) && date.month() == 2 && date.day() == 29 ) {
-    currentDate = TQDate( date.year(), TQDate::currentDate().month(), TQDate::currentDate().day() );
-    if ( !TQDate::leapYear( TQDate::currentDate().year() ) )
+    tqcurrentDate = TQDate( date.year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() );
+    if ( !TQDate::leapYear( TQDate::tqcurrentDate().year() ) )
       eventDate = TQDate( date.year(), date.month(), 28 ); // celebrate one day earlier ;)
     else
       eventDate = TQDate( date.year(), date.month(), date.day() );
   } else {
-    currentDate = TQDate( 0, TQDate::currentDate().month(), TQDate::currentDate().day() );
+    tqcurrentDate = TQDate( 0, TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() );
     eventDate = TQDate( 0, date.month(), date.day() );
   }
 
-  int offset = currentDate.daysTo( eventDate );
+  int offset = tqcurrentDate.daysTo( eventDate );
   if ( offset < 0 ) {
     days = 365 + offset;
-    years = TQDate::currentDate().year() + 1 - date.year();
+    years = TQDate::tqcurrentDate().year() + 1 - date.year();
   } else {
     days = offset;
-    years = TQDate::currentDate().year() - date.year();
+    years = TQDate::tqcurrentDate().year() - date.year();
   }
 }
 
diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 4b5373b34..63c1d3ceb 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
 
 void DropWidget::dropEvent( TQDropEvent *event )
 {
-  int alignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
-  alignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
-  emit summaryWidgetDropped( this, event->source(), alignment );
+  int tqalignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
+  tqalignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
+  emit summaryWidgetDropped( this, event->source(), tqalignment );
 }
 
 #include "dropwidget.moc"
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index c4fe2c8b2..e2d11c9ee 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -33,7 +33,7 @@ class DropWidget : public TQWidget
     DropWidget( TQWidget *parent, const char *name = 0 );
 
   signals:
-    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
 
   protected:
     virtual void dragEnterEvent( TQDragEnterEvent* );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index d96095699..47c9bca64 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -33,7 +33,7 @@
 #include <kplugininfo.h>
 #include <ktrader.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
 
@@ -93,15 +93,15 @@ PluginView::~PluginView()
 KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "Here you can select which summary plugins to have visible in your summary view." ), this );
-  layout->addWidget( label );
+  tqlayout->addWidget( label );
 
   mPluginView = new PluginView( this );
-  layout->addWidget( mPluginView );
+  tqlayout->addWidget( mPluginView );
 
-  layout->setStretchFactor( mPluginView, 1 );
+  tqlayout->setStretchFactor( mPluginView, 1 );
 
   connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
            this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
@@ -119,8 +119,8 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
 void KCMKontactSummary::load()
 {
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
+      TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
 
   TQStringList activeSummaries;
 
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 93f48d667..d65228cd1 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -23,7 +23,7 @@
 
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 
 #include <dcopclient.h>
@@ -80,7 +80,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
   connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) );
   slotAdjustPalette();
 
-  setDate( TQDate::currentDate() );
+  setDate( TQDate::tqcurrentDate() );
   connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ),
            TQT_SLOT( setDate( const TQDate& ) ) );
 
@@ -136,8 +136,8 @@ void SummaryViewPart::updateWidgets()
   KPIM::IdentityManager idm( true, this );
   const KPIM::Identity &id = idm.defaultIdentity();
 
-  TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() );
-  mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) );
+  TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() );
+  mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).tqarg( currentUser ) );
 
   mSummaries.clear();
 
@@ -214,11 +214,11 @@ void SummaryViewPart::updateWidgets()
   TQFrame *vline = new TQFrame( mFrame );
   vline->setFrameStyle( TQFrame::VLine | TQFrame::Plain );
 
-  TQHBoxLayout *layout = new TQHBoxLayout( mFrame );
+  TQHBoxLayout *tqlayout = new TQHBoxLayout( mFrame );
 
-  mLeftColumn = new TQVBoxLayout( layout, KDialog::spacingHint() );
-  layout->addWidget( vline );
-  mRightColumn = new TQVBoxLayout( layout, KDialog::spacingHint()  );
+  mLeftColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint() );
+  tqlayout->addWidget( vline );
+  mRightColumn = new TQVBoxLayout( tqlayout, KDialog::spacingHint()  );
 
 
   TQStringList::Iterator strIt;
@@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets()
   mRightColumn->addStretch();
 }
 
-void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment )
+void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment )
 {
   if ( target == widget )
     return;
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   if ( target == mFrame ) {
     int pos = 0;
 
-    if ( alignment & TQt::AlignTop )
+    if ( tqalignment & TQt::AlignTop )
       pos = 0;
 
-    if ( alignment & TQt::AlignLeft ) {
-      if ( alignment & TQt::AlignBottom )
+    if ( tqalignment & TQt::AlignLeft ) {
+      if ( tqalignment & TQt::AlignBottom )
         pos = mLeftColumnSummaries.count();
 
       mLeftColumn->insertWidget( pos, widget );
       mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
     } else {
-      if ( alignment & TQt::AlignBottom )
+      if ( tqalignment & TQt::AlignBottom )
         pos = mRightColumnSummaries.count();
 
       mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
 
   int targetPos = mLeftColumn->findWidget( target );
   if ( targetPos != -1 ) {
-    if ( alignment == TQt::AlignBottom )
+    if ( tqalignment == TQt::AlignBottom )
       targetPos++;
 
     mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   } else {
     targetPos = mRightColumn->findWidget( target );
 
-    if ( alignment == TQt::AlignBottom )
+    if ( tqalignment == TQt::AlignBottom )
       targetPos++;
 
     mRightColumn->insertWidget( targetPos, widget );
@@ -311,13 +311,13 @@ void SummaryViewPart::slotTextChanged()
 
 void SummaryViewPart::slotAdjustPalette()
 {
-  mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() );
+  mMainWidget->setPaletteBackgroundColor( kapp->tqpalette().active().base() );
 }
 
 void SummaryViewPart::setDate( const TQDate& newDate )
 {
   TQString date( "<b>%1</b>" );
-  date = date.arg( KGlobal::locale()->formatDate( newDate ) );
+  date = date.tqarg( KGlobal::locale()->formatDate( newDate ) );
   mDateLabel->setText( date );
 }
 
@@ -374,7 +374,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
   mUsernameLabel = new TQLabel( mMainWidget );
   hbl->addWidget( mUsernameLabel );
   mDateLabel = new TQLabel( mMainWidget );
-  mDateLabel->setAlignment( AlignRight );
+  mDateLabel->tqsetAlignment( AlignRight );
   hbl->addWidget( mDateLabel );
 
   TQFrame *hline = new TQFrame( mMainWidget );
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 28a591dde..5a99b947d 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -76,7 +76,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
   protected slots:
     void slotConfigure();
     void updateWidgets();
-    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment );
+    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment );
 
   private:
     void initGUI( Kontact::Core *core );
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index a114dd4dc..3c900a535 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -25,7 +25,7 @@
 #include "test_part.h"
 #include "kaddressbookiface_stub.h"
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcombobox.h>
 
 #include "sidebarextension.h"
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index a9dae3f06..bf4d452ad 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -22,7 +22,7 @@
 */
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
@@ -43,7 +43,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
     DCOPObject( "WeatherSummaryWidget" ), mProc( 0 )
 {
   mLayout = new TQVBoxLayout( this, 3, 3 );
-  mLayout->setAlignment( TQt::AlignTop );
+  mLayout->tqsetAlignment( TQt::AlignTop );
 
   TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
   TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
@@ -101,50 +101,50 @@ void SummaryWidget::updateView()
   for ( it = dataList.begin(); it != dataList.end(); ++it ) {
     TQString cover;
     for ( uint i = 0; i < (*it).cover().count(); ++i )
-      cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] );
+      cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] );
 
     TQImage img;
     img = (*it).icon();
 
-    TQGridLayout *layout = new TQGridLayout( mLayout, 3, 3, 3 );
-    mLayouts.append( layout );
+    TQGridLayout *tqlayout = new TQGridLayout( mLayout, 3, 3, 3 );
+    mLayouts.append( tqlayout );
 
     KURLLabel* urlLabel = new KURLLabel( this );
     urlLabel->installEventFilter( this );
     urlLabel->setURL( (*it).stationID() );
     urlLabel->setPixmap( img.smoothScale( 32, 32 ) );
-    urlLabel->setMaximumSize( urlLabel->sizeHint() );
-    urlLabel->setAlignment( AlignTop );
-    layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
+    urlLabel->setMaximumSize( urlLabel->tqsizeHint() );
+    urlLabel->tqsetAlignment( AlignTop );
+    tqlayout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
     mLabels.append( urlLabel );
     connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
               this, TQT_SLOT( showReport( const TQString& ) ) );
 
     TQLabel* label = new TQLabel( this );
-    label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
+    label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) );
     TQFont font = label->font();
     font.setBold( true );
     label->setFont( font );
-    label->setAlignment( AlignLeft );
-    layout->addMultiCellWidget( label, 0, 0, 1, 2 );
+    label->tqsetAlignment( AlignLeft );
+    tqlayout->addMultiCellWidget( label, 0, 0, 1, 2 );
     mLabels.append( label );
 
     TQString labelText;
     labelText = TQString( "<b>%1:</b> %2<br>"
                          "<b>%3:</b> %4<br>"
                          "<b>%5:</b> %6" )
-                         .arg( i18n( "Last updated on" ) )
-                         .arg( (*it).date() )
-                         .arg( i18n( "Wind Speed" ) )
-                         .arg( (*it).windSpeed() )
-                         .arg( i18n( "Rel. Humidity" ) )
-                         .arg( (*it).relativeHumidity() );
+                         .tqarg( i18n( "Last updated on" ) )
+                         .tqarg( (*it).date() )
+                         .tqarg( i18n( "Wind Speed" ) )
+                         .tqarg( (*it).windSpeed() )
+                         .tqarg( i18n( "Rel. Humidity" ) )
+                         .tqarg( (*it).relativeHumidity() );
 
     TQToolTip::add( label, labelText.replace( " ", "&nbsp;" ) );
 
     label = new TQLabel( cover, this );
-    label->setAlignment( AlignLeft );
-    layout->addMultiCellWidget( label, 1, 1, 1, 2 );
+    label->tqsetAlignment( AlignLeft );
+    tqlayout->addMultiCellWidget( label, 1, 1, 1, 2 );
     mLabels.append( label );
   }
 
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index 6f27a4cfc..1bbd0ef6c 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -33,7 +33,7 @@
 #include <kactivelabel.h>
 #include <ktextbrowser.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <kdebug.h>
@@ -81,7 +81,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
 
     text += "<p><b>" + about->programName() + "</b><br>";
 
-    text += i18n( "Version %1</p>" ).arg( about->version() );
+    text += i18n( "Version %1</p>" ).tqarg( about->version() );
 
     if ( !about->shortDescription().isEmpty() ) {
       text += "<p>" + about->shortDescription() + "<br>" +
@@ -96,7 +96,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
     text.replace( "\n", "<br>" );
 
     KActiveLabel *label = new KActiveLabel( text, topFrame );
-    label->setAlignment( AlignTop );
+    label->tqsetAlignment( AlignTop );
     topLayout->addWidget( label );
 
 
@@ -163,13 +163,13 @@ void AboutDialog::addLicenseText( const KAboutData *about )
   TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature",
                                                     KIcon::Desktop, 48 );
 
-  TQString title = i18n( "%1 License" ).arg( about->programName() );
+  TQString title = i18n( "%1 License" ).tqarg( about->programName() );
 
   TQFrame *topFrame = addPage( title, TQString(), pixmap );
   TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
 
   KTextBrowser *textBrowser = new KTextBrowser( topFrame );
-  textBrowser->setText( TQString( "<pre>%1</pre>" ).arg( about->license() ) );
+  textBrowser->setText( TQString( "<pre>%1</pre>" ).tqarg( about->license() ) );
 
   topLayout->addWidget( textBrowser );
 }
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index a64907663..4eacd6088 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -173,13 +173,13 @@ void EntryItem::paint( TQPainter *p )
 
     TQBrush brush;
     if ( isCurrent() || isSelected() || mPaintActive )
-      brush = box->colorGroup().brush( TQColorGroup::Highlight );
+      brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
     else
-      brush = TQBrush(box->colorGroup().highlight().light( 115 ));
+      brush = TQBrush(box->tqcolorGroup().highlight().light( 115 ));
     p->fillRect( 1, 0, w - 2, h - 1, brush );
     TQPen pen = p->pen();
     TQPen oldPen = pen;
-    pen.setColor( box->colorGroup().mid() );
+    pen.setColor( box->tqcolorGroup().mid() );
     p->setPen( pen );
 
     p->drawPoint( 1, 0 );
@@ -196,9 +196,9 @@ void EntryItem::paint( TQPainter *p )
     p->drawPixmap( x, y, mPixmap );
   }
 
-  TQColor shadowColor = listBox()->colorGroup().background().dark(115);
+  TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115);
   if ( isCurrent() || isSelected() ) {
-    p->setPen( box->colorGroup().highlightedText() );
+    p->setPen( box->tqcolorGroup().highlightedText() );
   }
 
   if ( !text().isEmpty() && navigator()->showText() ) {
@@ -223,15 +223,15 @@ void EntryItem::paint( TQPainter *p )
     }
 
     if ( plugin()->disabled() ) {
-      p->setPen( box->palette().disabled().text( ) );
+      p->setPen( box->tqpalette().disabled().text( ) );
     } else if ( isCurrent() || isSelected() || mHasHover ) {
-      p->setPen( box->colorGroup().highlight().dark(115) );
+      p->setPen( box->tqcolorGroup().highlight().dark(115) );
       p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
           y + 1, text() );
-      p->setPen( box->colorGroup().highlightedText() );
+      p->setPen( box->tqcolorGroup().highlightedText() );
     }
     else
-      p->setPen( box->colorGroup().text() );
+      p->setPen( box->tqcolorGroup().text() );
 
     p->drawText( x, y, text() );
   }
@@ -284,7 +284,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
 
 }
 
-TQSize Navigator::sizeHint() const
+TQSize Navigator::tqsizeHint() const
 {
   return TQSize( 100, 100 );
 }
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index 135332284..d215558df 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -101,12 +101,12 @@ class EntryItemToolTip : public TQToolTip
       if ( !mListBox ) return;
       TQListBoxItem* item = mListBox->itemAt( p );
       if ( !item ) return;
-      const TQRect itemRect = mListBox->itemRect( item );
-      if ( !itemRect.isValid() ) return;
+      const TQRect tqitemRect = mListBox->tqitemRect( item );
+      if ( !tqitemRect.isValid() ) return;
 
       const EntryItem *entryItem = static_cast<EntryItem*>( item );
       TQString tipStr = entryItem->text();
-      tip( itemRect, tipStr );
+      tip( tqitemRect, tipStr );
     }
   private:
     TQListBox* mListBox;
@@ -126,7 +126,7 @@ class Navigator : public KListBox
 
     void updatePlugins( TQValueList<Kontact::Plugin*> plugins );
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     void highlightItem( EntryItem* item );
 
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 87ce5726b..7bfed9cd4 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <tdepimmacros.h>
 
@@ -114,8 +114,8 @@ PluginSelection::~PluginSelection()
 void PluginSelection::readConfig()
 {
   const KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
+      TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
 
   int activeComponent = 0;
   mPluginCombo->clear();
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 20c6f5456..d2a57bcb7 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -76,8 +76,8 @@ static void listPlugins()
 {
   KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
   KTrader::OfferList offers = KTrader::self()->query(
-    TQString::fromLatin1( "Kontact/Plugin" ),
-    TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+    TQString::tqfromLatin1( "Kontact/Plugin" ),
+    TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
   for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {
     KService::Ptr service = (*it);
     // skip summary only plugins
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 88be77c73..fe24bd8dd 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -124,8 +124,8 @@ void MainWindow::initGUI()
            TQT_SLOT( showAboutDialog() ) );
 
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::fromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
+      TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
   mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );
 
   KPluginInfo::List::Iterator it;
@@ -136,7 +136,7 @@ void MainWindow::initGUI()
                                    TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()),
                                    actionCollection(), (*it)->pluginName().latin1() );
     action->setName( (*it)->pluginName().latin1() );
-    action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) );
+    action->setWhatsThis( i18n( "Switch to plugin %1" ).tqarg( (*it)->name() ) );
 
     TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" );
     if ( !hasPartProp.isValid() || hasPartProp.toBool() ) {
@@ -244,7 +244,7 @@ void MainWindow::initWidgets()
   mSplitter = new TQSplitter( mTopWidget );
   mBox = new TQHBox( mTopWidget );
   mSidePane = new IconSidePane( this, mSplitter );
-  mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
+  mSidePane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
                                          TQSizePolicy::Preferred ) );
   // donÄt occupy screen estate on load
   TQValueList<int> sizes;
@@ -267,7 +267,7 @@ void MainWindow::initWidgets()
   initAboutScreen();
 
   TQString loading = i18n( "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>" )
-                    .arg( i18n("Loading Kontact...") );
+                    .tqarg( i18n("Loading Kontact...") );
 
   paintAboutScreen( loading );
 
@@ -278,7 +278,7 @@ void MainWindow::initWidgets()
   mLittleProgress = new KPIM::StatusbarProgressWidget( progressDialog, statusBar() );
 
   mStatusMsgLabel = new KRSqueezedTextLabel( i18n( " Initializing..." ), statusBar() );
-  mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter );
+  mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
 
   statusBar()->addWidget( mStatusMsgLabel, 10 , false );
   statusBar()->addWidget( mLittleProgress, 0 , true );
@@ -290,11 +290,11 @@ void MainWindow::paintAboutScreen( const TQString& msg )
 {
   TQString location = locate( "data", "kontact/about/main.html" );
   TQString content = KPIM::kFileToString( location );
-  content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
+  content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
   if ( kapp->reverseLayout() )
-    content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
+    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
   else
-    content = content.arg( "" );
+    content = content.tqarg( "" );
 
   mIntroPart->begin( KURL( location ) );
 
@@ -302,8 +302,8 @@ void MainWindow::paintAboutScreen( const TQString& msg )
   TQString catchPhrase( i18n( "Get Organized!" ) );
   TQString quickDescription( i18n( "The KDE Personal Information Management Suite" ) );
 
-  mIntroPart->write( content.arg( TQFont().pointSize() + 2 ).arg( appName )
-      .arg( catchPhrase ).arg( quickDescription ).arg( msg ) );
+  mIntroPart->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName )
+      .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( msg ) );
   mIntroPart->end();
 }
 
@@ -629,7 +629,7 @@ void MainWindow::updateShortcuts()
     ++it;
     if ( isPluginLoadedByAction( action ) ) {
       loadedActions.append( action );
-      TQString shortcut = TQString( "CTRL+%1" ).arg( i );
+      TQString shortcut = TQString( "CTRL+%1" ).tqarg( i );
       action->setShortcut( KShortcut( shortcut ) );
       i++;
     } else {
@@ -794,7 +794,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   if ( !part ) {
     KApplication::restoreOverrideCursor();
     KMessageBox::error( this, i18n( "Cannot load part for %1." )
-                              .arg( plugin->title() )
+                              .tqarg( plugin->title() )
                         + "\n" + lastErrorMessage() );
     plugin->setDisabled( true );
     mSidePane->updatePlugins();
@@ -802,13 +802,13 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   }
 
   // store old focus widget
-  TQWidget *focusWidget = kapp->focusWidget();
-  if ( mCurrentPlugin && focusWidget ) {
+  TQWidget *tqfocusWidget = kapp->tqfocusWidget();
+  if ( mCurrentPlugin && tqfocusWidget ) {
     // save the focus widget only when it belongs to the activated part
-    TQWidget *parent = focusWidget->parentWidget();
+    TQWidget *parent = tqfocusWidget->parentWidget();
     while ( parent ) {
       if ( parent == mCurrentPlugin->part()->widget() )
-        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( focusWidget ) );
+        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) );
 
       parent = parent->parentWidget();
     }
@@ -829,9 +829,9 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     view->show();
 
     if ( mFocusWidgets.contains( plugin->identifier() ) ) {
-      focusWidget = mFocusWidgets[ plugin->identifier() ];
-      if ( focusWidget )
-        focusWidget->setFocus();
+      tqfocusWidget = mFocusWidgets[ plugin->identifier() ];
+      if ( tqfocusWidget )
+        tqfocusWidget->setFocus();
     } else
       view->setFocus();
 
@@ -848,7 +848,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
       topDock()->moveDockWindow( navigatorToolBar, -1 );
     }
 
-    setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).arg( plugin->title() ) );
+    setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).tqarg( plugin->title() ) );
 
     if ( newAction ) {
       mNewActions->setIcon( newAction->icon() );
@@ -1178,30 +1178,30 @@ TQString MainWindow::introductionString()
       "<td><a href=\"%1\">%1</a><br><span id=\"subtext\"><nobr>%1</td></tr>"
       "</table>"
       "<p style=\"margin-bottom: 0px\"> <a href=\"%1\">Skip this introduction</a></p>" )
-      .arg( kapp->aboutData()->version() )
-      .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) )
-      .arg( "exec:/help?kontact" )
-      .arg( iconSize )
-      .arg( iconSize )
-      .arg( handbook_icon_path )
-      .arg( "exec:/help?kontact" )
-      .arg( i18n( "Read Manual" ) )
-      .arg( i18n( "Learn more about Kontact and its components" ) )
-      .arg( "http://kontact.org" )
-      .arg( iconSize )
-      .arg( iconSize )
-      .arg( html_icon_path )
-      .arg( "http://kontact.org" )
-      .arg( i18n( "Visit Kontact Website" ) )
-      .arg( i18n( "Access online resources and tutorials" ) )
-      .arg( "exec:/gwwizard" )
-      .arg( iconSize )
-      .arg( iconSize )
-      .arg( wizard_icon_path )
-      .arg( "exec:/gwwizard" )
-      .arg( i18n( "Configure Kontact as Groupware Client" ) )
-      .arg( i18n( "Prepare Kontact for use in corporate networks" ) )
-      .arg( "exec:/switch" );
+      .tqarg( kapp->aboutData()->version() )
+      .tqarg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) )
+      .tqarg( "exec:/help?kontact" )
+      .tqarg( iconSize )
+      .tqarg( iconSize )
+      .tqarg( handbook_icon_path )
+      .tqarg( "exec:/help?kontact" )
+      .tqarg( i18n( "Read Manual" ) )
+      .tqarg( i18n( "Learn more about Kontact and its components" ) )
+      .tqarg( "http://kontact.org" )
+      .tqarg( iconSize )
+      .tqarg( iconSize )
+      .tqarg( html_icon_path )
+      .tqarg( "http://kontact.org" )
+      .tqarg( i18n( "Visit Kontact Website" ) )
+      .tqarg( i18n( "Access online resources and tutorials" ) )
+      .tqarg( "exec:/gwwizard" )
+      .tqarg( iconSize )
+      .tqarg( iconSize )
+      .tqarg( wizard_icon_path )
+      .tqarg( "exec:/gwwizard" )
+      .tqarg( i18n( "Configure Kontact as Groupware Client" ) )
+      .tqarg( i18n( "Prepare Kontact for use in corporate networks" ) )
+      .tqarg( "exec:/switch" );
   return info;
 }
 
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index 87b5d1394..c58377806 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
 
@@ -140,7 +140,7 @@ void Kontact::ProfileDialog::profileLoaded( const TQString& id )
     const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id );
     if ( profile.isNull() )
         return;
-    KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").arg( profile.name() ), i18n("Profile Loaded") );
+    KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").tqarg( profile.name() ), i18n("Profile Loaded") );
 }
 
 void Kontact::ProfileDialog::saveToSelectedProfile()
@@ -148,7 +148,7 @@ void Kontact::ProfileDialog::saveToSelectedProfile()
     const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() );
     if ( profile.isNull() )
         return;
-    if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").arg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) )
+    if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").tqarg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) )
         return;
     Kontact::ProfileManager::self()->saveToProfile( profile.id() );
 }
@@ -158,7 +158,7 @@ void Kontact::ProfileDialog::deleteSelectedProfile()
     const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() );
     if ( profile.isNull() )
         return;
-    if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").arg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) )
+    if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").tqarg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) )
         return;
     Kontact::ProfileManager::self()->removeProfile( profile );
 }
@@ -175,7 +175,7 @@ void Kontact::ProfileDialog::exportSelectedProfile()
     const Kontact::ProfileManager::ExportError error = Kontact::ProfileManager::self()->exportProfileToDirectory( id, path );
     if ( error == Kontact::ProfileManager::SuccessfulExport )
     {
-        KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").arg( profile.name() ), i18n("Profile Exported") );
+        KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").tqarg( profile.name() ), i18n("Profile Exported") );
     }
     else
     {
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 67f1bd198..91fc370db 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
 void Kontact::ProfileManager::readConfig()
 {
     
-    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) );
+    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::tqfromLatin1( "kontact/profiles/*/profile.cfg" ) );
 
     typedef TQMap<TQString, Kontact::Profile> ProfileMap;
     ProfileMap profiles;