Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit e0b799d647cf144caa7a58615e02132d9fd54809)

12 files changed, 19 insertions, 19 deletions

diff --git a/kghostview/kgvpageview.cpp b/kghostview/kgvpageview.cpp
index 336bad6d..f725cf03 100644
--- a/kghostview/kgvpageview.cpp
+++ b/kghostview/kgvpageview.cpp
@@ -52,7 +52,7 @@ bool KGVPageView::atBottom() const
 
 bool KGVPageView::eventFilter( TQObject* o, TQEvent* e )
 {
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_page) &&  e->type() == TQEvent::Resize ) {
+    if ( o == _page &&  e->type() == TQEvent::Resize ) {
 	// We need to call TQScrollView::eventFilter before centerContents,
 	// otherwise a loop will be introduced.
 	bool result = TQScrollView::eventFilter( o, e );
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 65714b05..736db94a 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -571,7 +571,7 @@ bool Part::closeURL()
 bool Part::eventFilter( TQObject * watched, TQEvent * e )
 {
     // if pageView has been resized, save splitter sizes
-    if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_pageView) && e->type() == TQEvent::Resize )
+    if ( watched == m_pageView && e->type() == TQEvent::Resize )
         m_saveSplitterSizeTimer->start(500, true);
 
     // only intercept events, don't block them
diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp
index ef106343..c2bfeb62 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -174,7 +174,7 @@ PMDialogView::~PMDialogView( )
 
 void PMDialogView::slotObjectChanged( PMObject* obj, const int mode, TQObject* sender )
 {
-   if( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) )
+   if( sender == this )
       return;
    if( mode & PMCNewSelection )
    {
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index e37b00b7..b52dfb33 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -256,7 +256,7 @@ void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw )
 void PMDockMainWindow::setView( TQWidget *view )
 {
   if ( view->isA("PMDockWidget") ){
-    if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this );
+    if ( view->parent() != this ) ((PMDockWidget*)view)->applyToWidget( this );
   }
 
 #ifndef NO_KDE2
@@ -559,7 +559,7 @@ void PMDockWidget::setEnableDocking( int pos )
 void PMDockWidget::updateHeader()
 {
   if ( parent() ){
-    if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){
+    if ( (parent() == manager->main) || isGroup || (eDocking == PMDockWidget::DockNone) ){
       header->hide();
     } else {
       header->setTopLevel( false );
@@ -573,7 +573,7 @@ void PMDockWidget::updateHeader()
 
 void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 {
-  if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) )
+  if ( parent() != s )
   {
     hide();
     reparent(s, 0, TQPoint(0,0), false);
@@ -1081,7 +1081,7 @@ void PMDockWidget::setWidget( TQWidget* mw )
 {
   if ( !mw ) return;
 
-  if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){
+  if ( mw->parent() != this ){
     mw->reparent(this, 0, TQPoint(0,0), false);
   }
 
@@ -1118,13 +1118,13 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
 
 bool PMDockWidget::mayBeHide() const
 {
-  bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
+  bool f = (parent() != manager->main);
   return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)PMDockWidget::DockNone ) );
 }
 
 bool PMDockWidget::mayBeShow() const
 {
-  bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
+  bool f = (parent() != manager->main);
   return ( !isGroup && !isTabGroup && f && !isVisible() );
 }
 
@@ -1800,7 +1800,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
     TQObjectListIt it(*childDock);
     PMDockWidget *obj1;
     while ( (obj1=(PMDockWidget*)it.current()) ) {
-        if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
+        if ( obj1->parent() == main )
             mainWidgetStr = TQString::fromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
@@ -2020,7 +2020,7 @@ void PMDockManager::writeConfig( TDEConfig* c, TQString group )
     ++it;
     //debug("  +Add subdock %s", obj->name());
     nList.append( obj->name() );
-    if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) )
+    if ( obj->parent() == main )
       c->writeEntry( "Main:view", obj->name() );
   }
 
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 1114e3d7..f2726b37 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -1238,7 +1238,7 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
       redraw = true;
 
    if( redraw )
-      repaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) );
+      repaint( sender == this );
 }
 
 void PMGLView::repaint( bool graphicalChange )
diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp
index 08f0cb3c..9badbd07 100644
--- a/kpovmodeler/pmsettingsdialog.cpp
+++ b/kpovmodeler/pmsettingsdialog.cpp
@@ -241,7 +241,7 @@ void PMSettingsDialog::slotRepaint( )
 
 void PMSettingsDialog::slotShowPage( )
 {
-   const TQObject* w = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( )));
+   const TQObject* w = sender( );
    if( w )
    {
       int index = findPage( ( const PMSettingsDialogPage* ) w );
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 7b96e066..82c02642 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -341,7 +341,7 @@ void PMShell::slotNewLibraryBrowserView( )
 
 void PMShell::slotDockWidgetClosed( )
 {
-   const TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( )));
+   const TQObject* o = sender( );
    if( o && o->inherits( "PMDockWidget" ) )
    {
       if( m_objectsToDelete.containsRef( o ) == 0 )
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 7ac1ca76..916e6808 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -101,7 +101,7 @@ void PMTreeView::slotObjectChanged( PMObject* obj, const int mode,
    bool as = m_acceptSelect;
    m_acceptSelect = true;
 
-   if( TQT_BASE_OBJECT(sender) != TQT_BASE_OBJECT(this) )
+   if( sender != this )
    {
       if( ( mode & PMCAdd ) && !( mode & PMCInsertError ) )
       {
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index d1343d9f..8868fbdc 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -479,7 +479,7 @@ void KSnapshot::closeEvent( TQCloseEvent * e )
 
 bool KSnapshot::eventFilter( TQObject* o, TQEvent* e)
 {
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(grabber) && e->type() == TQEvent::MouseButtonPress ) {
+    if ( o == grabber && e->type() == TQEvent::MouseButtonPress ) {
 	TQMouseEvent* me = (TQMouseEvent*) e;
 	if ( TQWidget::mouseGrabber() != grabber )
 	    return false;
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 063a0e14..8ecaeba9 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -251,7 +251,7 @@ void KView::readSettings() // TDEConfig * config )
 
 bool KView::eventFilter( TQObject * obj, TQEvent * ev )
 {
-	if( ev->type() == TQEvent::Resize && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) )
+	if( ev->type() == TQEvent::Resize && obj == m_pViewer->widget() )
 	{
 		if( m_nResizeMode == ResizeImage )
 			handleResize();
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index 8c203478..39e78305 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -326,7 +326,7 @@ TQString KImageCanvas::blendEffectDescription( unsigned int idx ) const
 
 bool KImageCanvas::eventFilter( TQObject * obj, TQEvent * ev )
 {
-	if( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_client) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_oldClient) ) && ev->type() == TQEvent::MouseMove )
+	if( ( obj == m_client || obj == m_oldClient ) && ev->type() == TQEvent::MouseMove )
 		mouseMoveEvent( TQT_TQMOUSEEVENT( ev ) );
 	return TQScrollView::eventFilter( obj, ev );
 }
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index c05490bb..b54867d0 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -161,7 +161,7 @@ KViewPresenter::~KViewPresenter()
 
 bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev )
 {
-	if( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pImageList->m_pListView->viewport()) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pViewer->widget()) )
+	if( obj == m_pImageList || obj == m_pImageList->m_pListView || obj == m_pImageList->m_pListView->viewport() || obj == m_pViewer->widget() )
 	{
 		switch( ev->type() )
 		{