Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 762dc98fa6b143629c75b3bbe277228fb04e8324)

23 files changed, 27 insertions, 27 deletions

diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index a7a7fa7af..36d716fac 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" ) )
 
 AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStringList& )
-  : Kontact::Plugin( core, TQT_TQOBJECT(core), "akregator" ), m_stub(0)
+  : Kontact::Plugin( core, 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 d6db8112b..bc9393e5b 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, TQT_TQOBJECT(core), "kaddressbook" ),
+  : Kontact::Plugin( core, core, "kaddressbook" ),
     mStub( 0 )
 {
   setInstance( KAddressbookPluginFactory::instance() );
diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp
index 8db54bc96..f927e826e 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, TQT_TQOBJECT(core), "KArm" )
+  : Kontact::Plugin( core, core, "KArm" )
 {
   setInstance( KarmPluginFactory::instance() );
   (void)dcopClient();
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 09c2fd05f..3f4249dc4 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, TQT_TQOBJECT(core), "kmail" ),
+  : Kontact::Plugin( core, core, "kmail" ),
     mStub( 0 )
 {
   setInstance( KMailPluginFactory::instance() );
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 924938a0a..8b9f4e538 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -163,7 +163,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+    KURLLabel* label = static_cast<KURLLabel*>( obj );
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index 758572bb2..a25a0258c 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, TQT_TQOBJECT(core), "knode" ), mStub(0)
+  : Kontact::Plugin( core, core, "knode" ), mStub(0)
 {
   setInstance( KNodePluginFactory::instance() );
 
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 0d6cd46ca..735f492e4 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, TQT_TQOBJECT(this) );
+      KXMLGUIFactory factory( &builder, this );
       factory.addClient( this );
 
       mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this ));
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index bec6fb5c4..7c3a2bd4f 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, TQT_TQOBJECT(core), "knotes" ),
+  : Kontact::Plugin( core, core, "knotes" ),
     mAboutData( 0 )
 {
   setInstance( KNotesPluginFactory::instance() );
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 97bd771f1..dfa469bc0 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 ) {
-    TQT_TQOBJECT(this)->killTimers();
+    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();
-    TQT_TQOBJECT(this)->killTimers();
+    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 * )
 {
-  TQT_TQOBJECT(this)->killTimers();
+  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:
-      TQT_TQOBJECT(this)->killTimers();
+      this->killTimers();
       setFilter( false );
       hide();
     default:
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index ca0f6ae5f..b8568bf47 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -138,7 +138,7 @@ void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ )
 bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+    KURLLabel* label = static_cast<KURLLabel*>( obj );
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index ac3b77357..ab5306ac9 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, TQT_TQOBJECT(core), "korganizer" ),
+  : Kontact::Plugin( core, core, "korganizer" ),
     mIface( 0 )
 {
   setInstance( JournalPluginFactory::instance() );
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index b25016aa0..0479c53c2 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, TQT_TQOBJECT(core), "korganizer" ),
+  : Kontact::Plugin( core, core, "korganizer" ),
     mIface( 0 )
 {
 
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 93b2c2dd2..de567b8b5 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -286,7 +286,7 @@ void SummaryWidget::popupMenu( const TQString &uid )
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+    KURLLabel* label = static_cast<KURLLabel*>( obj );
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 885c835a0..0b9e426e0 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, TQT_TQOBJECT(core), "korganizer" ),
+  : Kontact::Plugin( core, core, "korganizer" ),
     mIface( 0 )
 {
   setInstance( TodoPluginFactory::instance() );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 255ee2ef1..adce6c332 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, TQT_TQOBJECT(this) );
+  IncidenceChanger *changer = new IncidenceChanger( mCalendar, this );
   if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
     KCal::Todo *oldTodo = todo->clone();
     todo->setCompleted( TQDateTime::currentDateTime() );
@@ -251,7 +251,7 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
 bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+    KURLLabel* label = static_cast<KURLLabel*>( obj );
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp
index 81053917f..9239db85a 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, TQT_TQOBJECT(core), "kpilot" ), mAboutData( 0 )
+  : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 )
 {
   setInstance( KPilotPluginFactory::instance() );
 	// TODO: Make sure kpilotDaemon is running!
diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp
index 04d46883f..62d27fc8e 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, TQT_TQOBJECT(core), name )
+  : Kontact::Plugin( core, core, name )
 {
 	setInstance( NewsTickerPluginFactory::instance() );
 }
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index f385b269c..72c65baaf 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -306,7 +306,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
 bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+    KURLLabel* label = static_cast<KURLLabel*>( obj );
     if ( e->type() == TQEvent::Enter )
       emit message( label->url() );
     if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index e4f862785..c8c9b7164 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -593,7 +593,7 @@ void SDSummaryWidget::popupMenu( const TQString &uid )
 bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 {
   if ( obj->inherits( "KURLLabel" ) ) {
-    KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
+    KURLLabel* label = static_cast<KURLLabel*>( obj );
     if ( e->type() == TQEvent::Enter )
       emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 58c830c83..a1893aef6 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, TQT_TQOBJECT(core), name ),
+  : Kontact::Plugin( core, core, name ),
     mAboutData( 0 )
 {
   setInstance( SpecialdatesPluginFactory::instance() );
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 81e46a8ef..0523e2ac6 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, TQT_TQOBJECT(core), name),
+  : Kontact::Plugin( core, 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 631d91cb8..03d76ad6c 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, TQT_TQOBJECT(_core), name)
+  : Kontact::Plugin(_core, _core, name)
 {
   setInstance(TestPluginFactory::instance());
 
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index 93a97bfc9..506b16fda 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, TQT_TQOBJECT(core), name ), mAboutData( 0 )
+  : Kontact::Plugin( core, core, name ), mAboutData( 0 )
 {
   setInstance( WeatherPluginFactory::instance() );
 }