Replace various '#define' strings - part 6

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

4 files changed, 73 insertions, 73 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();
 }
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 1316bc3ad..f03150ba9 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -45,27 +45,27 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
     setLinkUnderline( true );
     setCheckSpellingEnabled(false);
     // create the actions for the RMB menu
-    undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT(undo()), actions );
-    redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT(redo()), actions );
+    undo = KStdAction::undo( this, TQT_SLOT(undo()), actions );
+    redo = KStdAction::redo( this, TQT_SLOT(redo()), actions );
     undo->setEnabled( isUndoAvailable() );
     redo->setEnabled( isRedoAvailable() );
 
-    m_cut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cut()), actions );
-    m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actions );
-    m_paste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(paste()), actions );
+    m_cut = KStdAction::cut( this, TQT_SLOT(cut()), actions );
+    m_copy = KStdAction::copy( this, TQT_SLOT(copy()), actions );
+    m_paste = KStdAction::paste( this, TQT_SLOT(paste()), actions );
 
     m_cut->setEnabled( false );
     m_copy->setEnabled( false );
     m_paste->setEnabled( true );
 
-    connect( this, TQT_SIGNAL(undoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledUndo(bool)) );
-    connect( this, TQT_SIGNAL(redoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledRedo(bool)) );
+    connect( this, TQT_SIGNAL(undoAvailable(bool)), this, TQT_SLOT(setEnabledUndo(bool)) );
+    connect( this, TQT_SIGNAL(redoAvailable(bool)), this, TQT_SLOT(setEnabledRedo(bool)) );
 
-    connect( this, TQT_SIGNAL(copyAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT( slotCutEnabled( bool ) ) );
+    connect( this, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT( slotCutEnabled( bool ) ) );
     connect( this, TQT_SIGNAL(copyAvailable(bool)), m_copy, TQT_SLOT(setEnabled(bool)) );
 
-    new TDEAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" );
-    KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions );
+    new TDEAction( KStdGuiItem::clear(), 0, this, TQT_SLOT(clear()), actions, "edit_clear" );
+    KStdAction::selectAll( this, TQT_SLOT(selectAll()), actions );
 
     // create the actions modifying the text format
     m_textBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", CTRL + Key_B, 0, 0,
@@ -83,17 +83,17 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
     connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) );
 
     m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", ALT + Key_L,
-                                 TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()),
+                                 this, TQT_SLOT(textAlignLeft()),
                                  actions, "format_alignleft" );
     m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later
     m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C,
-                                 TQT_TQOBJECT(this), TQT_SLOT(textAlignCenter()),
+                                 this, TQT_SLOT(textAlignCenter()),
                                  actions, "format_aligncenter" );
     m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", ALT + Key_R,
-                                 TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()),
+                                 this, TQT_SLOT(textAlignRight()),
                                  actions, "format_alignright" );
     m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B,
-                                 TQT_TQOBJECT(this), TQT_SLOT(textAlignBlock()),
+                                 this, TQT_SLOT(textAlignBlock()),
                                  actions, "format_alignblock" );
 
     m_textAlignLeft->setExclusiveGroup( "align" );
@@ -102,16 +102,16 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
     m_textAlignBlock->setExclusiveGroup( "align" );
 
     m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0,
-                                    TQT_TQOBJECT(this), TQT_SLOT(textList()),
+                                    this, TQT_SLOT(textList()),
                                     actions, "format_list" );
 
     m_textList->setExclusiveGroup( "style" );
 
     m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0,
-                                     TQT_TQOBJECT(this), TQT_SLOT(textSuperScript()),
+                                     this, TQT_SLOT(textSuperScript()),
                                      actions, "format_super" );
     m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0,
-                                   TQT_TQOBJECT(this), TQT_SLOT(textSubScript()),
+                                   this, TQT_SLOT(textSubScript()),
                                    actions, "format_sub" );
 
     m_textSuper->setExclusiveGroup( "valign" );
@@ -120,38 +120,38 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
 // There is no easy possibility to implement text indenting with TQTextEdit
 //
 //     m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0,
-//                                         TQT_TQOBJECT(this), TQT_SLOT(textIncreaseIndent()),
+//                                         this, TQT_SLOT(textIncreaseIndent()),
 //                                         actions, "format_increaseindent" );
 //
 //     m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0,
-//                                         TQT_TQOBJECT(this), TQT_SLOT(textDecreaseIndent()),
+//                                         this, TQT_SLOT(textDecreaseIndent()),
 //                                         actions, "format_decreaseindent" );
 
     TQPixmap pix( ICON_SIZE, ICON_SIZE );
     pix.fill( black );     // just a dummy, gets updated before widget is shown
-    m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this),
+    m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, this,
                                   TQT_SLOT(textColor()), actions, "format_color" );
 
     m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(),
                                   actions, "format_font" );
     connect( m_textFont, TQT_SIGNAL(activated( const TQString & )),
-             TQT_TQOBJECT(this), TQT_SLOT(setFamily( const TQString & )) );
+             this, TQT_SLOT(setFamily( const TQString & )) );
 
     m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(),
                                       actions, "format_size" );
     connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )),
-             TQT_TQOBJECT(this), TQT_SLOT(setPointSize( int )) );
+             this, TQT_SLOT(setPointSize( int )) );
 
     // TQTextEdit connections
     connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
     connect( this, TQT_SIGNAL(currentFontChanged( const TQFont & )),
-             TQT_TQOBJECT(this), TQT_SLOT(fontChanged( const TQFont & )) );
+             this, TQT_SLOT(fontChanged( const TQFont & )) );
     connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )),
-             TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) );
+             this, TQT_SLOT(colorChanged( const TQColor & )) );
     connect( this, TQT_SIGNAL(currentAlignmentChanged( int )),
-             TQT_TQOBJECT(this), TQT_SLOT(alignmentChanged( int )) );
+             this, TQT_SLOT(alignmentChanged( int )) );
     connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )),
-             TQT_TQOBJECT(this), TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) );
+             this, TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) );
 }
 
 KNoteEdit::~KNoteEdit()
@@ -541,7 +541,7 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos )
 
         menu->insertSeparator();
         id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ),
-                                   TQT_TQOBJECT(this), TQT_SLOT( checkSpelling() ) );
+                                   this, TQT_SLOT( checkSpelling() ) );
 
         if( text().isEmpty() )
             menu->setItemEnabled( id, false );
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index beaa3c22e..e68027495 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -112,25 +112,25 @@ KNotesApp::KNotesApp()
 
     // create the GUI...
     new TDEAction( i18n("New Note"), "document-new", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" );
+        this, TQT_SLOT(newNote()), actionCollection(), "new_note" );
     new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" );
+        this, TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" );
     new TDEAction( i18n("Show All Notes"), "knotes", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" );
+        this, TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" );
     new TDEAction( i18n("Hide All Notes"), "window-close", 0,
-        TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
+        this, TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
     new KHelpMenu( this, kapp->aboutData(), false, actionCollection() );
 
-    m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotOpenFindDialog()), actionCollection() );
-    KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection() );
-    KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureAccels()), actionCollection() );
+    m_findAction = KStdAction::find( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() );
+    KStdAction::preferences( this, TQT_SLOT(slotPreferences()), actionCollection() );
+    KStdAction::keyBindings( this, TQT_SLOT(slotConfigureAccels()), actionCollection() );
     //FIXME: no shortcut removing!?
-    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 );
+    KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 );
 
     setXMLFile( instance()->instanceName() + "appui.rc" );
 
     m_guiBuilder = new KXMLGUIBuilder( this );
-    m_guiFactory = new KXMLGUIFactory( m_guiBuilder, TQT_TQOBJECT(this) );
+    m_guiFactory = new KXMLGUIFactory( m_guiBuilder, this );
     m_guiFactory->addClient( this );
 
     m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this ));
@@ -147,19 +147,19 @@ KNotesApp::KNotesApp()
     m_noteGUI.setContent( doc );
 
     // create accels for global shortcuts
-    m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this), "global accel" );
+    m_globalAccel = new TDEGlobalAccel( this, "global accel" );
     m_globalAccel->insert( "global_new_note", i18n("New Note"), "",
                            TDEShortcut(), TDEShortcut(),
-                           TQT_TQOBJECT(this), TQT_SLOT(newNote()), true, true );
+                           this, TQT_SLOT(newNote()), true, true );
     m_globalAccel->insert( "global_new_note_clipboard", i18n("New Note From Clipboard"), "",
                            TDEShortcut(), TDEShortcut(),
-                           TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), true, true );
+                           this, TQT_SLOT(newNoteFromClipboard()), true, true );
     m_globalAccel->insert( "global_hide_all_notes", i18n("Hide All Notes"), "",
                            TDEShortcut(), TDEShortcut(),
-                           TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), true, true );
+                           this, TQT_SLOT(hideAllNotes()), true, true );
     m_globalAccel->insert( "global_show_all_notes", i18n("Show All Notes"), "",
                            TDEShortcut(), TDEShortcut(),
-                           TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), true, true );
+                           this, TQT_SLOT(showAllNotes()), true, true );
 
     m_globalAccel->readSettings();
 
@@ -196,7 +196,7 @@ KNotesApp::KNotesApp()
 
     // set up the alarm reminder - do it after loading the notes because this
     // is used as a check if updateNoteActions has to be called for a new note
-    m_alarm = new KNotesAlarm( m_manager, TQT_TQOBJECT(this) );
+    m_alarm = new KNotesAlarm( m_manager, this );
 
     // create the socket and possibly start listening for connections
     m_listener = new TDEServerSocket();
@@ -575,8 +575,8 @@ void KNotesApp::slotPreferences()
     // create a new preferences dialog...
     KNoteConfigDlg *dialog = new KNoteConfigDlg( 0, i18n("Settings"), this,
                                                  "KNotes Settings" );
-    connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateNetworkListener()) );
-    connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateStyle()) );
+    connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateNetworkListener()) );
+    connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateStyle()) );
     dialog->show();
 }
 
@@ -694,7 +694,7 @@ void KNotesApp::acceptConnection()
     {
         KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s );
         connect( recv, TQT_SIGNAL(sigNoteReceived( const TQString &, const TQString & )),
-                 TQT_TQOBJECT(this), TQT_SLOT(newNote( const TQString &, const TQString & )) );
+                 this, TQT_SLOT(newNote( const TQString &, const TQString & )) );
     }
 }
 
@@ -725,7 +725,7 @@ void KNotesApp::updateNoteActions()
     for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it )
     {
         TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"),
-                                       TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()),
+                                       TDEShortcut(), this, TQT_SLOT(slotShowNote()),
                                        (TQObject *)0,
                                        it.current()->noteId().utf8() );
         TDEIconEffect effect;
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 187d606b5..d1e9f1d81 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -48,11 +48,11 @@ KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port )
 
     // TQObject:: prefix needed, otherwise the KStreamSocket::connect()
     // mehtod is called!!!
-    TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(connected( const KResolverEntry& )), 
+    TQObject::connect( this, TQT_SIGNAL(connected( const KResolverEntry& )), 
                             TQT_SLOT(slotConnected( const KResolverEntry& )) );
-    TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) );
-    TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) );
-    TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) );
+    TQObject::connect( this, TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) );
+    TQObject::connect( this, TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) );
+    TQObject::connect( this, TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) );
 }
 
 void KNotesNetworkSender::setSenderId( const TQString& sender )