Replace various '#define' strings - part 6

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

4 files changed, 7 insertions, 7 deletions

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 )