1 files changed, 19 insertions, 19 deletions

diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index beaa3c22..e6802749 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;