TDE
/
k3b
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k3b
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 eac5a923bf)
r14.1.x
Michele Calgaro 1 year ago
parent 9f8bd22e4e
commit eb0f6cbe60
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

30
libk3b/tools/k3blistview.cpp
Unescape View File

@ -1017,9 +1017,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
if( e->type() == TQEvent::KeyPress ) { if( e->type() == TQEvent::KeyPress ) {
TQKeyEvent* ke = TQT_TQKEYEVENT(e); TQKeyEvent* ke = TQT_TQKEYEVENT(e);
if( ke->key() == Key_Tab ) { if( ke->key() == Key_Tab ) {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || if( o == m_editorLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || o == d->msfEditLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { o == d->spinBoxLineEdit ) {
K3bListViewItem* lastEditItem = m_currentEditItem; K3bListViewItem* lastEditItem = m_currentEditItem;
doRename(); doRename();
@ -1059,9 +1059,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
} }
if( ke->key() == Key_Return || if( ke->key() == Key_Return ||
ke->key() == Key_Enter ) { ke->key() == Key_Enter ) {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || if( o == m_editorLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || o == d->msfEditLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { o == d->spinBoxLineEdit ) {
K3bListViewItem* lastEditItem = m_currentEditItem; K3bListViewItem* lastEditItem = m_currentEditItem;
doRename(); doRename();
@ -1079,9 +1079,9 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
} }
} }
else if( ke->key() == Key_Escape ) { else if( ke->key() == Key_Escape ) {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || if( o == m_editorLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || o == d->msfEditLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) ) { o == d->spinBoxLineEdit ) {
hideEditor(); hideEditor();
// keep the focus here // 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 // first let's grab the focus
viewport()->setFocus(); viewport()->setFocus();
@ -1138,12 +1138,12 @@ bool K3bListView::eventFilter( TQObject* o, TQEvent* e )
} }
else if( e->type() == TQEvent::FocusOut ) { else if( e->type() == TQEvent::FocusOut ) {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorLineEdit) || if( o == m_editorLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->msfEditLineEdit) || o == d->msfEditLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->spinBoxLineEdit) || o == d->spinBoxLineEdit ||
TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editorComboBox) ) { o == m_editorComboBox ) {
// make sure we did not lose the focus to one of the edit widgets' children // 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(); doRename();
hideEditor(); hideEditor();
} }

2
src/k3bprojecttabwidget.cpp
Unescape View File

@ -174,7 +174,7 @@ K3bDoc* K3bProjectTabWidget::projectAt( const TQPoint& pos ) const
bool K3bProjectTabWidget::eventFilter( TQObject* o, TQEvent* e ) bool K3bProjectTabWidget::eventFilter( TQObject* o, TQEvent* e )
{ {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(tabBar()) ) { if( o == tabBar() ) {
if( e->type() == TQEvent::MouseButtonPress ) { if( e->type() == TQEvent::MouseButtonPress ) {
TQMouseEvent* me = TQT_TQMOUSEEVENT(e); TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
if( me->button() == Qt::RightButton ) { if( me->button() == Qt::RightButton ) {

4
src/k3bstatusbarmanager.cpp
Unescape View File

@ -153,9 +153,9 @@ void K3bStatusBarManager::clearActionStatusText()
bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e ) bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
{ {
if( e->type() == TQEvent::MouseButtonDblClick ) { 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 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" ) ) if( TDEAction* a = m_mainWindow->action( "help_about_app" ) )
a->activate(); a->activate();
} }

2
src/k3btooltip.cpp
Unescape View File

@ -134,7 +134,7 @@ void K3bToolTip::hideTip()
bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e ) bool K3bToolTip::eventFilter( TQObject* o, TQEvent* e )
{ {
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(parentWidget()) ) { if( o == parentWidget() ) {
switch( e->type() ) { switch( e->type() ) {
case TQEvent::MouseButtonPress: case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonRelease:

2
src/projects/k3baudiotracksplitdialog.cpp
Unescape View File

@ -162,7 +162,7 @@ void K3bAudioTrackSplitDialog::splitAt( const TQPoint& p )
bool K3bAudioTrackSplitDialog::eventFilter( TQObject* o, TQEvent* e ) 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 ) { if( e->type() == TQEvent::MouseButtonDblClick ) {
TQMouseEvent* me = TQT_TQMOUSEEVENT( e ); TQMouseEvent* me = TQT_TQMOUSEEVENT( e );
splitAt( me->pos() ); splitAt( me->pos() );

2
src/projects/k3bview.cpp
Unescape View File

@ -149,7 +149,7 @@ void K3bView::addPluginButtons( int projectType )
void K3bView::slotPluginButtonClicked() 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( K3bProjectPlugin* p = m_plugins[static_cast<void*>(o)] ) {
if( p->hasGUI() ) { if( p->hasGUI() ) {
K3bProjectPluginDialog dlg( p, doc(), this ); K3bProjectPluginDialog dlg( p, doc(), this );

Write Preview
Loading…
Cancel
Save