summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-12 18:40:13 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-15 20:57:02 +0900
commitb5270999cf4da1ff1a407bb355719f1b6969cfb7 (patch)
treea59eb6b7e0ea420265b7db779da7bafce645c924
parent21ca8e5a7c13cd5ac21c172dc1c6b1e9eeb4a455 (diff)
downloadkdiff3-b5270999cf4da1ff1a407bb355719f1b6969cfb7.tar.gz
kdiff3-b5270999cf4da1ff1a407bb355719f1b6969cfb7.zip
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 263f2650aeac3838ab999c4b48ee5b9b757d6976)
-rw-r--r--src/difftextwindow.cpp2
-rw-r--r--src/directorymergewindow.cpp2
-rw-r--r--src/mergeresultwindow.cpp2
-rw-r--r--src/pdiff.cpp30
4 files changed, 18 insertions, 18 deletions
diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp
index ae18a59..5a2ffe2 100644
--- a/src/difftextwindow.cpp
+++ b/src/difftextwindow.cpp
@@ -1685,7 +1685,7 @@ bool DiffTextWindowFrame::eventFilter( TQObject* o, TQEvent* e )
d->m_pLabel->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);
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp
index 57f05aa..3ca33e7 100644
--- a/src/directorymergewindow.cpp
+++ b/src/directorymergewindow.cpp
@@ -2688,7 +2688,7 @@ DirectoryMergeInfo::DirectoryMergeInfo( TQWidget* pParent )
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();
return false;
}
diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
index f52d0a3..1da3171 100644
--- a/src/mergeresultwindow.cpp
+++ b/src/mergeresultwindow.cpp
@@ -3199,7 +3199,7 @@ bool WindowTitleWidget::eventFilter( TQObject* o, TQEvent* e )
m_pEncodingLabel->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);
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()