summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-08-12 18:42:46 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-08-16 13:11:05 +0900
commiteac5a923bfe691153309b671a4aa0c8a31d9a776 (patch)
tree82a9e4f40eb0c35c33b771f3e7689d9b1ffacf54
parentbbf8323611cd45fff405a3f8bd24516e404d5aa8 (diff)
downloadk3b-eac5a923bfe691153309b671a4aa0c8a31d9a776.tar.gz
k3b-eac5a923bfe691153309b671a4aa0c8a31d9a776.zip
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--libk3b/tools/k3blistview.cpp30
-rw-r--r--src/k3bprojecttabwidget.cpp2
-rw-r--r--src/k3bstatusbarmanager.cpp4
-rw-r--r--src/k3btooltip.cpp2
-rw-r--r--src/projects/k3baudiotracksplitdialog.cpp2
-rw-r--r--src/projects/k3bview.cpp2
6 files changed, 21 insertions, 21 deletions
diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp
index 03be684..b6ab012 100644
--- a/libk3b/tools/k3blistview.cpp
+++ b/libk3b/tools/k3blistview.cpp
@@ -1017,9 +1017,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
if( e->type() == TQEvent::KeyPress ) {
TQKeyEvent* ke = TQT_TQKEYEVENT(e);
if( ke->key() == Key_Tab ) {
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) {
+ if( o == m_editorLineEdit ||
+ o == d->msfEditLineEdit ||
+ o == d->spinBoxLineEdit ) {
K3bListViewItem* lastEditItem = m_currentEditItem;
doRename();
@@ -1059,9 +1059,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
}
if( ke->key() == Key_Return ||
ke->key() == Key_Enter ) {
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) {
+ if( o == m_editorLineEdit ||
+ o == d->msfEditLineEdit ||
+ o == d->spinBoxLineEdit ) {
K3bListViewItem* lastEditItem = m_currentEditItem;
doRename();
@@ -1079,9 +1079,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
}
}
else if( ke->key() == Key_Escape ) {
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) {
+ if( o == m_editorLineEdit ||
+ o == d->msfEditLineEdit ||
+ o == d->spinBoxLineEdit ) {
hideEditor();
// keep the focus here
@@ -1092,7 +1092,7 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
}
}
- else if( e->type() == TQEvent::MouseButtonPress && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) {
+ else if( e->type() == TQEvent::MouseButtonPress && o == viewport() ) {
// first let's grab the focus
viewport()->setFocus();
@@ -1138,12 +1138,12 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
}
else if( e->type() == TQEvent::FocusOut ) {
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ||
- TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) {
+ if( o == m_editorLineEdit ||
+ o == d->msfEditLineEdit ||
+ o == d->spinBoxLineEdit ||
+ o == m_editorComboBox ) {
// make sure we did not lose the focus to one of the edit widgets' children
- if( !tqApp->focusWidget() || TQT_BASE_OBJECT(tqApp->focusWidget()->parentWidget()) != TQT_BASE_OBJECT(o) ) {
+ if( !tqApp->focusWidget() || tqApp->focusWidget()->parentWidget() != o ) {
doRename();
hideEditor();
}
diff --git a/src/k3bprojecttabwidget.cpp b/src/k3bprojecttabwidget.cpp
index 3b9bc7c..ee65f85 100644
--- a/src/k3bprojecttabwidget.cpp
+++ b/src/k3bprojecttabwidget.cpp
@@ -174,7 +174,7 @@ K3bDoc* K3bProjectTabWidget::projectAt( const TQPoint& pos ) const
bool K3bProjectTabWidget::eventFilter( TQObject* o, TQEvent* e )
{
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tabBar()) ) {
+ if( o == tabBar() ) {
if( e->type() == TQEvent::MouseButtonPress ) {
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
if( me->button() == Qt::RightButton ) {
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index d23e75a..7b21b6b 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -153,9 +153,9 @@ void K3bStatusBarManager::clearActionStatusText()
bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
{
if( e->type() == TQEvent::MouseButtonDblClick ) {
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->parentWidget()) )
+ if( o == m_labelFreeTemp->parentWidget() )
m_mainWindow->showOptionDialog( 0 ); // FIXME: use an enumeration for the option pages
- else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) )
+ else if( o == m_versionBox )
if( TDEAction* a = m_mainWindow->action( "help_about_app" ) )
a->activate();
}
diff --git a/src/k3btooltip.cpp b/src/k3btooltip.cpp
index c123955..973e6aa 100644
--- a/src/k3btooltip.cpp
+++ b/src/k3btooltip.cpp
@@ -134,7 +134,7 @@ void K3bToolTip::hideTip()
bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e )
{
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(parentWidget()) ) {
+ if( o == parentWidget() ) {
switch( e->type() ) {
case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonRelease:
diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp
index 3ba799b..d6584ae 100644
--- a/src/projects/k3baudiotracksplitdialog.cpp
+++ b/src/projects/k3baudiotracksplitdialog.cpp
@@ -162,7 +162,7 @@ void K3bAudioTrackSplitDialog::splitAt( const TQPoint& p )
bool K3bAudioTrackSplitDialog::eventFilter( TQObject* o, TQEvent* e )
{
- if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorWidget) ) {
+ if( o == m_editorWidget ) {
if( e->type() == TQEvent::MouseButtonDblClick ) {
TQMouseEvent* me = TQT_TQMOUSEEVENT( e );
splitAt( me->pos() );
diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp
index df3384d..717aa7f 100644
--- a/src/projects/k3bview.cpp
+++ b/src/projects/k3bview.cpp
@@ -149,7 +149,7 @@ void K3bView::addPluginButtons( int projectType )
void K3bView::slotPluginButtonClicked()
{
- TQObject* o = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
+ TQObject* o = const_cast<TQObject*>(sender());
if( K3bProjectPlugin* p = m_plugins[static_cast<void*>(o)] ) {
if( p->hasGUI() ) {
K3bProjectPluginDialog dlg( p, doc(), this );