From 074a3e6db609cc04e0a5830b0c1884447d0e5bbb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:44:30 +0900 Subject: [PATCH] Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro --- src/detailedlistview.cpp | 2 +- src/fetchdialog.cpp | 2 +- src/gui/overlaywidget.cpp | 2 +- src/gui/tablefieldwidget.cpp | 4 ++-- src/translators/bibtexexporter.cpp | 2 +- src/translators/csvexporter.cpp | 2 +- src/translators/csvimporter.cpp | 2 +- src/translators/htmlexporter.cpp | 2 +- src/translators/onixexporter.cpp | 2 +- src/translators/pilotdbexporter.cpp | 2 +- src/translators/tellicoxmlexporter.cpp | 2 +- src/translators/xsltexporter.cpp | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp index 938c4a4..8d86262 100644 --- a/src/detailedlistview.cpp +++ b/src/detailedlistview.cpp @@ -378,7 +378,7 @@ Tellico::DetailedEntryItem* DetailedListView::locateItem(Data::EntryPtr entry_) bool DetailedListView::eventFilter(TQObject* obj_, TQEvent* ev_) { if(ev_->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev_)->button() == Qt::RightButton - && TQT_BASE_OBJECT(obj_) == TQT_BASE_OBJECT(header())) { + && obj_ == header()) { m_headerMenu->popup(TQT_TQMOUSEEVENT(ev_)->globalPos()); return true; } diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index 003dedb..15fef58 100644 --- a/src/fetchdialog.cpp +++ b/src/fetchdialog.cpp @@ -660,7 +660,7 @@ void FetchDialog::slotUPC2ISBN() { } bool FetchDialog::eventFilter(TQObject* obj_, TQEvent* ev_) { - if(TQT_BASE_OBJECT(obj_) == TQT_BASE_OBJECT(m_listView->viewport()) && ev_->type() == TQEvent::Resize) { + if(obj_ == m_listView->viewport() && ev_->type() == TQEvent::Resize) { adjustColumnWidth(); } return false; diff --git a/src/gui/overlaywidget.cpp b/src/gui/overlaywidget.cpp index 3977ce1..640f810 100644 --- a/src/gui/overlaywidget.cpp +++ b/src/gui/overlaywidget.cpp @@ -81,7 +81,7 @@ void OverlayWidget::reposition() { } bool OverlayWidget::eventFilter(TQObject* object_, TQEvent* event_) { - if(TQT_BASE_OBJECT(object_) == TQT_BASE_OBJECT(m_anchor) && (event_->type() == TQEvent::Move || event_->type() == TQEvent::Resize)) { + if(object_ == m_anchor && (event_->type() == TQEvent::Move || event_->type() == TQEvent::Resize)) { reposition(); } diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp index 5d63970..cdaabec 100644 --- a/src/gui/tablefieldwidget.cpp +++ b/src/gui/tablefieldwidget.cpp @@ -227,7 +227,7 @@ void TableFieldWidget::updateFieldHook(Data::FieldPtr, Data::FieldPtr newField_) bool TableFieldWidget::eventFilter(TQObject* obj_, TQEvent* ev_) { if(ev_->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev_)->button() == Qt::RightButton) { - if(TQT_BASE_OBJECT(obj_) == TQT_BASE_OBJECT(m_table->horizontalHeader())) { + if(obj_ == m_table->horizontalHeader()) { TQMouseEvent* ev = TQT_TQMOUSEEVENT(ev_); // might be scrolled int pos = ev->x() + m_table->horizontalHeader()->offset(); @@ -242,7 +242,7 @@ bool TableFieldWidget::eventFilter(TQObject* obj_, TQEvent* ev_) { this, TQT_SLOT(slotRenameColumn())); menu.exec(ev->globalPos()); return true; - } else if(TQT_BASE_OBJECT(obj_) == TQT_BASE_OBJECT(m_table->verticalHeader())) { + } else if(obj_ == m_table->verticalHeader()) { TQMouseEvent* ev = TQT_TQMOUSEEVENT(ev_); // might be scrolled int pos = ev->y() + m_table->verticalHeader()->offset(); diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp index 7667595..d2cceb2 100644 --- a/src/translators/bibtexexporter.cpp +++ b/src/translators/bibtexexporter.cpp @@ -191,7 +191,7 @@ bool BibtexExporter::exec() { } TQWidget* BibtexExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && m_widget->parent() == parent_) { return m_widget; } diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp index 69b8a07..7c64bf1 100644 --- a/src/translators/csvexporter.cpp +++ b/src/translators/csvexporter.cpp @@ -99,7 +99,7 @@ bool CSVExporter::exec() { } TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && m_widget->parent() == parent_) { return m_widget; } diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index d6198d0..63032e2 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -237,7 +237,7 @@ Tellico::Data::CollPtr CSVImporter::collection() { } TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { - if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && m_widget->parent() == parent_) { return m_widget; } diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index e8bb95d..06dd757 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -459,7 +459,7 @@ void HTMLExporter::writeImages(Data::CollPtr coll_) { } TQWidget* HTMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && m_widget->parent() == parent_) { return m_widget; } diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp index 86fba49..43e9231 100644 --- a/src/translators/onixexporter.cpp +++ b/src/translators/onixexporter.cpp @@ -166,7 +166,7 @@ TQString ONIXExporter::text() { } TQWidget* ONIXExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && m_widget->parent() == parent_) { return m_widget; } diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp index d2d330a..74eaf2f 100644 --- a/src/translators/pilotdbexporter.cpp +++ b/src/translators/pilotdbexporter.cpp @@ -200,7 +200,7 @@ bool PilotDBExporter::exec() { } TQWidget* PilotDBExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && m_widget->parent() == parent_) { return m_widget; } diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp index cd76b26..de6003a 100644 --- a/src/translators/tellicoxmlexporter.cpp +++ b/src/translators/tellicoxmlexporter.cpp @@ -472,7 +472,7 @@ void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& pa } TQWidget* TellicoXMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && m_widget->parent() == parent_) { return m_widget; } diff --git a/src/translators/xsltexporter.cpp b/src/translators/xsltexporter.cpp index 07e9bc9..96fa7f1 100644 --- a/src/translators/xsltexporter.cpp +++ b/src/translators/xsltexporter.cpp @@ -64,7 +64,7 @@ bool XSLTExporter::exec() { } TQWidget* XSLTExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && m_widget->parent() == parent_) { return m_widget; }