TDE
/
tdegraphics
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics
0
0
Fork 0
Code Issues Releases Wiki Activity

Drop TQT_BASE_OBJECT* defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e0b799d647)
pull/70/head
Michele Calgaro 1 year ago
parent 8b76e7f3dc
commit fbcad37de1
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
kghostview/kgvpageview.cpp
Unescape View File

@ -52,7 +52,7 @@ bool KGVPageView::atBottom() const
bool KGVPageView::eventFilter( TQObject* o, TQEvent* e ) 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, // We need to call TQScrollView::eventFilter before centerContents,
// otherwise a loop will be introduced. // otherwise a loop will be introduced.
bool result = TQScrollView::eventFilter( o, e ); bool result = TQScrollView::eventFilter( o, e );

2
kpdf/part.cpp
Unescape View File

@ -571,7 +571,7 @@ bool Part::closeURL()
bool Part::eventFilter( TQObject * watched, TQEvent * e ) bool Part::eventFilter( TQObject * watched, TQEvent * e )
{ {
// if pageView has been resized, save splitter sizes // 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); m_saveSplitterSizeTimer->start(500, true);
// only intercept events, don't block them // only intercept events, don't block them

2
kpovmodeler/pmdialogview.cpp
Unescape View File

@ -174,7 +174,7 @@ PMDialogView::~PMDialogView( )
void PMDialogView::slotObjectChanged( PMObject* obj, const int mode, TQObject* sender ) void PMDialogView::slotObjectChanged( PMObject* obj, const int mode, TQObject* sender )
{ {
if( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) ) if( sender == this )
return; return;
if( mode & PMCNewSelection ) if( mode & PMCNewSelection )
{ {

16
kpovmodeler/pmdockwidget.cpp
Unescape View File

@ -256,7 +256,7 @@ void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw )
void PMDockMainWindow::setView( TQWidget *view ) void PMDockMainWindow::setView( TQWidget *view )
{ {
if ( view->isA("PMDockWidget") ){ 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 #ifndef NO_KDE2
@ -559,7 +559,7 @@ void PMDockWidget::setEnableDocking( int pos )
void PMDockWidget::updateHeader() void PMDockWidget::updateHeader()
{ {
if ( parent() ){ 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(); header->hide();
} else { } else {
header->setTopLevel( false ); header->setTopLevel( false );
@ -573,7 +573,7 @@ void PMDockWidget::updateHeader()
void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
{ {
if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) ) if ( parent() != s )
{ {
hide(); hide();
reparent(s, 0, TQPoint(0,0), false); reparent(s, 0, TQPoint(0,0), false);
@ -1081,7 +1081,7 @@ void PMDockWidget::setWidget( TQWidget* mw )
{ {
if ( !mw ) return; 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); mw->reparent(this, 0, TQPoint(0,0), false);
} }
@ -1118,13 +1118,13 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
bool PMDockWidget::mayBeHide() const 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 ) ); return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)PMDockWidget::DockNone ) );
} }
bool PMDockWidget::mayBeShow() const 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() ); return ( !isGroup && !isTabGroup && f && !isVisible() );
} }
@ -1800,7 +1800,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
TQObjectListIt it(*childDock); TQObjectListIt it(*childDock);
PMDockWidget *obj1; PMDockWidget *obj1;
while ( (obj1=(PMDockWidget*)it.current()) ) { while ( (obj1=(PMDockWidget*)it.current()) ) {
if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) if ( obj1->parent() == main )
mainWidgetStr = TQString::fromLatin1(obj1->name()); mainWidgetStr = TQString::fromLatin1(obj1->name());
nList.append(obj1->name()); nList.append(obj1->name());
++it; ++it;
@ -2020,7 +2020,7 @@ void PMDockManager::writeConfig( TDEConfig* c, TQString group )
++it; ++it;
//debug(" +Add subdock %s", obj->name()); //debug(" +Add subdock %s", obj->name());
nList.append( 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() ); c->writeEntry( "Main:view", obj->name() );
} }

2
kpovmodeler/pmglview.cpp
Unescape View File

@ -1238,7 +1238,7 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
redraw = true; redraw = true;
if( redraw ) if( redraw )
repaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) ); repaint( sender == this );
} }
void PMGLView::repaint( bool graphicalChange ) void PMGLView::repaint( bool graphicalChange )

2
kpovmodeler/pmsettingsdialog.cpp
Unescape View File

@ -241,7 +241,7 @@ void PMSettingsDialog::slotRepaint( )
void PMSettingsDialog::slotShowPage( ) void PMSettingsDialog::slotShowPage( )
{ {
const TQObject* w = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender( ))); const TQObject* w = sender( );
if( w ) if( w )
{ {
int index = findPage( ( const PMSettingsDialogPage* ) w ); int index = findPage( ( const PMSettingsDialogPage* ) w );

2
kpovmodeler/pmshell.cpp
Unescape View File

@ -341,7 +341,7 @@ void PMShell::slotNewLibraryBrowserView( )
void PMShell::slotDockWidgetClosed( ) 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( o && o->inherits( "PMDockWidget" ) )
{ {
if( m_objectsToDelete.containsRef( o ) == 0 ) if( m_objectsToDelete.containsRef( o ) == 0 )

2
kpovmodeler/pmtreeview.cpp
Unescape View File

@ -101,7 +101,7 @@ void PMTreeView::slotObjectChanged( PMObject* obj, const int mode,
bool as = m_acceptSelect; bool as = m_acceptSelect;
m_acceptSelect = true; m_acceptSelect = true;
if( TQT_BASE_OBJECT(sender) != TQT_BASE_OBJECT(this) ) if( sender != this )
{ {
if( ( mode & PMCAdd ) && !( mode & PMCInsertError ) ) if( ( mode & PMCAdd ) && !( mode & PMCInsertError ) )
{ {

2
ksnapshot/ksnapshot.cpp
Unescape View File

@ -479,7 +479,7 @@ void KSnapshot::closeEvent( TQCloseEvent * e )
bool KSnapshot::eventFilter( TQObject* o, TQEvent* 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; TQMouseEvent* me = (TQMouseEvent*) e;
if ( TQWidget::mouseGrabber() != grabber ) if ( TQWidget::mouseGrabber() != grabber )
return false; return false;

2
kview/kview.cpp
Unescape View File

@ -251,7 +251,7 @@ void KView::readSettings() // TDEConfig * config )
bool KView::eventFilter( TQObject * obj, TQEvent * ev ) 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 ) if( m_nResizeMode == ResizeImage )
handleResize(); handleResize();

2
kview/kviewcanvas/kimagecanvas.cpp
Unescape View File

@ -326,7 +326,7 @@ TQString KImageCanvas::blendEffectDescription( unsigned int idx ) const
bool KImageCanvas::eventFilter( TQObject * obj, TQEvent * ev ) 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 ) ); mouseMoveEvent( TQT_TQMOUSEEVENT( ev ) );
return TQScrollView::eventFilter( obj, ev ); return TQScrollView::eventFilter( obj, ev );
} }

2
kview/modules/presenter/kviewpresenter.cpp
Unescape View File

@ -161,7 +161,7 @@ KViewPresenter::~KViewPresenter()
bool KViewPresenter::eventFilter( TQObject *obj, TQEvent *ev ) 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() ) switch( ev->type() )
{ {

Write Preview
Loading…
Cancel
Save