Enable kdepim compilation under Qt4

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


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

33 files changed, 80 insertions, 80 deletions

diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index d0ef181f9..37b85be08 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_akregator,
                             PluginFactory( "kontact_akregator" ) )
 
 Plugin::Plugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "akregator" ), m_stub(0)
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "akregator" ), m_stub(0)
 {
 
     setInstance( PluginFactory::instance() );
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 8fafeb984..db1d80caf 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kaddressbookplugin,
                             KAddressbookPluginFactory( "kontact_kaddressbookplugin" ) )
 
 KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "kaddressbook" ),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "kaddressbook" ),
     mStub( 0 )
 {
   setInstance( KAddressbookPluginFactory::instance() );
@@ -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/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp
index 0f3fa946d..5e5ecbb67 100644
--- a/kontact/plugins/karm/karm_plugin.cpp
+++ b/kontact/plugins/karm/karm_plugin.cpp
@@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_karm,
                             KarmPluginFactory( "kontact_karm" ) )
 
 KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "KArm" )
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "KArm" )
 {
   setInstance( KarmPluginFactory::instance() );
   (void)dcopClient();
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
index 90ce22db5..677972d30 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
@@ -43,7 +43,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kitchensync,
                             KitchenSyncPluginFactory( "kontact_kitchensync" ) )
 
 KitchenSyncPlugin::KitchenSyncPlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "KitchenSync" )
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "KitchenSync" )
 {
   setInstance( KitchenSyncPluginFactory::instance() );
 }
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index ae7765553..1c1812cec 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -113,7 +113,7 @@ void KCMKMailSummary::initFolders()
         mFolderMap.insert( *it, new TQListViewItem( mFolderView,
                                                    displayName ) );
     } else {
-      const int pos = (*it).findRev( '/' );
+      const int pos = (*it).tqfindRev( '/' );
       const TQString tqparentFolder = (*it).left( pos );
       mFolderMap.insert( *it,
                          new TQCheckListItem( mFolderMap[ tqparentFolder ],
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 55a192e3e..51fceaa61 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -56,7 +56,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin,
                             KMailPluginFactory( "kontact_kmailplugin" ) )
 
 KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "kmail" ),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "kmail" ),
     mStub( 0 )
 {
   setInstance( KMailPluginFactory::instance() );
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index b72283421..2f67846ac 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -142,7 +142,7 @@ 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 );
+                    .tqarg( numUnreadMsg ).tqarg( numMsg ), this );
       label->tqsetAlignment( AlignLeft );
       label->show();
       mLayout->addWidget( label, counter, 2 );
@@ -164,9 +164,9 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( obj );
+    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/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index d78e1e29b..365e30d09 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knodeplugin,
 
 
 KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "knode" ), mStub(0)
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "knode" ), mStub(0)
 {
   setInstance( KNodePluginFactory::instance() );
 
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index a7864c423..b4b0f7786 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -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 7665426c6..9f8a4bb83 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -144,7 +144,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
       mNoteEdit->setFocus();
 
       KXMLGUIBuilder builder( page );
-      KXMLGUIFactory factory( &builder, this );
+      KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
       factory.addClient( this );
 
       mTool = static_cast<KToolBar *>(factory.container( "note_tool", this ));
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index 0fe265524..a72f14b7e 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin,
 
 
 KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & )
-  : Kontact::Plugin( core, core, "knotes" ),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "knotes" ),
     mAboutData( 0 )
 {
   setInstance( KNotesPluginFactory::instance() );
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index afa21fb40..9e2609fc2 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -75,7 +75,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
   mNoteIVI = item;
 
   if ( !mNoteIVI ) {
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
     if ( isVisible() ) {
       setFilter( false );
       hide();
@@ -104,7 +104,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
     resize( w, TQMIN( h, desk.height() / 2 - 20 ) );
 
     hide();
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
     setFilter( true );
     startTimer( 600 );  // delay showing the tooltip for 0.7 sec
   }
@@ -121,7 +121,7 @@ void KNoteTip::resizeEvent( TQResizeEvent *ev )
 
 void KNoteTip::timerEvent( TQTimerEvent * )
 {
-  killTimers();
+  TQT_TQOBJECT(this)->killTimers();
 
   if ( !isVisible() ) {
     startTimer( 15000 ); // show the tooltip for 15 sec
@@ -144,7 +144,7 @@ bool KNoteTip::eventFilter( TQObject *, TQEvent *e )
     case TQEvent::FocusIn:
     case TQEvent::FocusOut:
     case TQEvent::Wheel:
-      killTimers();
+      TQT_TQOBJECT(this)->killTimers();
       setFilter( false );
       hide();
     default:
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 611425b9d..c0e1ef402 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -138,9 +138,9 @@ void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ )
 bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( obj );
+    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/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index a14785a7e..87347f189 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -43,7 +43,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin,
                             JournalPluginFactory( "kontact_journalplugin" ) )
 
 JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "korganizer" ),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
     mIface( 0 )
 {
   setInstance( JournalPluginFactory::instance() );
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index e07bd4411..9e698a2bd 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -92,7 +92,7 @@ void KCMKOrgSummary::initGUI()
 {
   TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
-  mCalendarGroup = new TQButtonGroup( 0, Vertical, i18n( "Appointments" ), this );
+  mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this );
   TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->tqlayout(),
                                             KDialog::spacingHint() );
 
@@ -124,7 +124,7 @@ void KCMKOrgSummary::initGUI()
 
   tqlayout->addWidget( mCalendarGroup );
 
-  mTodoGroup = new TQButtonGroup( 2, Horizontal, i18n( "To-dos" ), this );
+  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 );
 
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 2a712c8cc..d626c9519 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_korganizerplugin,
                             KOrganizerPluginFactory( "kontact_korganizerplugin" ) )
 
 KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "korganizer" ),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
     mIface( 0 )
 {
 
@@ -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::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 1409c37b3..649f366c9 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -191,7 +191,7 @@ 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 );
@@ -225,8 +225,8 @@ 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->tqsetAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 3 );
@@ -286,9 +286,9 @@ void SummaryWidget::popupMenu( const TQString &uid )
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( obj );
+    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 cefd8bbe7..6b6238bfe 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin,
                             TodoPluginFactory( "kontact_todoplugin" ) )
 
 TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, core, "korganizer" ),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ),
     mIface( 0 )
 {
   setInstance( TodoPluginFactory::instance() );
@@ -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,8 +210,8 @@ 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 );
@@ -219,14 +219,14 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
                     mail.messageId();
       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 7bd1be11a..1109f314a 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -211,7 +211,7 @@ void TodoSummaryWidget::removeTodo( const TQString &uid )
 void TodoSummaryWidget::completeTodo( const TQString &uid )
 {
   KCal::Todo *todo = mCalendar->todo( uid );
-  IncidenceChanger *changer = new IncidenceChanger( mCalendar, this );
+  IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) );
   if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
     KCal::Todo *oldTodo = todo->clone();
     todo->setCompleted( TQDateTime::tqcurrentDateTime() );
@@ -251,9 +251,9 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
 bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( obj );
+    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/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp
index 88e9d7886..402d1e21a 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.cpp
+++ b/kontact/plugins/kpilot/kpilot_plugin.cpp
@@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kpilotplugin,
                             KPilotPluginFactory( "kontact_kpilotplugin" ) )
 
 KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& )
-  : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 )
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), "kpilot" ), mAboutData( 0 )
 {
   setInstance( KPilotPluginFactory::instance() );
 	// TODO: Make sure kpilotDaemon is running!
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 3e7577132..a0dafaa29 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -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/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 07a8aebd0..18a8871e6 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI()
   mSelectedNews->setFullWidth( true );
   tqlayout->addWidget( mSelectedNews, 0, 2 );
 
-  TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical,
+  TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
                                   i18n( "News Feed Settings" ), this );
 
   TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp
index 24f30a851..4b187ea47 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.cpp
+++ b/kontact/plugins/newsticker/newsticker_plugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_newstickerplugin,
                             NewsTickerPluginFactory( "kontact_newstickerplugin" ) )
 
 NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& )
-  : Kontact::Plugin( core, core, name )
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), name )
 {
 	setInstance( NewsTickerPluginFactory::instance() );
 }
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index adfc65fb6..3667d402c 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -300,13 +300,13 @@ 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 )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( obj );
+    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
       emit message( label->url() );
     if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index b3a671277..3c3420820 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -87,7 +87,7 @@ void KCMSDSummary::initGUI()
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() );
 
-  mDaysGroup = new TQButtonGroup( 0, Vertical, i18n( "Special Dates Summary" ), this );
+  mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this );
   TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->tqlayout(),
                                             KDialog::spacingHint() );
 
@@ -119,7 +119,7 @@ void KCMSDSummary::initGUI()
 
   tqlayout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 );
 
-  mCalendarGroup = new TQButtonGroup( 1, Horizontal, i18n( "Special Dates From Calendar" ), this );
+  mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this );
 
   mShowBirthdaysFromCal = new TQCheckBox( i18n( "Show birthdays" ), mCalendarGroup );
   mShowAnniversariesFromCal = new TQCheckBox( i18n( "Show anniversaries" ), mCalendarGroup );
@@ -127,7 +127,7 @@ void KCMSDSummary::initGUI()
 
   mShowSpecialsFromCal = new TQCheckBox( i18n( "Show special occasions" ), mCalendarGroup );
 
-  mContactGroup = new TQButtonGroup( 1, Horizontal, i18n( "Special Dates From Contact List" ), this );
+  mContactGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Contact List" ), this );
 
   mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup );
   mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index cd4e40d76..136454adf 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -250,7 +250,7 @@ void SDSummaryWidget::updateView()
     TQString anniversaryAsString =
       (*it).custom( "KADDRESSBOOK" , "X-Anniversary" );
     if ( !anniversaryAsString.isEmpty() ) {
-      TQDate anniversary = TQDate::fromString( anniversaryAsString, TQt::ISODate );
+      TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate );
       if ( anniversary.isValid() && mShowAnniversariesFromKAB ) {
         SDEntry entry;
         entry.type = IncidenceTypeContact;
@@ -593,9 +593,9 @@ void SDSummaryWidget::popupMenu( const TQString &uid )
 bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( obj );
+    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() );
   }
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 9d0b60cf5..316f94a77 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_specialdatesplugin,
                             SpecialdatesPluginFactory( "kontact_specialdatesplugin" ) )
 
 SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& )
-  : Kontact::Plugin( core, core, name ),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), name ),
     mAboutData( 0 )
 {
   setInstance( SpecialdatesPluginFactory::instance() );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index ba78c226a..1f7164f80 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -120,7 +120,7 @@ void KCMKontactSummary::load()
 {
   KTrader::OfferList offers = KTrader::self()->query(
       TQString::tqfromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+      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 f28ce79ec..5b53b8b6b 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -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::tqfromLatin1( "<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();
 
@@ -247,18 +247,18 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
     return;
 
   if ( target == mFrame ) {
-    if ( mLeftColumn->findWidget( widget ) == -1 && mRightColumn->findWidget( widget ) == -1 )
+    if ( mLeftColumn->tqfindWidget( widget ) == -1 && mRightColumn->tqfindWidget( widget ) == -1 )
       return;
   } else {
-    if ( mLeftColumn->findWidget( target ) == -1 && mRightColumn->findWidget( target ) == -1 ||
-         mLeftColumn->findWidget( widget ) == -1 && mRightColumn->findWidget( widget ) == -1 )
+    if ( mLeftColumn->tqfindWidget( target ) == -1 && mRightColumn->tqfindWidget( target ) == -1 ||
+         mLeftColumn->tqfindWidget( widget ) == -1 && mRightColumn->tqfindWidget( widget ) == -1 )
       return;
   }
 
-  if ( mLeftColumn->findWidget( widget ) != -1 ) {
+  if ( mLeftColumn->tqfindWidget( widget ) != -1 ) {
     mLeftColumn->remove( widget );
     mLeftColumnSummaries.remove( widgetName( widget ) );
-  } else if ( mRightColumn->findWidget( widget ) != -1 ) {
+  } else if ( mRightColumn->tqfindWidget( widget ) != -1 ) {
     mRightColumn->remove( widget );
     mRightColumnSummaries.remove( widgetName( widget ) );
   }
@@ -286,7 +286,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
     return;
   }
 
-  int targetPos = mLeftColumn->findWidget( target );
+  int targetPos = mLeftColumn->tqfindWidget( target );
   if ( targetPos != -1 ) {
     if ( tqalignment == TQt::AlignBottom )
       targetPos++;
@@ -294,7 +294,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
     mLeftColumn->insertWidget( targetPos, widget );
     mLeftColumnSummaries.insert( mLeftColumnSummaries.at( targetPos ), widgetName( widget ) );
   } else {
-    targetPos = mRightColumn->findWidget( target );
+    targetPos = mRightColumn->tqfindWidget( target );
 
     if ( tqalignment == TQt::AlignBottom )
       targetPos++;
@@ -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 );
 }
 
@@ -364,7 +364,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
   mMainWidget = new TQFrame( sv->viewport() );
   sv->addChild( mMainWidget );
   mMainWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-  sv->setFocusPolicy( TQWidget::StrongFocus );
+  sv->setFocusPolicy( Qt::StrongFocus );
   setWidget( sv );
 
   mMainLayout = new TQVBoxLayout( mMainWidget,KDialog::marginHint(),
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 555d79544..74b8e3d76 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin,
                             SummaryViewFactory( "kontact_summaryplugin" ) )
 
 SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& )
-  : Kontact::Plugin( core, core, name),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), name),
     mAboutData( 0 ), mPart( 0 )
 {
   setInstance( SummaryViewFactory::instance() );
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index 4e033fcd1..bf5d00577 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -35,7 +35,7 @@ typedef KGenericFactory< TestPlugin, Kontact::Core > TestPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) )
 
 TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &)
-  : Kontact::Plugin(_core, _core, name)
+  : Kontact::Plugin(_core, TQT_TQOBJECT(_core), name)
 {
   setInstance(TestPluginFactory::instance());
 
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index bc468e844..926f70a73 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -101,7 +101,7 @@ 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();
@@ -121,7 +121,7 @@ void SummaryWidget::updateView()
               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 );
@@ -133,12 +133,12 @@ void SummaryWidget::updateView()
     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.tqreplace( " ", "&nbsp;" ) );
 
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index d42a24f61..9d9f5dfde 100644
--- a/kontact/plugins/weather/weather_plugin.cpp
+++ b/kontact/plugins/weather/weather_plugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin,
                             WeatherPluginFactory( "kontact_weatherplugin" ) )
 
 WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& )
-  : Kontact::Plugin( core, core, name ), mAboutData( 0 )
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 )
 {
   setInstance( WeatherPluginFactory::instance() );
 }