TDE
/
kdiff3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
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>
pull/6/head
Michele Calgaro 1 year ago
parent d89d2afab3
commit 263f2650ae
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
src/difftextwindow.cpp
Unescape View File

@ -1685,7 +1685,7 @@ bool DiffTextWindowFrame::eventFilter( TQObject* o, TQEvent* e )
d->m_pLabel->setPalette( p ); d->m_pLabel->setPalette( p );
d->m_pTopLine->setPalette( p ); d->m_pTopLine->setPalette( p );
} }
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_pFileSelection) && e->type()==TQEvent::Drop) if (o == d->m_pFileSelection && e->type()==TQEvent::Drop)
{ {
TQDropEvent* d = static_cast<TQDropEvent*>(e); TQDropEvent* d = static_cast<TQDropEvent*>(e);

2
src/directorymergewindow.cpp
Unescape View File

@ -2688,7 +2688,7 @@ DirectoryMergeInfo::DirectoryMergeInfo( TQWidget* pParent )
bool DirectoryMergeInfo::eventFilter(TQObject*o, TQEvent* e) bool DirectoryMergeInfo::eventFilter(TQObject*o, TQEvent* e)
{ {
if ( e->type()==TQEvent::FocusIn && TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_pInfoList) ) if ( e->type()==TQEvent::FocusIn && o==m_pInfoList )
emit gotFocus(); emit gotFocus();
return false; return false;
} }

2
src/mergeresultwindow.cpp
Unescape View File

@ -3199,7 +3199,7 @@ bool WindowTitleWidget::eventFilter( TQObject* o, TQEvent* e )
m_pEncodingLabel->setPalette( p ); m_pEncodingLabel->setPalette( p );
m_pEncodingSelector->setPalette( p ); m_pEncodingSelector->setPalette( p );
} }
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pFileNameLineEdit) && e->type()==TQEvent::Drop) if (o == m_pFileNameLineEdit && e->type()==TQEvent::Drop)
{ {
TQDropEvent* d = static_cast<TQDropEvent*>(e); TQDropEvent* d = static_cast<TQDropEvent*>(e);

30
src/pdiff.cpp
Unescape View File

@ -837,7 +837,7 @@ void KDiff3App::resizeEvent(TQResizeEvent* e)
bool KDiff3App::eventFilter( TQObject* o, TQEvent* e ) bool KDiff3App::eventFilter( TQObject* o, TQEvent* e )
{ {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pMergeResultWindow) ) if( o == m_pMergeResultWindow )
{ {
if ( e->type() == TQEvent::KeyPress ) if ( e->type() == TQEvent::KeyPress )
{ // key press { // key press
@ -929,9 +929,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e )
{ {
raise(); raise();
TQString filename = stringList.first(); TQString filename = stringList.first();
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setFilename( filename ); if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename );
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setFilename( filename ); else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename );
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setFilename( filename ); else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename );
init(); init();
} }
#else #else
@ -941,9 +941,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e )
{ {
raise(); raise();
FileAccess fa( urlList.first().url() ); FileAccess fa( urlList.first().url() );
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setFileAccess( fa ); if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa );
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setFileAccess( fa ); else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa );
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setFileAccess( fa ); else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa );
init(); init();
} }
#endif #endif
@ -955,9 +955,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e )
if ( bDecodeSuccess && canContinue() ) if ( bDecodeSuccess && canContinue() )
{ {
raise(); raise();
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setData(text); if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text);
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setData(text); else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text);
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setData(text); else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text);
init(); init();
} }
} }
@ -1447,11 +1447,11 @@ void KDiff3App::slotSelectionStart()
//editCopy->setEnabled( false ); //editCopy->setEnabled( false );
//editCut->setEnabled( false ); //editCut->setEnabled( false );
const TQObject* s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); const TQObject* s = TQT_TQOBJECT(sender());
if (m_pDiffTextWindow1 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow1)) m_pDiffTextWindow1->resetSelection(); if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection();
if (m_pDiffTextWindow2 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow2)) m_pDiffTextWindow2->resetSelection(); if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection();
if (m_pDiffTextWindow3 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow3)) m_pDiffTextWindow3->resetSelection(); if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection();
if (m_pMergeResultWindow && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pMergeResultWindow)) m_pMergeResultWindow->resetSelection(); if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection();
} }
void KDiff3App::slotSelectionEnd() void KDiff3App::slotSelectionEnd()

Write Preview
Loading…
Cancel
Save