Replace various '#define' strings - part 6

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

3 files changed, 21 insertions, 21 deletions

diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index d6af88b2..667ddc97 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -69,7 +69,7 @@ Kig::Kig()
       // now that the Part is loaded, we cast it to a Part to get
       // our hands on it
       m_part = static_cast<KParts::ReadWritePart*>
-               (factory->create(TQT_TQOBJECT(this), "kig_part", "KParts::ReadWritePart" ));
+               (factory->create(this, "kig_part", "KParts::ReadWritePart" ));
       if (m_part)
       {
 	  // tell the KParts::MainWindow that this is indeed the main widget
@@ -105,30 +105,30 @@ Kig::~Kig()
 
 void Kig::setupActions()
 {
-  KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
-  KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+  KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
+  KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
 
 #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES
-  m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
-  m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
+  m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
+  m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
 #else
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
 #endif
 
   // FIXME: this (recent files) should be app-wide, not specific to each window...
-  m_recentFilesAction = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection());
+  m_recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection());
   m_recentFilesAction->loadEntries(config);
 
 #if KDE_IS_VERSION( 3, 2, 90 )
   KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
 #else
-  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
 #endif
-  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 
-  KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
+  KStdAction::tipOfDay( this, TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" );
 }
 
 void Kig::saveProperties(TDEConfig* config)
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index ef4de909..853f7527 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -258,17 +258,17 @@ void KigPart::setupActions()
   KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(),
                                                actionCollection() );
 
-  TDEAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ),
+  TDEAction* a = KStdAction::zoomIn( m_widget, TQT_SLOT( slotZoomIn() ),
                                    actionCollection() );
   a->setToolTip( i18n( "Zoom in on the document" ) );
   a->setWhatsThis( i18n( "Zoom in on the document" ) );
 
-  a = KStdAction::zoomOut( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomOut() ),
+  a = KStdAction::zoomOut( m_widget, TQT_SLOT( slotZoomOut() ),
                            actionCollection() );
   a->setToolTip( i18n( "Zoom out of the document" ) );
   a->setWhatsThis( i18n( "Zoom out of the document" ) );
 
-  a = KStdAction::fitToPage( TQT_TQOBJECT(m_widget), TQT_SLOT( slotRecenterScreen() ),
+  a = KStdAction::fitToPage( m_widget, TQT_SLOT( slotRecenterScreen() ),
                              actionCollection() );
   // grr.. why isn't there an icon for this..
   a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", TDEIcon::Toolbar ) ) );
@@ -281,7 +281,7 @@ void KigPart::setupActions()
 #endif
 #endif
 #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION
-  a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
+  a = KStdAction::fullScreen( m_widget, TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" );
 #else
   tmp = l->loadIcon( "view-fullscreen", TDEIcon::Toolbar );
   a = new TDEAction(
@@ -294,13 +294,13 @@ void KigPart::setupActions()
 
   // TODO: an icon for this..
   a = new TDEAction(
-    i18n( "&Select Shown Area" ), "zoom-fit-best", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ),
+    i18n( "&Select Shown Area" ), "zoom-fit-best", 0, m_widget, TQT_SLOT( zoomRect() ),
     actionCollection(), "view_select_shown_rect" );
   a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
   a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
 
   a = new TDEAction(
-    i18n( "S&elect Zoom Area" ), "viewmag", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomArea() ),
+    i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQT_SLOT( zoomArea() ),
     actionCollection(), "view_zoom_area" );
 //  a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) );
 //  a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) );
diff --git a/kig/scripting/newscriptwizard.cpp b/kig/scripting/newscriptwizard.cpp
index 9cb4d9e2..ecc157ba 100644
--- a/kig/scripting/newscriptwizard.cpp
+++ b/kig/scripting/newscriptwizard.cpp
@@ -97,11 +97,11 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode )
     TDEPopupMenu* pm = new TDEPopupMenu( editor );
     // creating the actions for the code editor...
     TDEActionCollection* ac = new TDEActionCollection( editor );
-    TDEAction* undoAction = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( slotUndo() ), ac );
-    TDEAction* redoAction = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ), ac );
-    TDEAction* cutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), ac );
-    TDEAction* copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), ac );
-    TDEAction* pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), ac );
+    TDEAction* undoAction = KStdAction::undo( this, TQT_SLOT( slotUndo() ), ac );
+    TDEAction* redoAction = KStdAction::redo( this, TQT_SLOT( slotRedo() ), ac );
+    TDEAction* cutAction = KStdAction::cut( this, TQT_SLOT( slotCut() ), ac );
+    TDEAction* copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), ac );
+    TDEAction* pasteAction = KStdAction::paste( this, TQT_SLOT( slotPaste() ), ac );
     // ... and plugging them into the popup menu (to build it, of course :) )
     undoAction->plug( pm );
     redoAction->plug( pm );