Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 762dc98fa6b143629c75b3bbe277228fb04e8324)

1 files changed, 23 insertions, 23 deletions

diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 32cd586ff..c498dc764 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -105,47 +105,47 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     // create the menu items for the note - not the editor...
     // rename, mail, print, save as, insert date, alarm, close, delete, new note
     new TDEAction( i18n("New"), "document-new", 0,
-        TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" );
+        this,TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" );
     new TDEAction( i18n("Rename..."), "text", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" );
+        this, TQT_SLOT(slotRename()), actionCollection(), "rename_note" );
     m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" );
+        this, TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" );
     m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) );
     new TDEAction( i18n("Hide"), "window-close" , Key_Escape,
-        TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" );
+        this, TQT_SLOT(slotClose()), actionCollection(), "hide_note" );
     new TDEAction( i18n("Delete"), "knotes_delete", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" );
+        this, TQT_SLOT(slotKill()), actionCollection(), "delete_note" );
 
     new TDEAction( i18n("Insert Date"), "knotes_date", 0 ,
-        TQT_TQOBJECT(this), TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" );
+        this, TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" );
     new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 ,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" );
+        this, TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" );
 
     new TDEAction( i18n("Send..."), "network", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" );
+        this, TQT_SLOT(slotSend()), actionCollection(), "send_note" );
     new TDEAction( i18n("Mail..."), "mail-send", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" );
+        this, TQT_SLOT(slotMail()), actionCollection(), "mail_note" );
     new TDEAction( i18n("Save As..."), "document-save-as", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" );
-    KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" );
+        this, TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" );
+    KStdAction::print( this, TQT_SLOT(slotPrint()), actionCollection(), "print_note" );
     new TDEAction( i18n("Preferences..."), "configure", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" );
+        this, TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" );
 
     m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "go-up", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" );
+        this, TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" );
     m_keepAbove->setExclusiveGroup( "keepAB" );
 
     m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "go-down", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" );
+        this, TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" );
     m_keepBelow->setExclusiveGroup( "keepAB" );
 
     m_toDesktop = new TDEListAction( i18n("To Desktop"), 0,
-        TQT_TQOBJECT(this), TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" );
-    connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDesktopActions()) );
+        this, TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" );
+    connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUpdateDesktopActions()) );
 
     // invisible action to walk through the notes to make this configurable
     new TDEAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab,
-                 TQT_TQOBJECT(this), TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" );
+                 this, TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" );
 
     // create the note header, button and label...
     m_label = new TQLabel( this );
@@ -155,17 +155,17 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
     setName( m_journal->summary() );      // don't worry, no signals are connected at this stage yet
 
     m_button = new KNoteButton( "knotes_close", this );
-    connect( m_button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()) );
+    connect( m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()) );
 
     // create the note editor
     m_editor = new KNoteEdit( actionCollection(), this );
     m_editor->setNote( this );
     m_editor->installEventFilter( this ); // receive events (for modified)
     m_editor->viewport()->installEventFilter( this );
-    connect( m_editor, TQT_SIGNAL(contentsMoving( int, int )), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateViewport( int, int )));
+    connect( m_editor, TQT_SIGNAL(contentsMoving( int, int )), this, TQT_SLOT(slotUpdateViewport( int, int )));
 
     KXMLGUIBuilder builder( this );
-    KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) );
+    KXMLGUIFactory factory( &builder, this );
     factory.addClient( this );
 
     m_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_context", this ));
@@ -601,8 +601,8 @@ void KNote::find( const TQString& pattern, long options )
     m_find = new KFind( pattern, options, this );
 
     connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )),
-             TQT_TQOBJECT(this), TQT_SLOT(slotHighlight( const TQString &, int, int )) );
-    connect( m_find, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()) );
+             this, TQT_SLOT(slotHighlight( const TQString &, int, int )) );
+    connect( m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()) );
 
     m_find->setData( plainText() );
     slotFindNext();
@@ -816,7 +816,7 @@ void KNote::slotPreferences()
 
     // create a new preferences dialog...
     KNoteConfigDlg *dialog = new KNoteConfigDlg( m_config, name(), this, noteId().utf8() );
-    connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyConfig()) );
+    connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyConfig()) );
     connect( this, TQT_SIGNAL(sigNameChanged()), dialog, TQT_SLOT(slotUpdateCaption()) );
     dialog->show();
 }