diff options
| author | Michele Calgaro <[email protected]> | 2023-08-12 18:40:13 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-08-15 20:27:41 +0900 |
| commit | 263f2650aeac3838ab999c4b48ee5b9b757d6976 (patch) | |
| tree | a59eb6b7e0ea420265b7db779da7bafce645c924 /src/pdiff.cpp | |
| parent | d89d2afab3da72366daa6ee4b379813bc8b29467 (diff) | |
| download | kdiff3-263f2650aeac3838ab999c4b48ee5b9b757d6976.tar.gz kdiff3-263f2650aeac3838ab999c4b48ee5b9b757d6976.zip | |
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'src/pdiff.cpp')
| -rw-r--r-- | src/pdiff.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/pdiff.cpp b/src/pdiff.cpp index 25c042e..8cf9046 100644 --- a/src/pdiff.cpp +++ b/src/pdiff.cpp @@ -837,7 +837,7 @@ void KDiff3App::resizeEvent(TQResizeEvent* 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 ) { // key press @@ -929,9 +929,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e ) { raise(); TQString filename = stringList.first(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setFilename( filename ); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setFilename( filename ); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setFilename( filename ); + if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename ); + else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename ); + else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename ); init(); } #else @@ -941,9 +941,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e ) { raise(); FileAccess fa( urlList.first().url() ); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setFileAccess( fa ); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setFileAccess( fa ); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setFileAccess( fa ); + if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa ); + else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa ); + else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa ); init(); } #endif @@ -955,9 +955,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e ) if ( bDecodeSuccess && canContinue() ) { raise(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setData(text); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setData(text); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setData(text); + if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text); + else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text); + else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text); init(); } } @@ -1447,11 +1447,11 @@ void KDiff3App::slotSelectionStart() //editCopy->setEnabled( false ); //editCut->setEnabled( false ); - const TQObject* s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); - if (m_pDiffTextWindow1 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow1)) m_pDiffTextWindow1->resetSelection(); - if (m_pDiffTextWindow2 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow2)) m_pDiffTextWindow2->resetSelection(); - if (m_pDiffTextWindow3 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow3)) m_pDiffTextWindow3->resetSelection(); - if (m_pMergeResultWindow && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pMergeResultWindow)) m_pMergeResultWindow->resetSelection(); + const TQObject* s = TQT_TQOBJECT(sender()); + if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection(); + if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection(); + if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection(); + if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection(); } void KDiff3App::slotSelectionEnd() |