From a7ea84c97639f635d798348432f355e3ac496a1d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:44:08 +0900 Subject: Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro --- kexi/plugins/forms/widgets/kexidbautofield.cpp | 2 +- kexi/plugins/forms/widgets/kexidbcombobox.cpp | 2 +- kexi/plugins/forms/widgets/kexidbform.cpp | 4 ++-- kexi/plugins/forms/widgets/kexidbimagebox.cpp | 4 ++-- kexi/plugins/importexport/csv/kexicsvimportdialog.cpp | 2 +- kexi/plugins/queries/kexiquerydesignersql.cpp | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'kexi/plugins') diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index f4056728..52272fc7 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -800,7 +800,7 @@ bool KexiDBAutoField::setProperty( const char * name, const TQVariant & value ) bool KexiDBAutoField::eventFilter( TQObject *o, TQEvent *e ) { - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(d->label) && d->label->buddy() && e->type()==TQEvent::MouseButtonRelease) { + if (o==d->label && d->label->buddy() && e->type()==TQEvent::MouseButtonRelease) { //focus label's buddy when user clicked the label d->label->buddy()->setFocus(); } diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index c7a378df..e315e752 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -331,7 +331,7 @@ void KexiDBComboBox::mouseDoubleClickEvent( TQMouseEvent *e ) bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e ) { - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(this)) { + if (o==this) { if (e->type()==TQEvent::Resize) { d->paintedCombo->resize(size()); if (m_subwidget) diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index 980e384d..4669fa40 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -390,7 +390,7 @@ void KexiDBForm::updateReadOnlyFlags() bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) { //kexipluginsdbg << e->type() << endl; - if (e->type()==TQEvent::Resize && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(this)) + if (e->type()==TQEvent::Resize && watched == this) kexipluginsdbg << "RESIZE" << endl; if (e->type()==TQEvent::KeyPress) { if (preview()) { @@ -537,7 +537,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) KFormDesigner::TabWidget *tabWidgetFor_widgetToFocus = KFormDesigner::findParent( widgetToFocus, "KFormDesigner::TabWidget", pageFor_widgetToFocus); - if (tabWidgetFor_widgetToFocus && TQT_BASE_OBJECT(tabWidgetFor_widgetToFocus->currentPage())!=TQT_BASE_OBJECT(pageFor_widgetToFocus)) { + if (tabWidgetFor_widgetToFocus && tabWidgetFor_widgetToFocus->currentPage()!=pageFor_widgetToFocus) { realWidget = widgetToFocus; continue; //the new widget to focus is placed on invisible tab page: move to next widget } diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index fb963600..e8b7aa93 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -837,13 +837,13 @@ bool KexiDBImageBox::subwidgetStretchRequired(KexiDBAutoField* autoField) const bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e ) { - if (TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(m_chooser)) { //we're watching chooser as well because it's a focus proxy even if invisible + if (watched==this || watched==m_chooser) { //we're watching chooser as well because it's a focus proxy even if invisible if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut || e->type()==TQEvent::MouseButtonPress) { update(); //to repaint focus rect } } // hide popup menu as soon as it loses focus - if (TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(m_popupMenu) && e->type()==TQEvent::FocusOut) { + if (watched==m_popupMenu && e->type()==TQEvent::FocusOut) { m_popupMenu->hide(); } return KexiFrame::eventFilter(watched, e); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index cf660477..29e404b6 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -1630,7 +1630,7 @@ bool KexiCSVImportDialog::eventFilter ( TQObject * watched, TQEvent * e ) || t==TQEvent::Paint )) return true; - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_startAtLineSpinBox) && t==TQEvent::KeyPress) { + if (watched == m_startAtLineSpinBox && t==TQEvent::KeyPress) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); if (ke->key()==TQt::Key_Enter || ke->key()==TQt::Key_Return) { m_table->setFocus(); diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index c9f9e1c5..5e076cb4 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -410,10 +410,10 @@ void KexiQueryDesignerSQLView::slotTextChanged() bool KexiQueryDesignerSQLView::eventFilter( TQObject *o, TQEvent *e ) { if (d->eventFilterForSplitterEnabled) { - if (e->type()==TQEvent::Resize && o && TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(d->historyHead) && d->historyHead->isVisible()) { + if (e->type()==TQEvent::Resize && o && o==d->historyHead && d->historyHead->isVisible()) { d->heightForHistoryMode = d->historyHead->height(); } - else if (e->type()==TQEvent::Resize && o && TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(d->status_hbox) && d->status_hbox->isVisible()) { + else if (e->type()==TQEvent::Resize && o && o==d->status_hbox && d->status_hbox->isVisible()) { d->heightForStatusMode = d->status_hbox->height(); } } -- cgit v1.2.1