Replace various '#define' strings - part 6

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

5 files changed, 22 insertions, 24 deletions

diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp
index 5d6ca3df..4a4dfc93 100644
--- a/kghostview/kgv_miniwidget.cpp
+++ b/kghostview/kgv_miniwidget.cpp
@@ -384,7 +384,7 @@ void KGVMiniWidget::showPage( int pagenumber )
 
     kdDebug(4500) << "KGVMiniWidget::showPage( " << pagenumber << " )" << endl;
 
-    TQT_TQWIDGET( _psWidget->parent() )->show();
+    static_cast<TQWidget*>( _psWidget->parent() )->show();
 
     _psWidget->setFileName(_document->fileName(), dsc()->isStructured() );
     _psWidget->clear();
@@ -452,8 +452,8 @@ void KGVMiniWidget::showPage( int pagenumber )
 	}
     }
     // Do this after ajusting pagenumber above
-    _thumbnailService->cancelRequests( -1 , TQT_TQOBJECT(_part->scrollBox()), TQT_SLOT( setThumbnail( TQPixmap ) ) );
-    _thumbnailService->delayedGetThumbnail( pagenumber, TQT_TQOBJECT(_part->scrollBox()), TQT_SLOT( setThumbnail( TQPixmap ) ), true );
+    _thumbnailService->cancelRequests( -1 , _part->scrollBox(), TQT_SLOT( setThumbnail( TQPixmap ) ) );
+    _thumbnailService->delayedGetThumbnail( pagenumber, _part->scrollBox(), TQT_SLOT( setThumbnail( TQPixmap ) ), true );
 
     emit newPageShown( pagenumber );
 }
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 1002e123..59140d72 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -165,14 +165,14 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     _markList = new MarkList( _mainWidget, "marklist", _docManager );
     _markList->setFixedWidth( PAGELIST_WIDTH );
     vlay->addWidget( _markList, 1 );
-    connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ),
+    connect( _markList, TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& ) ),
              this, TQT_SLOT( showPopup( int, int, const TQPoint& ) ) );
 
 
-    connect( TQT_TQOBJECT(_markList), TQT_SIGNAL( selected( int ) ),
+    connect( _markList, TQT_SIGNAL( selected( int ) ),
 	     _docManager, TQT_SLOT( goToPage( int ) ) );
     connect( _docManager, TQT_SIGNAL( newPageShown( int ) ),
-	     TQT_TQOBJECT(_markList), TQT_SLOT( select( int ) ) );
+	     _markList, TQT_SLOT( select( int ) ) );
     connect( _docManager, TQT_SIGNAL( setStatusBarText( const TQString& ) ),
 	     this, TQT_SIGNAL( setStatusBarText( const TQString& ) ) );
     connect( _scrollBox, TQT_SIGNAL( valueChangedRelative( int, int ) ),
@@ -195,27 +195,27 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
     _popup = new TDEPopupMenu( _markList, "marklist_menu" );
 
     TDEAction *act = new TDEAction( i18n( "Mark Current Page" ), "flag", CTRL+SHIFT+Key_M,
-                 TQT_TQOBJECT(_markList), TQT_SLOT( markCurrent() ),
+                 _markList, TQT_SLOT( markCurrent() ),
                  actionCollection(), "mark_current" );
     act->plug( _popup );
     act = new TDEAction( i18n( "Mark &All Pages" ), 0,
-                 TQT_TQOBJECT(_markList), TQT_SLOT( markAll() ),
+                 _markList, TQT_SLOT( markAll() ),
                  actionCollection(), "mark_all" );
     act->plug( _popup );
     act = new TDEAction( i18n( "Mark &Even Pages" ), 0,
-                 TQT_TQOBJECT(_markList), TQT_SLOT( markEven() ),
+                 _markList, TQT_SLOT( markEven() ),
                  actionCollection(), "mark_even" );
     act->plug( _popup );
     act = new TDEAction( i18n( "Mark &Odd Pages" ), 0,
-                 TQT_TQOBJECT(_markList), TQT_SLOT( markOdd() ),
+                 _markList, TQT_SLOT( markOdd() ),
                  actionCollection(), "mark_odd" );
     act->plug( _popup );
     act = new TDEAction( i18n( "&Toggle Page Marks" ), 0,
-                 TQT_TQOBJECT(_markList), TQT_SLOT( toggleMarks() ),
+                 _markList, TQT_SLOT( toggleMarks() ),
                  actionCollection(), "toggle" );
     act->plug( _popup );
     act = new TDEAction( i18n("&Remove Page Marks"), 0,
-                 TQT_TQOBJECT(_markList), TQT_SLOT( removeMarks() ),
+                 _markList, TQT_SLOT( removeMarks() ),
                  actionCollection(), "remove" );
     act->plug( _popup );
 
diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp
index ae0742da..96cc28c6 100644
--- a/kghostview/kgvdocument.cpp
+++ b/kghostview/kgvdocument.cpp
@@ -565,9 +565,7 @@ void KGVDocument::saveAs()
                           TQString(), 
                           _part->widget(), 
                           TQString() );
-    if( !TDEIO::NetAccess::upload( _fileName,
-				 saveURL,
-				 static_cast<TQWidget*>( 0 ) ) ) {
+    if( !TDEIO::NetAccess::upload( _fileName, saveURL, 0 ) ) {
 	// TODO: Proper error dialog
     }
 }
diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp
index 0835efb3..10a5c5e2 100644
--- a/kghostview/kgvshell.cpp
+++ b/kghostview/kgvshell.cpp
@@ -60,29 +60,29 @@ KGVShell::KGVShell() :
     _tmpFile( 0 )
 {
     m_gvpart = KParts::ComponentFactory::createPartInstanceFromLibrary< KGVPart >( "libkghostviewpart", this, "kgvpart",
-                                                                                   TQT_TQOBJECT(this), "kgvpart" );
+                                                                                   this, "kgvpart" );
 
     /*---- File -----------------------------------------------------------*/
     openact =
-	    KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ),
+	    KStdAction::open( this, TQT_SLOT( slotFileOpen() ),
 			      actionCollection() );
     recent =
-	    KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( openURL( const KURL& ) ),
+	    KStdAction::openRecent( this, TQT_SLOT( openURL( const KURL& ) ),
 				    actionCollection() );
 	    KStdAction::print( m_gvpart->document(), TQT_SLOT( print() ),
 			       actionCollection() );
     (void)
-	    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() );
+	    KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() );
 
     /*---- View -----------------------------------------------------------*/
             new TDEAction( i18n(  "&Reload" ), "reload",
 		    TDEStdAccel::shortcut( TDEStdAccel::Reload ),
 		    m_gvpart, TQT_SLOT(  reloadFile() ),
 		    actionCollection(), "reload" );
-	    new TDEAction( i18n( "&Maximize" ), Key_M, TQT_TQOBJECT(this),
+	    new TDEAction( i18n( "&Maximize" ), Key_M, this,
 			 TQT_SLOT( slotMaximize() ), actionCollection(),
 			 "maximize");
-    _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() );
+    _showMenuBarAction = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenubar() ), actionCollection() );
 
     /*---- Settings -------------------------------------------------------*/
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
@@ -91,11 +91,11 @@ KGVShell::KGVShell() :
     setAutoSaveSettings();
     setStandardToolBarMenuEnabled(true);
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
-    m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
+    m_fullScreenAction = KStdAction::fullScreen( this, TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
 #else
     m_fullScreenAction = new TDEToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) );
 #endif
-    KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+    KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
     KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
 actionCollection());
 
diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp
index b84924eb..257c21c6 100644
--- a/kghostview/marklist.cpp
+++ b/kghostview/marklist.cpp
@@ -105,7 +105,7 @@ void MarkListItem::paintEvent( TQPaintEvent* )
      */
     if ( _requested ) return;
     if ( !_thumbnailW->paletteBackgroundPixmap() ||  _thumbnailW->paletteBackgroundPixmap()->isNull() ) {
-	_miniWidget->getThumbnailService()->delayedGetThumbnail( _pageNum, TQT_TQOBJECT(this), TQT_SLOT( setPixmap( TQPixmap ) ) );
+	_miniWidget->getThumbnailService()->delayedGetThumbnail( _pageNum, this, TQT_SLOT( setPixmap( TQPixmap ) ) );
 	_requested = true;
     }
 }