From a7ea84c97639f635d798348432f355e3ac496a1d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 12 Aug 2023 18:44:08 +0900 Subject: [PATCH] Drop TQT_BASE_OBJECT* defines Signed-off-by: Michele Calgaro --- .../viewplugins/screenshot/ksnapshot.cpp | 2 +- chalk/ui/kobirdeyepanel.cpp | 10 +- karbon/widgets/vcolorslider.cpp | 2 +- kchart/kchartDataEditor.cpp | 2 +- kexi/core/kexisharedactionhost.cpp | 2 +- kexi/formeditor/container.cpp | 2 +- .../formeditor/factories/containerfactory.cpp | 2 +- kexi/formeditor/utils.h | 2 +- kexi/kexiutils/utils.h | 6 +- kexi/main/startup/KexiNewProjectWizard.cpp | 4 +- .../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 +- .../importexport/csv/kexicsvimportdialog.cpp | 2 +- kexi/plugins/queries/kexiquerydesignersql.cpp | 4 +- kexi/widget/kexibrowser.cpp | 8 +- kexi/widget/kexisectionheader.cpp | 2 +- kexi/widget/relations/kexirelationwidget.cpp | 8 +- kexi/widget/tableview/kexiblobtableedit.cpp | 2 +- kexi/widget/tableview/kexicomboboxpopup.cpp | 4 +- .../tableview/kexicomboboxtableedit.cpp | 2 +- kexi/widget/tableview/kexitableedit.cpp | 2 +- kexi/widget/tableview/kexitableview.cpp | 8 +- kexi/widget/utils/kexigradientwidget.cpp | 6 +- kexi/widget/utils/kexirecordnavigator.cpp | 2 +- kivio/kiviopart/kivio_stackbar.cpp | 2 +- kivio/kiviopart/ui/kivio_birdeye_panel.cpp | 10 +- kivio/kiviopart/ui/kivio_layer_panel.cpp | 2 +- kpresenter/KPrView.cpp | 12 +- kspread/dialogs/kspread_dlg_formula.cpp | 10 +- kspread/dialogs/kspread_dlg_goalseek.cpp | 6 +- kspread/dialogs/kspread_dlg_paperlayout.cpp | 6 +- kspread/kspread_editors.cpp | 4 +- kspread/kspread_view.cpp | 140 +++++++++--------- kword/KWCanvas.cpp | 4 +- kword/KWView.cpp | 18 +-- lib/kofficecore/KoDetailsPane.cpp | 8 +- lib/kofficecore/KoFrame.cpp | 4 +- lib/kofficecore/KoMainWindow.cpp | 4 +- lib/kofficecore/kkbdaccessextensions.cpp | 2 +- lib/kofficeui/KoPartSelectAction.cpp | 2 +- lib/kofficeui/KoTooluButton.cpp | 2 +- lib/kofficeui/ttdetoolbarbutton.cpp | 4 +- lib/kopalette/kopalettemanager.cpp | 2 +- lib/koproperty/editor.cpp | 2 +- lib/koproperty/editors/pixmapedit.cpp | 2 +- lib/koproperty/editors/spinbox.cpp | 8 +- 48 files changed, 175 insertions(+), 175 deletions(-) diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index b07b4d3e2..7fb3668fb 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -270,7 +270,7 @@ void KSnapshot::slotRegionGrabbed( const TQPixmap &pix ) bool KSnapshot::eventFilter( TQObject* o, TQEvent* e) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(grabber) && e->type() == TQEvent::MouseButtonPress ) { + if ( o == grabber && e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = (TQMouseEvent*) e; if ( TQWidget::mouseGrabber() != grabber ) return false; diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 46e0a5853..ee784efa4 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -307,15 +307,15 @@ void KoBirdEyePanel::updateVisibleArea() bool KoBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_page->view) && ev->type() == TQEvent::Resize) { + if (o == m_page->view && ev->type() == TQEvent::Resize) { resizeViewEvent(TQT_TQRESIZEEVENT(ev)->size()); } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_page->view) && ev->type() == TQEvent::Paint) { + if (o == m_page->view && ev->type() == TQEvent::Paint) { paintViewEvent(TQT_TQPAINTEVENT(ev)); } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_page->view) && ev->type() == TQEvent::MouseMove) { + if (o == m_page->view && ev->type() == TQEvent::MouseMove) { TQMouseEvent* me = (TQMouseEvent*)ev; TQPoint thumbnailPos = viewToThumbnail(me->pos()); @@ -329,7 +329,7 @@ bool KoBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) return true; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_page->view) && ev->type() == TQEvent::MouseButtonPress) { + if (o == m_page->view && ev->type() == TQEvent::MouseButtonPress) { TQMouseEvent* me = (TQMouseEvent*)ev; TQPoint thumbnailPos = viewToThumbnail(me->pos()); @@ -341,7 +341,7 @@ bool KoBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) return true; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_page->view) && ev->type() == TQEvent::MouseButtonRelease) { + if (o == m_page->view && ev->type() == TQEvent::MouseButtonRelease) { TQMouseEvent* me = (TQMouseEvent*)ev; diff --git a/karbon/widgets/vcolorslider.cpp b/karbon/widgets/vcolorslider.cpp index d2d0a0ab5..15961ccaa 100644 --- a/karbon/widgets/vcolorslider.cpp +++ b/karbon/widgets/vcolorslider.cpp @@ -135,7 +135,7 @@ void VColorSlider::updateFrom_gradientSelect( int value ) bool VColorSlider::eventFilter( TQObject *obj, TQEvent *ev ) { - if( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_gradientSelect) ) + if( obj == m_gradientSelect ) { if ( ev->type() == TQEvent::MouseButtonPress ) m_isDragging = true; diff --git a/kchart/kchartDataEditor.cpp b/kchart/kchartDataEditor.cpp index 8f08dd78b..544c41cba 100644 --- a/kchart/kchartDataEditor.cpp +++ b/kchart/kchartDataEditor.cpp @@ -73,7 +73,7 @@ void kchartDataSpinBox::stepDown() bool kchartDataSpinBox::eventFilter( TQObject *obj, TQEvent *ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(editor()) ) { + if ( obj == editor() ) { if ( ev->type() == TQEvent::FocusOut ) { //kdDebug() << "Focus out" << endl; setValue(editor()->text().toInt()); diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 550cfe7cc..20eae6c41 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -112,7 +112,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a if (!d) return; //sanity TQWidget *fw = d->mainWin->focusWidget(); - while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw)) + while (fw && obj!=fw) fw = fw->parentWidget(); if (!fw) return; diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index 4ea7f97ee..89269b146 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -267,7 +267,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) if(!tree || !tree->widget()) return true; - if(m_form->formWidget() && (TQT_BASE_OBJECT(tree->widget()) != TQT_BASE_OBJECT(s))) + if(m_form->formWidget() && (tree->widget() != s)) m_form->formWidget()->highlightWidgets(tree->widget(), TQT_TQWIDGET(s)); } else if(m_insertBegin!=TQPoint(-1,-1) && s == m_container && !m_toplevel && (mev->state() != ControlButton) && !FormManager::self()->isCreatingConnection()) // draw the selection rect diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index b0005dd93..543729919 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -868,7 +868,7 @@ void ContainerFactory::renameTabPage() void ContainerFactory::reorderTabs(int oldpos, int newpos) { KFormDesigner::ObjectTreeItem *tab - = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(TQT_TQOBJECT(const_cast(sender()))->name()); + = KFormDesigner::FormManager::self()->activeForm()->objectTree()->lookup(sender()->name()); if(!tab) return; diff --git a/kexi/formeditor/utils.h b/kexi/formeditor/utils.h index a8312f79e..d42a891f5 100644 --- a/kexi/formeditor/utils.h +++ b/kexi/formeditor/utils.h @@ -37,7 +37,7 @@ class Form; If the parent is found, \a prevPrev is set to a child of child of the parent, what for TabWidget means the page widget. */ template -type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className, TQObject* &prevPrev) +type* findParent(TQObject* o, const char* className, TQObject* &prevPrev) { if (!o || !className || className[0]=='\0') return 0; diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h index acb3cf075..e244f02ee 100644 --- a/kexi/kexiutils/utils.h +++ b/kexi/kexiutils/utils.h @@ -42,7 +42,7 @@ namespace KexiUtils //! \return parent object of \a o that inherits \a className or NULL if no such parent template - inline type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className) + inline type* findParent(TQObject* o, const char* className) { if (!o || !className || className[0]=='\0') return 0; @@ -67,12 +67,12 @@ namespace KexiUtils If objName is 0 (the default), all object names match. Returned pointer type is casted. */ template - type* findFirstChild(TQT_BASE_OBJECT_NAME *o, const char* className, const char* objName = 0) + type* findFirstChild(TQObject *o, const char* className, const char* objName = 0) { if (!o || !className || className[0]=='\0') return 0; TQObjectList *l = TQT_TQOBJECT(o)->queryList( className, objName ); - TQT_BASE_OBJECT_NAME *result = l->first(); + TQObject *result = l->first(); delete l; return static_cast(result); } diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 38b5fd1ee..a30f2695b 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -313,9 +313,9 @@ void KexiNewProjectWizard::accept() { if (m_prjtype_sel->lv_types->currentItem()==d->lvi_file) {//FILE: //check if new db file name is ok - kdDebug() << "********** TQT_TQOBJECT(const_cast(sender())) " << TQT_TQOBJECT(const_cast(sender()))->className() << endl; + kdDebug() << "********** sender() " << sender()->className() << endl; if (sender()==finishButton()) { /*(only if signal does not come from filedialog)*/ - kdDebug() << "********** TQT_TQOBJECT(const_cast(sender()))==finishButton() ********" << endl; + kdDebug() << "********** sender()==finishButton() ********" << endl; // if (!m_conn_sel->m_fileDlg->checkURL()) { if (!m_conn_sel->m_fileDlg->checkFileName()) { return; diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index f4056728c..52272fc7c 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 c7a378df8..e315e752c 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 980e384db..4669fa406 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 fb9636003..e8b7aa939 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 cf6604779..29e404b6f 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 c9f9e1c5f..5e076cb45 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(); } } diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 3e16cddca..99deccf63 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -553,16 +553,16 @@ void KexiBrowser::installEventFilter ( const TQObject * filterObj ) { if (!filterObj) return; - m_list->installEventFilter ( const_cast(filterObj) ); - TQWidget::installEventFilter ( const_cast(filterObj) ); + m_list->installEventFilter ( filterObj ); + TQWidget::installEventFilter ( filterObj ); } bool KexiBrowser::eventFilter ( TQObject *o, TQEvent * e ) { - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_list) && e->type()==TQEvent::Resize) { + if (o==m_list && e->type()==TQEvent::Resize) { kdDebug() << "resize!" << endl; } - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_list->renameLineEdit())) { + if (o==m_list->renameLineEdit()) { if (e->type()==TQEvent::Hide) itemRenameDone(); } diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index f36dfe479..2a3003ab2 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -101,7 +101,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip, bool KexiSectionHeader::eventFilter( TQObject *o, TQEvent *e ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->lbl) && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) { + if (o == d->lbl && e->type()==TQEvent::MouseButtonRelease) {//|| e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) { if (d->lyr->view) d->lyr->view->setFocus(); // if (KexiUtils::hasParent( this, static_cast(o))) { diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index b1ad05fcf..94d813480 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -221,13 +221,13 @@ KexiRelationWidget::addTable(const TQString& t) void KexiRelationWidget::tableViewGotFocus() { -// if (m_relationView->focusedTableView == TQT_TQOBJECT(const_cast(sender()))) +// if (m_relationView->focusedTableView == sender()) // return; // kdDebug() << "GOT FOCUS!" <unsetFocus(); -// m_focusedTableView = (KexiRelationViewTableContainer*)TQT_TQOBJECT(const_cast(sender())); +// m_focusedTableView = (KexiRelationViewTableContainer*)sender(); invalidateActions(); } @@ -339,9 +339,9 @@ void KexiRelationWidget::aboutToShowPopupMenu() void KexiRelationWidget::slotTableFieldDoubleClicked(TQListViewItem *i,const TQPoint&,int) { - if (!TQT_TQOBJECT(const_cast(sender()))->isA("KexiRelationViewTable")) + if (!sender()->isA("KexiRelationViewTable")) return; - const KexiRelationViewTable* t = static_cast(TQT_TQWIDGET(const_cast(sender()))); + const KexiRelationViewTable* t = static_cast(sender()); const TQStringList selectedFieldNames( t->selectedFieldNames() ); if (selectedFieldNames.count()==1) emit tableFieldDoubleClicked( t->schema()->table(), selectedFieldNames.first() ); diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index df2816fef..0c153c75f 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -455,7 +455,7 @@ void KexiBlobTableEdit::handleAction(const TQString& actionName) bool KexiBlobTableEdit::eventFilter( TQObject *o, TQEvent *e ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->popup) && e->type()==TQEvent::KeyPress) { + if (o == d->popup && e->type()==TQEvent::KeyPress) { TQKeyEvent* ke = TQT_TQKEYEVENT(e); const int state = ke->state(); const int k = ke->key(); diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp index 9ecae92f7..8a0e678a3 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.cpp +++ b/kexi/widget/tableview/kexicomboboxpopup.cpp @@ -343,13 +343,13 @@ void KexiComboBoxPopup::slotTVItemAccepted(KexiTableItem *item, int row, int) bool KexiComboBoxPopup::eventFilter( TQObject *o, TQEvent *e ) { - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(this) && e->type()==TQEvent::Hide) { + if (o==this && e->type()==TQEvent::Hide) { emit hidden(); } else if (e->type()==TQEvent::MouseButtonPress) { kdDebug() << "TQEvent::MousePress" << endl; } - else if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(d->tv)) { + else if (o==d->tv) { if (e->type()==TQEvent::KeyPress) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); const int k = ke->key(); diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 308e565e1..3c08b265d 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -352,7 +352,7 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e ) + TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button)); TQRect r(d->button->mapToGlobal(d->button->geometry().topLeft()), d->button->mapToGlobal(d->button->geometry().bottomRight())); - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) { + if (o==popup() && popup()->isVisible() && r.contains( gp )) { m_mouseBtnPressedWhenPopupVisible = true; } } diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp index 3305fff18..943ec1e89 100644 --- a/kexi/widget/tableview/kexitableedit.cpp +++ b/kexi/widget/tableview/kexitableedit.cpp @@ -120,7 +120,7 @@ KexiTableEdit::eventFilter(TQObject* watched, TQEvent* e) } }*/ - if(TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(this)) + if(watched == this) { if(e->type() == TQEvent::KeyPress) { diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index c1405c1d3..ab76fa955 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -1264,7 +1264,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e) TQWidget *w = focusWidget(); // if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view() && w!=m_editor)) { // if (!w || w!=viewport() && w!=this && (!m_editor || w!=m_editor->view())) { - if (!w || TQT_BASE_OBJECT(w)!=TQT_BASE_OBJECT(viewport()) && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast(m_editor)), TQT_TQOBJECT(w)))) { + if (!w || w!=viewport() && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast(m_editor)), TQT_TQOBJECT(w)))) { //don't process stranger's events e->ignore(); return; @@ -2422,7 +2422,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) ke->accept(); return true; } - else if (m_editor && (o==dynamic_cast(m_editor) || TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_editor->widget()))) { + else if (m_editor && (o==dynamic_cast(m_editor) || o==m_editor->widget())) { if ( (k==TQt::Key_Tab && (s==Qt::NoButton || s==TQt::ShiftButton)) || (overrideEditorShortcutNeeded(ke)) || (k==TQt::Key_Enter || k==TQt::Key_Return || k==TQt::Key_Up || k==TQt::Key_Down) @@ -2450,14 +2450,14 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) }*/ } } - else if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(horizontalScrollBar())) { + else if (o==horizontalScrollBar()) { if ((e->type()==TQEvent::Show && !horizontalScrollBar()->isVisible()) || (e->type()==TQEvent::Hide && horizontalScrollBar()->isVisible())) { updateWidgetContentsSize(); } } else if (e->type()==TQEvent::Leave) { - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(viewport()) && d->appearance.rowMouseOverHighlightingEnabled + if (o==viewport() && d->appearance.rowMouseOverHighlightingEnabled && d->appearance.persistentSelections) { if (d->highlightedRow!=-1) { diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index 92f53c606..f009bd435 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -179,7 +179,7 @@ void KexiGradientWidget::rebuildCache( void ) { Get the part of the tempPixmap that is under the current child-widget. */ - if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) { + if ( childWidget->parent() == this ) { area = childWidget->geometry(); } else { area.setTopLeft( childWidget->mapTo( this, @@ -222,7 +222,7 @@ bool KexiGradientWidget::eventFilter( TQObject* object, TQEvent* event ) { /** Manage list of child-widgets. */ - if ( TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(this) ) { + if ( object == this ) { if ( event->type() == TQEvent::ChildInserted ) { child = dynamic_cast( dynamic_cast( event )->child() ); if ( isValidChildWidget( TQT_TQOBJECT(child) ) == false ) { @@ -329,7 +329,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget ) Get the part of the tempPixmap that is under the current child-widget. */ - if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) { + if ( childWidget->parent() == this ) { area = childWidget->geometry(); } else { area.setTopLeft( childWidget->mapTo( this, diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 6579fc426..2c4ef8cfb 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -192,7 +192,7 @@ void KexiRecordNavigator::setEnabled( bool set ) bool KexiRecordNavigator::eventFilter( TQObject *o, TQEvent *e ) { - if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_navRecordNumber)) { + if (o==m_navRecordNumber) { bool recordEntered = false; bool ret; if (e->type()==TQEvent::KeyPress) { diff --git a/kivio/kiviopart/kivio_stackbar.cpp b/kivio/kiviopart/kivio_stackbar.cpp index 64fa96bfa..94b37ae39 100644 --- a/kivio/kiviopart/kivio_stackbar.cpp +++ b/kivio/kiviopart/kivio_stackbar.cpp @@ -45,7 +45,7 @@ KivioStackBar::~KivioStackBar() void KivioStackBar::insertPage( TQWidget* w, const TQString& title ) { - if (TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this)) { + if (w->parent() != this) { w->reparent(this,TQPoint(0,0)); } diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 0d5fc9d1d..ba1e9cd53 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -84,21 +84,21 @@ void KivioBirdEyePanel::slotUpdateView(KivioPage* page) bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Show) { + if (o == canvas && ev->type() == TQEvent::Show) { updateView(); } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Resize) { + if (o == canvas && ev->type() == TQEvent::Resize) { m_buffer->resize(canvas->size()); slotUpdateView(m_pView->activePage()); } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Paint) { + if (o == canvas && ev->type() == TQEvent::Paint) { updateView(); return true; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::MouseMove) { + if (o == canvas && ev->type() == TQEvent::MouseMove) { TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); if (me->state() == Qt::LeftButton) handleMouseMoveAction(me->pos()); @@ -109,7 +109,7 @@ bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) return true; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::MouseButtonPress) { + if (o == canvas && ev->type() == TQEvent::MouseButtonPress) { TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); if (me->button() == Qt::LeftButton) handleMousePress(me->pos()); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index 8e5d9fc49..f1cccd780 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -98,7 +98,7 @@ KivioLayerPanel::~KivioLayerPanel() bool KivioLayerPanel::eventFilter(TQObject* o, TQEvent* ev) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(list) && (ev->type() == TQEvent::LayoutHint || ev->type() == TQEvent::Resize)) { + if (o == list && (ev->type() == TQEvent::LayoutHint || ev->type() == TQEvent::Resize)) { int s = list->width() - 2*(list->margin() + list->lineWidth()); s -= list->header()->sectionSize(0); s -= list->header()->sectionSize(1); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index c581ddf45..67a2596f9 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -1856,7 +1856,7 @@ void KPrView::slotApplyFont() void KPrView::slotCounterStyleSelected() { - TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast(sender()))->name()); + TQString actionName = TQString::fromLatin1(sender()->name()); if ( actionName.startsWith( "counterstyle_" ) ) { TQString styleStr = actionName.mid(13); @@ -4912,7 +4912,7 @@ void KPrView::insertCustomVariable() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( edit ) { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(sender()); edit->insertCustomVariable(act->text()); } } @@ -4992,7 +4992,7 @@ void KPrView::insertVariable() KPrTextView *edit=m_canvas->currentTextObjectView(); if ( edit ) { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(sender()); VariableDefMap::ConstIterator it = m_variableDefMap.find( act ); if ( it == m_variableDefMap.end() ) kdWarning(33001) << "Action not found in m_variableDefMap." << endl; @@ -5522,7 +5522,7 @@ void KPrView::extraStylist() // Called when selecting a style in the Format / Style menu void KPrView::slotStyleSelected() { - TQString actionName = TQString::fromUtf8(TQT_TQOBJECT(const_cast(sender()))->name()); + TQString actionName = TQString::fromUtf8(sender()->name()); kdDebug(33001) << "KPrView::slotStyleSelected " << actionName << endl; textStyleSelected( m_pKPresenterDoc->styleCollection()->findStyle( actionName ) ); } @@ -6388,7 +6388,7 @@ TQPtrList KPrView::listOfResultOfCheckWord( const TQString &word ) void KPrView::slotCorrectWord() { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(sender()); KPrTextView* edit = m_canvas->currentTextObjectView(); if ( edit ) { @@ -6430,7 +6430,7 @@ void KPrView::initialLayoutOfSplitter() void KPrView::slotChildActivated(bool a) { - KoViewChild* ch = child( (KoView*)TQT_TQOBJECT(const_cast(sender())) ); + KoViewChild* ch = child( (KoView*)sender() ); if ( !ch ) return; diff --git a/kspread/dialogs/kspread_dlg_formula.cpp b/kspread/dialogs/kspread_dlg_formula.cpp index 8e53c5254..89406321a 100644 --- a/kspread/dialogs/kspread_dlg_formula.cpp +++ b/kspread/dialogs/kspread_dlg_formula.cpp @@ -271,15 +271,15 @@ void FormulaDialog::slotSearchText(const TQString &_text) bool FormulaDialog::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(firstElement) && ev->type() == TQEvent::FocusIn ) + if ( obj == firstElement && ev->type() == TQEvent::FocusIn ) m_focus = firstElement; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(secondElement) && ev->type() == TQEvent::FocusIn ) + else if ( obj == secondElement && ev->type() == TQEvent::FocusIn ) m_focus = secondElement; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(thirdElement) && ev->type() == TQEvent::FocusIn ) + else if ( obj == thirdElement && ev->type() == TQEvent::FocusIn ) m_focus = thirdElement; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(fourElement) && ev->type() == TQEvent::FocusIn ) + else if ( obj == fourElement && ev->type() == TQEvent::FocusIn ) m_focus = fourElement; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(fiveElement) && ev->type() == TQEvent::FocusIn ) + else if ( obj == fiveElement && ev->type() == TQEvent::FocusIn ) m_focus = fiveElement; else return FALSE; diff --git a/kspread/dialogs/kspread_dlg_goalseek.cpp b/kspread/dialogs/kspread_dlg_goalseek.cpp index b45525ad2..1a2e5d599 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cpp +++ b/kspread/dialogs/kspread_dlg_goalseek.cpp @@ -197,11 +197,11 @@ GoalSeekDialog::~GoalSeekDialog() bool GoalSeekDialog::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_targetValueEdit) && ev->type() == TQEvent::FocusIn ) + if ( obj == m_targetValueEdit && ev->type() == TQEvent::FocusIn ) m_focus = m_targetValueEdit; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_targetEdit) && ev->type() == TQEvent::FocusIn ) + else if ( obj == m_targetEdit && ev->type() == TQEvent::FocusIn ) m_focus = m_targetEdit; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_sourceEdit) && ev->type() == TQEvent::FocusIn ) + else if ( obj == m_sourceEdit && ev->type() == TQEvent::FocusIn ) m_focus = m_sourceEdit; else return FALSE; diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cpp b/kspread/dialogs/kspread_dlg_paperlayout.cpp index 3305963e2..bdd65a268 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cpp +++ b/kspread/dialogs/kspread_dlg_paperlayout.cpp @@ -538,11 +538,11 @@ void PaperLayout::slotCancel() bool PaperLayout::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(ePrintRange) && ev->type() == TQEvent::FocusIn ) + if ( obj == ePrintRange && ev->type() == TQEvent::FocusIn ) m_focus = ePrintRange; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(eRepeatCols) && ev->type() == TQEvent::FocusIn ) + else if ( obj == eRepeatCols && ev->type() == TQEvent::FocusIn ) m_focus = eRepeatCols; - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(eRepeatRows) && ev->type() == TQEvent::FocusIn ) + else if ( obj == eRepeatRows && ev->type() == TQEvent::FocusIn ) m_focus = eRepeatRows; else return false; diff --git a/kspread/kspread_editors.cpp b/kspread/kspread_editors.cpp index 4af76159e..add8d217f 100644 --- a/kspread/kspread_editors.cpp +++ b/kspread/kspread_editors.cpp @@ -378,7 +378,7 @@ void FunctionCompletion::itemSelected( const TQString& item ) bool FunctionCompletion::eventFilter( TQObject *obj, TQEvent *ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->completionPopup) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->completionListBox) ) + if ( obj == d->completionPopup || obj == d->completionListBox ) { if ( ev->type() == TQEvent::KeyPress ) { @@ -1166,7 +1166,7 @@ void CellEditor::setCursorPosition( int pos ) bool CellEditor::eventFilter( TQObject* o, TQEvent* e ) { // Only interested in KTextEdit - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(d->textEdit) ) + if ( o != d->textEdit ) return false; if ( e->type() == TQEvent::FocusOut ) { diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index f054cbba9..5561bb737 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -480,32 +480,32 @@ void View::Private::initActions() actions->bold = new TDEToggleAction( i18n("Bold"), "format-text-bold", TQt::CTRL+TQt::Key_B, ac, "bold"); - TQT_BASE_OBJECT_NAME::connect( actions->bold, TQT_SIGNAL( toggled( bool) ), + TQObject::connect( actions->bold, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( bold( bool ) ) ); actions->italic = new TDEToggleAction( i18n("Italic"), "format-text-italic", TQt::CTRL+TQt::Key_I, ac, "italic"); - TQT_BASE_OBJECT_NAME::connect( actions->italic, TQT_SIGNAL( toggled( bool) ), + TQObject::connect( actions->italic, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( italic( bool ) ) ); actions->underline = new TDEToggleAction( i18n("Underline"), "format-text-underline", TQt::CTRL+TQt::Key_U, ac, "underline"); - TQT_BASE_OBJECT_NAME::connect( actions->underline, TQT_SIGNAL( toggled( bool) ), + TQObject::connect( actions->underline, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( underline( bool ) ) ); actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", 0, ac, "strikeout"); - TQT_BASE_OBJECT_NAME::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), + TQObject::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), TQT_TQOBJECT(view), TQT_SLOT( strikeOut( bool ) ) ); actions->selectFont = new TDEFontAction( i18n("Select Font..."), 0, ac, "selectFont" ); - TQT_BASE_OBJECT_NAME::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), + TQObject::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), TQT_TQOBJECT(view), TQT_SLOT( fontSelected( const TQString& ) ) ); actions->selectFontSize = new TDEFontSizeAction( i18n("Select Font Size"), 0, ac, "selectFontSize" ); - TQT_BASE_OBJECT_NAME::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), + TQObject::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_TQOBJECT(view), TQT_SLOT( fontSizeSelected( int ) ) ); actions->fontSizeUp = new TDEAction( i18n("Increase Font Size"), "fontsizeup", @@ -521,55 +521,55 @@ void View::Private::initActions() actions->alignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", 0, ac, "left"); - TQT_BASE_OBJECT_NAME::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignLeft( bool ) ) ); actions->alignLeft->setExclusiveGroup( "Align" ); actions->alignLeft->setToolTip(i18n("Left justify the cell contents.")); actions->alignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", 0, ac, "center"); - TQT_BASE_OBJECT_NAME::connect( actions->alignCenter, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignCenter, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignCenter( bool ) ) ); actions->alignCenter->setExclusiveGroup( "Align" ); actions->alignCenter->setToolTip(i18n("Center the cell contents.")); actions->alignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", 0, ac, "right"); - TQT_BASE_OBJECT_NAME::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignRight( bool ) ) ); actions->alignRight->setExclusiveGroup( "Align" ); actions->alignRight->setToolTip(i18n("Right justify the cell contents.")); actions->alignTop = new TDEToggleAction( i18n("Align Top"), "text_top", 0, ac, "top"); - TQT_BASE_OBJECT_NAME::connect( actions->alignTop, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignTop, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignTop( bool ) ) ); actions->alignTop->setExclusiveGroup( "Pos" ); actions->alignTop->setToolTip(i18n("Align cell contents along the top of the cell.")); actions->alignMiddle = new TDEToggleAction( i18n("Align Middle"), "middle", 0, ac, "middle"); - TQT_BASE_OBJECT_NAME::connect( actions->alignMiddle, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignMiddle, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignMiddle( bool ) ) ); actions->alignMiddle->setExclusiveGroup( "Pos" ); actions->alignMiddle->setToolTip(i18n("Align cell contents centered in the cell.")); actions->alignBottom = new TDEToggleAction( i18n("Align Bottom"), "text_bottom", 0, ac, "bottom"); - TQT_BASE_OBJECT_NAME::connect( actions->alignBottom, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->alignBottom, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( alignBottom( bool ) ) ); actions->alignBottom->setExclusiveGroup( "Pos" ); actions->alignBottom->setToolTip(i18n("Align cell contents along the bottom of the cell.")); actions->wrapText = new TDEToggleAction( i18n("Wrap Text"), "multirow", 0, ac, "multiRow" ); - TQT_BASE_OBJECT_NAME::connect( actions->wrapText, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->wrapText, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( wrapText( bool ) ) ); actions->wrapText->setToolTip(i18n("Make the cell text wrap onto multiple lines.")); actions->verticalText = new TDEToggleAction( i18n("Vertical Text"),"vertical_text" , 0 ,ac, "verticaltext" ); - TQT_BASE_OBJECT_NAME::connect( actions->verticalText, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->verticalText, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( verticalText( bool ) ) ); actions->verticalText->setToolTip(i18n("Print cell contents vertically.")); @@ -589,7 +589,7 @@ void View::Private::initActions() actions->percent = new TDEToggleAction( i18n("Percent Format"), "percent", 0, ac, "percent"); - TQT_BASE_OBJECT_NAME::connect( actions->percent, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->percent, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( percent( bool ) ) ); actions->percent->setToolTip(i18n("Set the cell formatting to look like a percentage.")); @@ -603,7 +603,7 @@ void View::Private::initActions() actions->money = new TDEToggleAction( i18n("Money Format"), "money", 0, ac, "money"); - TQT_BASE_OBJECT_NAME::connect( actions->money, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->money, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( moneyFormat( bool ) ) ); actions->money->setToolTip(i18n("Set the cell formatting to look like your local currency.")); @@ -621,7 +621,7 @@ void View::Private::initActions() actions->bgColor = new TTDESelectColorAction( i18n("Background Color"), TTDESelectColorAction::FillColor, ac, "backgroundColor", true ); - TQT_BASE_OBJECT_NAME::connect(actions->bgColor, TQT_SIGNAL( activated() ), + TQObject::connect(actions->bgColor, TQT_SIGNAL( activated() ), TQT_TQOBJECT(view), TQT_SLOT( changeBackgroundColor() ) ); actions->bgColor->setDefaultColor(TQColor()); actions->bgColor->setToolTip(i18n("Set the background color.")); @@ -656,14 +656,14 @@ void View::Private::initActions() actions->borderColor = new TTDESelectColorAction( i18n("Border Color"), TTDESelectColorAction::LineColor, ac, "borderColor" ); - TQT_BASE_OBJECT_NAME::connect( actions->borderColor, TQT_SIGNAL( activated() ), + TQObject::connect( actions->borderColor, TQT_SIGNAL( activated() ), TQT_TQOBJECT(view), TQT_SLOT( changeBorderColor() ) ); actions->borderColor->setToolTip( i18n( "Select a new border color." ) ); actions->selectStyle = new TDESelectAction( i18n( "St&yle" ), 0, ac, "stylemenu" ); actions->selectStyle->setToolTip( i18n( "Apply a predefined style to the selected cells." ) ); - TQT_BASE_OBJECT_NAME::connect( actions->selectStyle, TQT_SIGNAL( activated( const TQString & ) ), + TQObject::connect( actions->selectStyle, TQT_SIGNAL( activated( const TQString & ) ), TQT_TQOBJECT(view), TQT_SLOT( styleSelected( const TQString & ) ) ); actions->createStyle = new TDEAction( i18n( "Create Style From Cell..." ), @@ -924,7 +924,7 @@ void View::Private::initActions() actions->showPageBorders = new TDEToggleAction( i18n("Show Page Borders"), 0, ac, "showPageBorders"); actions->showPageBorders->setCheckedState(i18n("Hide Page Borders")); - TQT_BASE_OBJECT_NAME::connect( actions->showPageBorders, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->showPageBorders, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( togglePageBorders( bool ) ) ); actions->showPageBorders->setToolTip( i18n( "Show on the spreadsheet where the page borders will be." ) ); @@ -939,13 +939,13 @@ void View::Private::initActions() actions->protectSheet = new TDEToggleAction( i18n( "Protect &Sheet..." ), 0, ac, "protectSheet" ); actions->protectSheet->setToolTip( i18n( "Protect the sheet from being modified." ) ); - TQT_BASE_OBJECT_NAME::connect( actions->protectSheet, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->protectSheet, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( toggleProtectSheet( bool ) ) ); actions->protectDoc = new TDEToggleAction( i18n( "Protect &Document..." ), 0, ac, "protectDoc" ); actions->protectDoc->setToolTip( i18n( "Protect the document from being modified." ) ); - TQT_BASE_OBJECT_NAME::connect( actions->protectDoc, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->protectDoc, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( toggleProtectDoc( bool ) ) ); // -- editing actions -- @@ -1013,11 +1013,11 @@ void View::Private::initActions() ((TDESelectAction*) actions->formulaSelection)->setItems( lst ); actions->formulaSelection->setComboWidth( 80 ); actions->formulaSelection->setCurrentItem(0); - TQT_BASE_OBJECT_NAME::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), + TQObject::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), TQT_TQOBJECT(view), TQT_SLOT( formulaSelection( const TQString& ) ) ); actions->viewZoom = new KoZoomAction( i18n( "Zoom" ), "viewmag", 0, ac, "view_zoom" ); - TQT_BASE_OBJECT_NAME::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), + TQObject::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), TQT_TQOBJECT(view), TQT_SLOT( viewZoom( const TQString & ) ) ); actions->consolidate = new TDEAction( i18n("&Consolidate..."), @@ -1074,21 +1074,21 @@ void View::Private::initActions() actions->showStatusBar = new TDEToggleAction( i18n("Show Status Bar"), 0, ac, "showStatusBar" ); actions->showStatusBar->setCheckedState(i18n("Hide Status Bar")); - TQT_BASE_OBJECT_NAME::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( showStatusBar( bool ) ) ); actions->showStatusBar->setToolTip(i18n("Show the status bar.")); actions->showTabBar = new TDEToggleAction( i18n("Show Tab Bar"), 0, ac, "showTabBar" ); actions->showTabBar->setCheckedState(i18n("Hide Tab Bar")); - TQT_BASE_OBJECT_NAME::connect( actions->showTabBar, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->showTabBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( showTabBar( bool ) ) ); actions->showTabBar->setToolTip(i18n("Show the tab bar.")); actions->showFormulaBar = new TDEToggleAction( i18n("Show Formula Bar"), 0, ac, "showFormulaBar" ); actions->showFormulaBar->setCheckedState(i18n("Hide Formula Bar")); - TQT_BASE_OBJECT_NAME::connect( actions->showFormulaBar, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->showFormulaBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( showFormulaBar( bool ) ) ); actions->showFormulaBar->setToolTip(i18n("Show the formula bar.")); @@ -1099,43 +1099,43 @@ void View::Private::initActions() // -- running calculation actions -- actions->calcNone = new TDEToggleAction( i18n("None"), 0, ac, "menu_none"); - TQT_BASE_OBJECT_NAME::connect( actions->calcNone, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcNone, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcNone->setExclusiveGroup( "Calc" ); actions->calcNone->setToolTip(i18n("No calculation")); actions->calcSum = new TDEToggleAction( i18n("Sum"), 0, ac, "menu_sum"); - TQT_BASE_OBJECT_NAME::connect( actions->calcSum, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcSum, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcSum->setExclusiveGroup( "Calc" ); actions->calcSum->setToolTip(i18n("Calculate using sum.")); actions->calcMin = new TDEToggleAction( i18n("Min"), 0, ac, "menu_min"); - TQT_BASE_OBJECT_NAME::connect( actions->calcMin, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcMin, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcMin->setExclusiveGroup( "Calc" ); actions->calcMin->setToolTip(i18n("Calculate using minimum.")); actions->calcMax = new TDEToggleAction( i18n("Max"), 0, ac, "menu_max"); - TQT_BASE_OBJECT_NAME::connect( actions->calcMax, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcMax, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcMax->setExclusiveGroup( "Calc" ); actions->calcMax->setToolTip(i18n("Calculate using maximum.")); actions->calcAverage = new TDEToggleAction( i18n("Average"), 0, ac, "menu_average"); - TQT_BASE_OBJECT_NAME::connect( actions->calcAverage, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcAverage, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcAverage->setExclusiveGroup( "Calc" ); actions->calcAverage->setToolTip(i18n("Calculate using average.")); actions->calcCount = new TDEToggleAction( i18n("Count"), 0, ac, "menu_count"); - TQT_BASE_OBJECT_NAME::connect( actions->calcCount, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcCount, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcCount->setExclusiveGroup( "Calc" ); actions->calcCount->setToolTip(i18n("Calculate using the count.")); actions->calcCountA = new TDEToggleAction( i18n("CountA"), 0, ac, "menu_counta"); - TQT_BASE_OBJECT_NAME::connect( actions->calcCountA, TQT_SIGNAL( toggled( bool ) ), + TQObject::connect( actions->calcCountA, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(view), TQT_SLOT( menuCalc( bool ) ) ); actions->calcCountA->setExclusiveGroup( "Calc" ); actions->calcCountA->setToolTip(i18n("Calculate using the countA.")); @@ -1823,17 +1823,17 @@ View::View( TQWidget *_parent, const char *_name, connect( d->canvas, TQT_SIGNAL( objectSelectedChanged() ), this, TQT_SLOT( objectSelectedChanged() ) ); - TQT_BASE_OBJECT_NAME::connect( doc()->map(), TQT_SIGNAL( sig_addSheet( Sheet* ) ), TQT_SLOT( slotAddSheet( Sheet* ) ) ); + TQObject::connect( doc()->map(), TQT_SIGNAL( sig_addSheet( Sheet* ) ), TQT_SLOT( slotAddSheet( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( sig_refreshView( ) ), this, TQT_SLOT( slotRefreshView() ) ); + TQObject::connect( doc(), TQT_SIGNAL( sig_refreshView( ) ), this, TQT_SLOT( slotRefreshView() ) ); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( sig_refreshLocale() ), this, TQT_SLOT( refreshLocale())); + TQObject::connect( doc(), TQT_SIGNAL( sig_refreshLocale() ), this, TQT_SLOT( refreshLocale())); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( sig_addAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotAddAreaName( const TQString & ) ) ); + TQObject::connect( doc(), TQT_SIGNAL( sig_addAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotAddAreaName( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( sig_removeAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotRemoveAreaName( const TQString & ) ) ); + TQObject::connect( doc(), TQT_SIGNAL( sig_removeAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotRemoveAreaName( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( doc(), TQT_SIGNAL( damagesFlushed( const TQValueList& ) ), + TQObject::connect( doc(), TQT_SIGNAL( damagesFlushed( const TQValueList& ) ), this, TQT_SLOT( handleDamages( const TQValueList& ) ) ); //KoView::setZoom( doc()->zoomedResolutionY() /* KoView only supports one zoom */ ); // initial value @@ -1989,12 +1989,12 @@ void View::initView() d->horzScrollBar->setLineStep(60); //just random guess based on what feels okay d->horzScrollBar->setPageStep(60); - TQT_BASE_OBJECT_NAME::connect( d->tabBar, TQT_SIGNAL( tabChanged( const TQString& ) ), this, TQT_SLOT( changeSheet( const TQString& ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->tabBar, TQT_SIGNAL( tabMoved( unsigned, unsigned ) ), + TQObject::connect( d->tabBar, TQT_SIGNAL( tabChanged( const TQString& ) ), this, TQT_SLOT( changeSheet( const TQString& ) ) ); + TQObject::connect( d->tabBar, TQT_SIGNAL( tabMoved( unsigned, unsigned ) ), this, TQT_SLOT( moveSheet( unsigned, unsigned ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->tabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ), + TQObject::connect( d->tabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ), this, TQT_SLOT( popupTabBarMenu( const TQPoint& ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->tabBar, TQT_SIGNAL( doubleClicked() ), + TQObject::connect( d->tabBar, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( slotRename() ) ); d->viewLayout->setColStretch( 1, 10 ); @@ -2014,8 +2014,8 @@ void View::initView() connect(d->calcLabel ,TQT_SIGNAL(itemPressed( int )),this,TQT_SLOT(statusBarClicked(int))); // signal slot - TQT_BASE_OBJECT_NAME::connect( d->vertScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollVert(int) ) ); - TQT_BASE_OBJECT_NAME::connect( d->horzScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollHorz(int) ) ); + TQObject::connect( d->vertScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollVert(int) ) ); + TQObject::connect( d->horzScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollHorz(int) ) ); } @@ -2303,26 +2303,26 @@ void View::startKSpell() d->spell.tdespell->setIgnoreUpperWords( doc()->dontCheckUpperWord() ); d->spell.tdespell->setIgnoreTitleCase( doc()->dontCheckTitleCase() ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( death() ), + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( death() ), this, TQT_SLOT( spellCheckerFinished() ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( misspelling( const TQString &, + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int) ), this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( corrected( const TQString &, + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int) ), this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( done( const TQString & ) ), + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( spellCheckerDone( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( ignoreall (const TQString & ) ), + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( ignoreall (const TQString & ) ), this, TQT_SLOT( spellCheckerIgnoreAll( const TQString & ) ) ); - TQT_BASE_OBJECT_NAME::connect( d->spell.tdespell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); + TQObject::connect( d->spell.tdespell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); } @@ -3726,31 +3726,31 @@ void View::addSheet( Sheet * _t ) insertSheet( _t ); // Connect some signals - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_refreshView() ), TQT_SLOT( slotRefreshView() ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t->print(), TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateView( Sheet *, const Region& ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_refreshView() ), TQT_SLOT( slotRefreshView() ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); + TQObject::connect( _t->print(), TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_updateView( Sheet *, const Region& ) ), TQT_SLOT( slotUpdateView( Sheet*, const Region& ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateView( EmbeddedObject* )), TQT_SLOT( slotUpdateView( EmbeddedObject* ) ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_updateView( EmbeddedObject* )), TQT_SLOT( slotUpdateView( EmbeddedObject* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateHBorder( Sheet * ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_updateHBorder( Sheet * ) ), TQT_SLOT( slotUpdateHBorder( Sheet * ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateVBorder( Sheet * ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_updateVBorder( Sheet * ) ), TQT_SLOT( slotUpdateVBorder( Sheet * ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_nameChanged( Sheet*, const TQString& ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_nameChanged( Sheet*, const TQString& ) ), this, TQT_SLOT( slotSheetRenamed( Sheet*, const TQString& ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_SheetHidden( Sheet* ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_SheetHidden( Sheet* ) ), this, TQT_SLOT( slotSheetHidden( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_SheetShown( Sheet* ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_SheetShown( Sheet* ) ), this, TQT_SLOT( slotSheetShown( Sheet* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_SheetRemoved( Sheet* ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_SheetRemoved( Sheet* ) ), this, TQT_SLOT( slotSheetRemoved( Sheet* ) ) ); // ########### Why do these signals not send a pointer to the sheet? // This will lead to bugs. - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_updateChildGeometry( EmbeddedKOfficeObject* ) ), + TQObject::connect( _t, TQT_SIGNAL( sig_updateChildGeometry( EmbeddedKOfficeObject* ) ), TQT_SLOT( slotUpdateChildGeometry( EmbeddedKOfficeObject* ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_maxColumn( int ) ), d->canvas, TQT_SLOT( slotMaxColumn( int ) ) ); - TQT_BASE_OBJECT_NAME::connect( _t, TQT_SIGNAL( sig_maxRow( int ) ), d->canvas, TQT_SLOT( slotMaxRow( int ) ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_maxColumn( int ) ), d->canvas, TQT_SLOT( slotMaxColumn( int ) ) ); + TQObject::connect( _t, TQT_SIGNAL( sig_maxRow( int ) ), d->canvas, TQT_SLOT( slotMaxRow( int ) ) ); if ( !d->loading ) updateBorderButton(); @@ -5709,7 +5709,7 @@ void View::popupColumnMenu( const TQPoint & _point ) } } - TQT_BASE_OBJECT_NAME::connect( d->popupColumn, TQT_SIGNAL(activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupColumn, TQT_SIGNAL(activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); d->popupColumn->popup( _point ); } @@ -5804,7 +5804,7 @@ void View::popupRowMenu( const TQPoint & _point ) } } - TQT_BASE_OBJECT_NAME::connect( d->popupRow, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupRow, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); d->popupRow->popup( _point ); } @@ -5896,7 +5896,7 @@ void View::slotListChoosePopupMenu( ) } d->popupListChoose->popup( p2 ); - TQT_BASE_OBJECT_NAME::connect( d->popupListChoose, TQT_SIGNAL( activated( int ) ), + TQObject::connect( d->popupListChoose, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotItemSelected( int ) ) ); } @@ -6032,7 +6032,7 @@ void View::openPopupMenu( const TQPoint & _point ) } } - TQT_BASE_OBJECT_NAME::connect( d->popupMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); } } diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 11e23e271..044801ae7 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -1699,9 +1699,9 @@ void KWCanvas::updateRulerOffsets( int cx, int cy ) bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { + if ( o == this || o == viewport() ) { - if(m_currentFrameSetEdit && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if(m_currentFrameSetEdit && o == this ) { // Pass event to auto-hide-cursor code (see kcursor.h for details) KCursor::autoHideEventFilter( o, e ); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 74a49cfa2..7d5bbf7f4 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -1512,7 +1512,7 @@ void KWView::insertExpression() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(sender()); edit->insertExpression(act->text()); } } @@ -1611,7 +1611,7 @@ void KWView::insertCustomVariable() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(sender()); edit->insertCustomVariable(act->text()); } } @@ -2245,7 +2245,7 @@ void KWView::updateStyleList() // Called when selecting a style in the Format / Style menu void KWView::slotStyleSelected() { - TQString actionName = TQString::fromUtf8(TQT_TQOBJECT(const_cast(sender()))->name()); + TQString actionName = TQString::fromUtf8(sender()->name()); const TQString prefix = PARAGSTYLE_ACTION_PREFIX; if ( actionName.startsWith( prefix ) ) { actionName = actionName.mid( prefix.length() ); @@ -3580,7 +3580,7 @@ void KWView::insertVariable() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(sender()); VariableDefMap::Iterator it = m_variableDefMap.find( act ); if ( it == m_variableDefMap.end() ) kdWarning() << "Action not found in m_variableDefMap." << endl; @@ -4532,7 +4532,7 @@ void KWView::textStyleSelected( int index ) // Slot is called when selecting a framestyle in the Frames / Framestyle menu void KWView::slotFrameStyleSelected() { - TQString actionName = TQString::fromUtf8(TQT_TQOBJECT(const_cast(sender()))->name()); + TQString actionName = TQString::fromUtf8(sender()->name()); const TQString prefix = FRAMESTYLE_ACTION_PREFIX; if ( actionName.startsWith( prefix ) ) { actionName = actionName.mid( prefix.length() ); @@ -4601,7 +4601,7 @@ void KWView::frameStyleSelected( KWFrameStyle *sty ) // Called when selecting a tablestyle in the Table / Tablestyle menu void KWView::slotTableStyleSelected() { - TQString actionName = TQString::fromUtf8(TQT_TQOBJECT(const_cast(sender()))->name()); + TQString actionName = TQString::fromUtf8(sender()->name()); const TQString prefix = TABLESTYLE_ACTION_PREFIX; if ( actionName.startsWith( prefix ) ) { actionName = actionName.mid( prefix.length() ); @@ -5021,7 +5021,7 @@ void KWView::textSpacingDouble() void KWView::slotCounterStyleSelected() { - TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast(sender()))->name()); + TQString actionName = TQString::fromLatin1(sender()->name()); TQString styleStr = actionName.mid(13); //kdDebug() << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl; KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt()); @@ -7460,7 +7460,7 @@ TQPtrList KWView::listOfResultOfCheckWord( const TQString &word ) void KWView::slotCorrectWord() { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast(sender()))); + TDEAction * act = (TDEAction *)(sender()); KWTextFrameSetEdit* edit = currentTextEdit(); if ( edit ) { @@ -7472,7 +7472,7 @@ void KWView::slotCorrectWord() void KWView::slotChildActivated( bool a ) { // Same hack as in KoView - KoViewChild* ch = child( (KoView*)TQT_TQOBJECT(const_cast(sender())) ); + KoViewChild* ch = child( (KoView*)sender() ); if ( !ch ) return; KWDocumentChild* kwchild = static_cast( ch->documentChild() ); diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 0d2185321..03a70b5b9 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -226,13 +226,13 @@ void KoTemplatesPane::changeAlwaysUseTemplate(KoTemplatesPane* sender, const TQS bool KoTemplatesPane::eventFilter(TQObject* watched, TQEvent* e) { - if(TQT_BASE_OBJECT(watched) == m_previewLabel) { + if(watched == m_previewLabel) { if(e->type() == TQEvent::MouseButtonDblClick) { openTemplate(); } } - if(TQT_BASE_OBJECT(watched) == m_documentList) { + if(watched == m_documentList) { if((e->type() == TQEvent::Resize) && isShown()) { emit splitterResized(this, m_splitter->sizes()); } @@ -444,13 +444,13 @@ void KoRecentDocumentsPane::changePalette() bool KoRecentDocumentsPane::eventFilter(TQObject* watched, TQEvent* e) { - if(TQT_BASE_OBJECT(watched) == m_previewLabel) { + if(watched == m_previewLabel) { if(e->type() == TQEvent::MouseButtonDblClick) { openFile(); } } - if(TQT_BASE_OBJECT(watched) == m_documentList) { + if(watched == m_documentList) { if((e->type() == TQEvent::Resize) && isShown()) { emit splitterResized(this, m_splitter->sizes()); } diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp index b1262ce58..114996c3e 100644 --- a/lib/kofficecore/KoFrame.cpp +++ b/lib/kofficecore/KoFrame.cpp @@ -362,7 +362,7 @@ void KoFrame::resizeEvent( TQResizeEvent* ) bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->m_view) && KParts::PartActivateEvent::test( ev ) ) + if ( obj == d->m_view && KParts::PartActivateEvent::test( ev ) ) { kdDebug(30003) << "Activate event"<< endl; KParts::PartActivateEvent* e = (KParts::PartActivateEvent*)ev; @@ -374,7 +374,7 @@ bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev ) setState( Inactive ); } } - else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->m_view) && KParts::PartSelectEvent::test( ev ) ) + else if ( obj == d->m_view && KParts::PartSelectEvent::test( ev ) ) { kdDebug(30003) << "Selected event" << endl; KParts::PartSelectEvent* e = (KParts::PartSelectEvent*)ev; diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 2dd15e955..36d5fbdc8 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -1315,7 +1315,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle ) { //kdDebug(30003) << "KoMainWindow::slotToolbarToggled " << sender()->name() << " toggle=" << true << endl; // The action (sender) and the toolbar have the same name - TDEToolBar * bar = toolBar( TQT_TQOBJECT(const_cast(sender()))->name() ); + TDEToolBar * bar = toolBar( sender()->name() ); if (bar) { if (toggle) @@ -1327,7 +1327,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle ) saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() ); } else - kdWarning(30003) << "slotToolbarToggled : Toolbar " << TQT_TQOBJECT(const_cast(sender()))->name() << " not found!" << endl; + kdWarning(30003) << "slotToolbarToggled : Toolbar " << sender()->name() << " not found!" << endl; } bool KoMainWindow::toolbarIsVisible(const char *tbName) diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 0e2160989..cfdfc46d6 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -265,7 +265,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e ) showIcon(); return true; } - else if (e->type() == TQEvent::Resize && d->panel && TQT_BASE_OBJECT(o) == d->panel) { + else if (e->type() == TQEvent::Resize && d->panel && o == d->panel) { // TODO: This doesn't always work. showIcon(); } diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index 2077b31db..e5aaf73c9 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -64,7 +64,7 @@ void KoPartSelectAction::init() // Called when selecting a part void KoPartSelectAction::slotActionActivated() { - TQString servName = TQString::fromLatin1( TQT_TQOBJECT(const_cast(sender()))->name() ); + TQString servName = TQString::fromLatin1( sender()->name() ); KService::Ptr serv = KService::serviceByName( servName ); m_documentEntry = KoDocumentEntry( serv ); emit activated(); diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index 0d24cd161..4ede56d9c 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -809,7 +809,7 @@ void KoToolButton::drawButton(TQPainter *_painter) bool KoToolButton::eventFilter( TQObject* o, TQEvent* e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_popup) ) { + if ( o == m_popup ) { if ( e->type() == TQEvent::MouseButtonPress ) if ( hitArrow( mapFromGlobal( TQT_TQMOUSEEVENT( e )->globalPos() ) ) ) { kdDebug() << "KoToolButton::eventFilter-------------->" << endl; diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index 6fed1f486..6aaab7396 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -314,7 +314,7 @@ void TTDEToolBarButton::enterEvent(TQEvent *) bool TTDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if ( o == this ) if (ev->type() == TQEvent::MouseButtonPress && d->m_popup && d->m_isPopup ) { if (!d->m_isToggle) { d->m_arrowPressed = arrowPressed( mapFromGlobal(TQCursor::pos()) ); @@ -323,7 +323,7 @@ bool TTDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev) } } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_popup)) { + if ( o == d->m_popup) { switch (ev->type()) { case TQEvent::Show: diff --git a/lib/kopalette/kopalettemanager.cpp b/lib/kopalette/kopalettemanager.cpp index 26f309925..48dc682d4 100644 --- a/lib/kopalette/kopalettemanager.cpp +++ b/lib/kopalette/kopalettemanager.cpp @@ -497,7 +497,7 @@ void KoPaletteManager::showAllPalettes(bool shown) bool KoPaletteManager::eventFilter( TQObject *o, TQEvent *e ) { - if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_view)) return false; + if (o != m_view) return false; if(e && e->type() == (TQEvent::User + 42)) { KParts::PartActivateEvent * pae = dynamic_cast(e); diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index d4c61ec21..2dc05f484 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -915,7 +915,7 @@ Editor::resizeEvent(TQResizeEvent *ev) bool Editor::eventFilter( TQObject * watched, TQEvent * e ) { - if ((TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(viewport())) && e->type()==TQEvent::KeyPress) { + if ((watched==this || watched==viewport()) && e->type()==TQEvent::KeyPress) { if (handleKeyPress(TQT_TQKEYEVENT(e))) return true; } diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index cf7645bf5..4e295c964 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -205,7 +205,7 @@ PixmapEdit::resizeEvent(TQResizeEvent *e) bool PixmapEdit::eventFilter(TQObject *o, TQEvent *ev) { - if(TQT_BASE_OBJECT(o) == m_edit) { + if(o == m_edit) { if(ev->type() == TQEvent::MouseButtonPress && TQT_TQMOUSEEVENT(ev)->button()==Qt::LeftButton) { if(m_previewPixmap.height() <= m_edit->height() && m_previewPixmap.width() <= m_edit->width()) diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 4d9266a8e..e76ca930d 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -59,7 +59,7 @@ void IntSpinBox::setValue(const TQVariant &value) bool IntSpinBox::eventFilter(TQObject *o, TQEvent *e) { - if(TQT_BASE_OBJECT(o) == editor()) + if(o == editor()) { if(e->type() == TQEvent::KeyPress) { @@ -71,7 +71,7 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e) } } } - if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) + if ((o == editor() || o == this || o->parent() == this) && e->type() == TQEvent::Wheel && static_cast(parentWidget())->isReadOnly()) { return true; //avoid value changes for read-only widget @@ -192,7 +192,7 @@ DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double va bool DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e) { - if(TQT_BASE_OBJECT(o) == editor()) + if(o == editor()) { if(e->type() == TQEvent::KeyPress) { @@ -204,7 +204,7 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e) } } } - if ((TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(editor()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o->parent()) == TQT_BASE_OBJECT(this)) + if ((o == editor() || o == this || o->parent() == this) && e->type() == TQEvent::Wheel && static_cast(parentWidget())->isReadOnly()) { return true; //avoid value changes for read-only widget