Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 30 insertions, 30 deletions

diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 20e8d6c9e..7ec3df6c7 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
   setInstance( new TDEInstance( "knotes" ) );
 
   // create the actions
-  new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),
+  new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQ_SLOT( newNote() ),
                actionCollection(), "file_new" );
-  new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ),
+  new TDEAction( i18n( "Rename..." ), "text", this, TQ_SLOT( renameNote() ),
                actionCollection(), "edit_rename" );
-  new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ),
+  new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQ_SLOT( killSelectedNotes() ),
                actionCollection(), "edit_delete" );
-  new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ),
+  new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQ_SLOT( printSelectedNotes() ),
                actionCollection(), "print_note" );
 
   // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes
@@ -68,20 +68,20 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
   mNotesView->setAutoArrange( true );
   mNotesView->setSorting( true );
 
-  connect( mNotesView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
-           this, TQT_SLOT( editNote( TQIconViewItem* ) ) );
-  connect( mNotesView, TQT_SIGNAL( returnPressed( TQIconViewItem* ) ),
-           this, TQT_SLOT( editNote( TQIconViewItem* ) ) );
-  connect( mNotesView, TQT_SIGNAL( itemRenamed( TQIconViewItem* ) ),
-           this, TQT_SLOT( renamedNote( TQIconViewItem* ) ) );
-  connect( mNotesView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
-           this, TQT_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) );
-  connect( mNotesView, TQT_SIGNAL( onItem( TQIconViewItem* ) ),
-           this, TQT_SLOT( slotOnItem( TQIconViewItem* ) ) );
-  connect( mNotesView, TQT_SIGNAL( onViewport() ),
-           this, TQT_SLOT( slotOnViewport() ) );
-  connect( mNotesView, TQT_SIGNAL( currentChanged( TQIconViewItem* ) ),
-           this, TQT_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+           this, TQ_SLOT( editNote( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( returnPressed( TQIconViewItem* ) ),
+           this, TQ_SLOT( editNote( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( itemRenamed( TQIconViewItem* ) ),
+           this, TQ_SLOT( renamedNote( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
+           this, TQ_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) );
+  connect( mNotesView, TQ_SIGNAL( onItem( TQIconViewItem* ) ),
+           this, TQ_SLOT( slotOnItem( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( onViewport() ),
+           this, TQ_SLOT( slotOnViewport() ) );
+  connect( mNotesView, TQ_SIGNAL( currentChanged( TQIconViewItem* ) ),
+           this, TQ_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) );
 
   slotOnCurrentChanged( 0 );
 
@@ -91,10 +91,10 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
   setXMLFile( "knotes_part.rc" );
 
   // connect the resource manager
-  connect( mManager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
-           this, TQT_SLOT( createNote( KCal::Journal* ) ) );
-  connect( mManager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
-           this, TQT_SLOT( killNote( KCal::Journal* ) ) );
+  connect( mManager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
+           this, TQ_SLOT( createNote( KCal::Journal* ) ) );
+  connect( mManager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
+           this, TQ_SLOT( killNote( KCal::Journal* ) ) );
 
   // read the notes
   mManager->load();
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index 7c3a2bd4f..1b66eea12 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -45,9 +45,9 @@ KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringLis
   setInstance( KNotesPluginFactory::instance() );
 
   insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N,
-                   this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
+                   this, TQ_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
   insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0,
-                   this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
+                   this, TQ_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
 }
 
 KNotesPlugin::~KNotesPlugin()
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index b8568bf47..89ae1ec15 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -61,10 +61,10 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
   mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
   KNotesResourceManager *manager = new KNotesResourceManager();
 
-  TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
-                    this, TQT_SLOT( addNote( KCal::Journal* ) ) );
-  TQObject::connect( manager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
-                    this, TQT_SLOT( removeNote( KCal::Journal* ) ) );
+  TQObject::connect( manager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
+                    this, TQ_SLOT( addNote( KCal::Journal* ) ) );
+  TQObject::connect( manager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
+                    this, TQ_SLOT( removeNote( KCal::Journal* ) ) );
   manager->load();
 
 
@@ -111,8 +111,8 @@ void KNotesSummaryWidget::updateView()
         TQToolTip::add( urlLabel, (*it)->description().left( 80 ) );
       }
 
-      connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-               this, TQT_SLOT( urlClicked( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+               this, TQ_SLOT( urlClicked( const TQString& ) ) );
       counter++;
     }