Replace various '#define' strings - part 6

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

6 files changed, 50 insertions, 50 deletions

diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp
index e0b3bab5..e36f9650 100644
--- a/kpovmodeler/pmdeclareedit.cpp
+++ b/kpovmodeler/pmdeclareedit.cpp
@@ -201,6 +201,6 @@ void PMDeclareEdit::slotItemSelected( TQListBoxItem* item )
 void PMDeclareEdit::slotSelect( )
 {
    if( m_pSelectedObject )
-      part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, TQT_TQOBJECT(this) );
+      part( )->slotObjectChanged( m_pSelectedObject, PMCNewSelection, this );
 }
 #include "pmdeclareedit.moc"
diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp
index c2bfeb62..12ade91e 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -325,7 +325,7 @@ void PMDialogView::slotControlPointSelectionChanged( )
 {
    if( m_pDisplayedWidget && m_pDisplayedWidget->displayedObject( ) )
       emit objectChanged( m_pDisplayedWidget->displayedObject( ),
-                          PMCControlPointSelection, TQT_TQOBJECT(this) );
+                          PMCControlPointSelection, this );
 }
 
 void PMDialogView::displayObject( PMObject* obj, bool updateDescription )
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 0b9d75a9..b6b77653 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -142,7 +142,7 @@ PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f
   mainDockWidget = 0L;
 
   d = new PMDockMainWindowPrivate( );
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 PMDockMainWindow::~PMDockMainWindow()
@@ -179,7 +179,7 @@ void PMDockMainWindow::createGUI( Part * part )
 
   if( !d->m_bShellGUIActivated )
   {
-    loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
+    loadPlugins( this, this, TDEGlobal::instance() );
     createShellGUI();
     d->m_bShellGUIActivated = true;
   }
@@ -485,7 +485,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
   layout->setResizeMode( TQLayout::Minimum );
 
   manager = dockManager;
-  manager->childDock->append( TQT_TQOBJECT(this) );
+  manager->childDock->append( this );
   installEventFilter( manager );
 
   header = 0L;
@@ -527,7 +527,7 @@ PMDockWidget::~PMDockWidget()
     d->blockHasUndockedSignal = false;
   }
   emit iMBeingClosed();
-  manager->childDock->remove( TQT_TQOBJECT(this) );
+  manager->childDock->remove( this );
   delete pix;
   delete d; // destroy private data
 }
@@ -1464,8 +1464,8 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
     }
     w = p;
   }
-  if ( tqt_find_obj_child( TQT_TQOBJECT(w), "PMDockSplitter", "_dock_split_" ) ) return 0L;
-  if ( tqt_find_obj_child( TQT_TQOBJECT(w), "PMDockTabGroup", "_dock_tab" ) ) return 0L;
+  if ( tqt_find_obj_child( w, "PMDockSplitter", "_dock_split_" ) ) return 0L;
+  if ( tqt_find_obj_child( w, "PMDockTabGroup", "_dock_tab" ) ) return 0L;
   if (!childDockWidgetList) return 0L;
   if ( childDockWidgetList->find(w) != -1 ) return 0L;
   if ( currentDragWidget->isGroup && ((PMDockWidget*)w)->parentDockTabGroup() ) return 0L;
@@ -2271,7 +2271,7 @@ PMDockWidget* PMDockManager::getDockWidgetFromName( const TQString& dockName )
   PMDockWidget* autoCreate = 0L;
   if ( autoCreateDock ){
     autoCreate = new PMDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) );
-    autoCreateDock->append( TQT_TQOBJECT(autoCreate) );
+    autoCreateDock->append( autoCreate );
   }
   return autoCreate;
 }
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 9e0e6deb..e9da1a96 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -955,12 +955,12 @@ void PMGLView::graphicalChange( const TQPoint& mousePos )
    m_pActiveObject->controlPointsChangedList( m_controlPoints, changedObjects );
 
    if( changedObjects.isEmpty( ) )
-      emit objectChanged( m_pActiveObject, PMCGraphicalChange, TQT_TQOBJECT(this) );
+      emit objectChanged( m_pActiveObject, PMCGraphicalChange, this );
    else
    {
       PMObjectListIterator it( changedObjects );
       for( ; it.current( ); ++it )
-         emit objectChanged( it.current( ), PMCGraphicalChange, TQT_TQOBJECT(this) );
+         emit objectChanged( it.current( ), PMCGraphicalChange, this );
    }
 }
 
@@ -1353,7 +1353,7 @@ void PMGLView::selectControlPoint( PMControlPoint* cp, bool select, bool deselec
    }
 
    if( selectionChanged )
-      emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) );
+      emit objectChanged( m_pActiveObject, PMCControlPointSelection, this );
 }
 
 void PMGLView::startSelection( )
@@ -1652,7 +1652,7 @@ void PMGLView::slotControlPoint( int id )
       PMControlPointListIterator cit( m_controlPoints );
       for( ; cit.current( ); ++cit )
          cit.current( )->setSelected( p == cit.current( ) );
-      emit objectChanged( m_pActiveObject, PMCControlPointSelection, TQT_TQOBJECT(this) );
+      emit objectChanged( m_pActiveObject, PMCControlPointSelection, this );
    }
 }
 
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 82c02642..a48b75a1 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -52,7 +52,7 @@ PMShell::PMShell( const KURL& url )
    setPluginLoadingMode( DoNotLoadPlugins );
    setInstance( PMFactory::instance( ), false );
 
-   m_pPart = new PMPart( this, "part", TQT_TQOBJECT(this), "part", true, this );
+   m_pPart = new PMPart( this, "part", this, "part", true, this );
    m_pPart->setReadWrite( ); // read-write mode
    m_viewNumber = 0;
    m_objectsToDelete.setAutoDelete( true );
@@ -95,66 +95,66 @@ void PMShell::setupActions( )
 //   m_helpMenu = new KHelpMenu( this, PMFactory::aboutData( ), true,
 //                               actionCollection( ) );
 
-   KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew( ) ), actionCollection( ) );
-   KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen( ) ), actionCollection( ) );
-   m_pRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecent( const KURL& ) ),
+   KStdAction::openNew( this, TQT_SLOT( slotFileNew( ) ), actionCollection( ) );
+   KStdAction::open( this, TQT_SLOT( slotFileOpen( ) ), actionCollection( ) );
+   m_pRecent = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL& ) ),
                                        actionCollection( ) );
-   KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave( ) ), actionCollection( ) );
-   KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs( ) ), actionCollection( ) );
+   KStdAction::save( this, TQT_SLOT( slotFileSave( ) ), actionCollection( ) );
+   KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs( ) ), actionCollection( ) );
 
-   KStdAction::revert( TQT_TQOBJECT(this), TQT_SLOT( slotFileRevert( ) ), actionCollection( ) );
-   KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint( ) ), actionCollection( ) );
+   KStdAction::revert( this, TQT_SLOT( slotFileRevert( ) ), actionCollection( ) );
+   KStdAction::print( this, TQT_SLOT( slotFilePrint( ) ), actionCollection( ) );
 
-   KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose( ) ), actionCollection( ) );
-   KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close( ) ), actionCollection( ) );
+   KStdAction::close( this, TQT_SLOT( slotFileClose( ) ), actionCollection( ) );
+   KStdAction::quit( this, TQT_SLOT( close( ) ), actionCollection( ) );
 
-   m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, TQT_TQOBJECT(this),
+   m_pPathAction = new TDEToggleAction( i18n( "Show &Path" ), 0, this,
                                TQT_SLOT( slotShowPath( ) ), actionCollection( ),
                                "options_show_path" );
    m_pPathAction->setCheckedState(i18n("Hide &Path"));
 
-   m_pStatusbarAction = KStdAction::showStatusbar( TQT_TQOBJECT(this), TQT_SLOT( slotShowStatusbar( ) ),
+   m_pStatusbarAction = KStdAction::showStatusbar( this, TQT_SLOT( slotShowStatusbar( ) ),
                                                    actionCollection( ) );
 
-   KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT( saveOptions( ) ), actionCollection( ) );
+   KStdAction::saveOptions( this, TQT_SLOT( saveOptions( ) ), actionCollection( ) );
 
-   KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys( ) ),
+   KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys( ) ),
                             actionCollection( ) );
-   KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars( ) ),
+   KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars( ) ),
                                   actionCollection( ) );
-   KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotSettings( ) ), actionCollection( ) );
+   KStdAction::preferences( this, TQT_SLOT( slotSettings( ) ), actionCollection( ) );
 
-   m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, TQT_TQOBJECT(this),
+   m_pNewTopViewAction = new TDEAction( i18n( "New Top View" ), 0, this,
                                       TQT_SLOT( slotNewTopView( ) ),
                                       actionCollection( ), "view_new_topview" );
-   m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, TQT_TQOBJECT(this),
+   m_pNewBottomViewAction = new TDEAction( i18n( "New Bottom View" ), 0, this,
                                          TQT_SLOT( slotNewBottomView( ) ),
                                          actionCollection( ), "view_new_bottomview" );
-   m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, TQT_TQOBJECT(this),
+   m_pNewLeftViewAction = new TDEAction( i18n( "New Left View" ), 0, this,
                                        TQT_SLOT( slotNewLeftView( ) ),
                                        actionCollection( ), "view_new_leftview" );
-   m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, TQT_TQOBJECT(this),
+   m_pNewRightViewAction = new TDEAction( i18n( "New Right View" ), 0, this,
                                         TQT_SLOT( slotNewRightView( ) ),
                                         actionCollection( ), "view_new_rightview" );
-   m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, TQT_TQOBJECT(this),
+   m_pNewFrontViewAction = new TDEAction( i18n( "New Front View" ), 0, this,
                                         TQT_SLOT( slotNewFrontView( ) ),
                                         actionCollection( ), "view_new_frontview" );
-   m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, TQT_TQOBJECT(this),
+   m_pNewBackViewAction = new TDEAction( i18n( "New Back View" ), 0, this,
                                        TQT_SLOT( slotNewBackView( ) ),
                                        actionCollection( ), "view_new_back_view" );
-   m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, TQT_TQOBJECT(this),
+   m_pNewCameraViewAction = new TDEAction( i18n( "New Camera View" ), 0, this,
                                          TQT_SLOT( slotNewCameraView( ) ),
                                          actionCollection( ), "view_new_cameraview" );
 
-   m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, TQT_TQOBJECT(this),
+   m_pNewTreeViewAction = new TDEAction( i18n( "New Object Tree" ), 0, this,
                               TQT_SLOT( slotNewTreeView( ) ), actionCollection( ),
                               "view_new_treeview" );
-   m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, TQT_TQOBJECT(this),
+   m_pNewDialogViewAction = new TDEAction( i18n( "New Properties View" ), 0, this,
                              TQT_SLOT( slotNewDialogView( ) ), actionCollection( ),
                              "view_new_dialogview" );
 
 #ifdef KPM_WITH_OBJECT_LIBRARY
-   m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, TQT_TQOBJECT(this),
+   m_pNewLibraryBrowserAction = new TDEAction( i18n( "New Library Browser" ), 0, this,
                                     TQT_SLOT( slotNewLibraryBrowserView( ) ), actionCollection( ),
                                     "view_new_librarybrowser" );
 #endif
@@ -167,7 +167,7 @@ void PMShell::setupActions( )
    PMViewLayoutManager::theManager( )->fillPopupMenu( menu );
    connect( menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSelectedLayout( int ) ) );
 
-   m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, TQT_TQOBJECT(this),
+   m_pSaveViewLayoutAction = new TDEAction( i18n( "Save View Layout..." ), 0, this,
                                           TQT_SLOT( slotSaveViewLayout( ) ),
                                           actionCollection( ), "save_view_layout" );
 }
@@ -347,7 +347,7 @@ void PMShell::slotDockWidgetClosed( )
       if( m_objectsToDelete.containsRef( o ) == 0 )
       {
          m_objectsToDelete.append( o );
-         TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteClosedObjects( ) ) );
+         TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteClosedObjects( ) ) );
       }
    }
 }
@@ -377,7 +377,7 @@ void PMShell::openURL( const KURL& url )
 void PMShell::slotOpenRecent( const KURL& url )
 {
    m_openRecentURL = url;
-   TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenRecentTimer( ) ) );
+   TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenRecentTimer( ) ) );
 }
 
 void PMShell::slotOpenRecentTimer( )
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 41cd66b9..d6597b97 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -361,7 +361,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
 
    if( m_selectionCleared )
    {
-      emit objectChanged( 0, PMCNewSelection, TQT_TQOBJECT(this) );
+      emit objectChanged( 0, PMCNewSelection, this );
       specialAction = true;
    }
    else if( m_itemSelected || m_itemDeselected )
@@ -378,7 +378,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
             m_pLastSelected->setSelected( true );
 
             emit objectChanged( m_pLastSelected->object( ), PMCNewSelection,
-                                TQT_TQOBJECT(this) );
+                                this );
          }
          else
          {
@@ -407,7 +407,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
                   {
                      tmp->setSelected( true );
                      emit objectChanged( (( PMTreeViewItem* ) tmp)->object( ),
-                                         PMCSelected, TQT_TQOBJECT(this) );
+                                         PMCSelected, this );
                      if( tmp == m_pLastSelected )
                         break;
                   }
@@ -418,7 +418,7 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
                   {
                      tmp->setSelected( true );
                      emit objectChanged( (( PMTreeViewItem* ) tmp)->object( ),
-                                         PMCSelected, TQT_TQOBJECT(this) );
+                                         PMCSelected, this );
                      if( tmp == oldCurrent )
                         break;
                   }
@@ -436,12 +436,12 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e )
       if( m_itemSelected )
       {
          if( m_pLastSelected->object( )->isSelectable( ) )
-            emit objectChanged( m_pLastSelected->object( ), PMCSelected, TQT_TQOBJECT(this) );
+            emit objectChanged( m_pLastSelected->object( ), PMCSelected, this );
          else
             m_pLastSelected->setSelected( false );
       }
       else if( m_itemDeselected )
-         emit objectChanged( m_pLastSelected->object( ), PMCDeselected, TQT_TQOBJECT(this) );
+         emit objectChanged( m_pLastSelected->object( ), PMCDeselected, this );
    }
    m_acceptSelect = false;
 }
@@ -526,7 +526,7 @@ void PMTreeView::viewportMouseReleaseEvent( TQMouseEvent* e )
          m_pLastSelected->setSelected( true );
          m_acceptSelect = false;
 
-         emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, TQT_TQOBJECT(this) );
+         emit objectChanged( m_pLastSelected->object( ), PMCNewSelection, this );
       }
    }
 }
@@ -769,7 +769,7 @@ void PMTreeView::keyPressEvent( TQKeyEvent* e )
       m_acceptSelect = false;
 
       emit objectChanged( ( ( PMTreeViewItem* ) newSelection )->object( ),
-                          PMCNewSelection, TQT_TQOBJECT(this) );
+                          PMCNewSelection, this );
    }
 
    if( deleteItem && m_pPart->isReadWrite( ) )