diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index 231aaf8..6f62d44 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -324,7 +324,7 @@ bool kMyMoneySplitTable::eventFilter(TQObject *o, TQEvent *e) // in case we have the 'enter moves focus between fields', we need to simulate // a TAB key when the object 'o' points to the category or memo field. if(KMyMoneyGlobalSettings::enterMovesBetweenFields()) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editCategory->lineEdit()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_editMemo)) { + if(o == m_editCategory->lineEdit() || o == m_editMemo) { terminate = false; TQKeyEvent evt(e->type(), Key_Tab, 0, k->state(), TQString(), diff --git a/kmymoney2/dialogs/tdeselecttransactionsdlg.cpp b/kmymoney2/dialogs/tdeselecttransactionsdlg.cpp index 7c7a03f..caedd5f 100644 --- a/kmymoney2/dialogs/tdeselecttransactionsdlg.cpp +++ b/kmymoney2/dialogs/tdeselecttransactionsdlg.cpp @@ -153,7 +153,7 @@ bool TDESelectTransactionsDlg::eventFilter(TQObject* o, TQEvent* e) bool rc = false; TQKeyEvent* k; - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_register)) { + if(o == m_register) { switch(e->type()) { case TQEvent::KeyPress: k = dynamic_cast(e); diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp index b63e8c1..3cd3183 100644 --- a/kmymoney2/dialogs/transactioneditor.cpp +++ b/kmymoney2/dialogs/transactioneditor.cpp @@ -153,7 +153,7 @@ void TransactionEditor::slotReloadEditWidgets(void) bool TransactionEditor::eventFilter(TQObject* o, TQEvent* e) { bool rc = false; - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(haveWidget("number"))) { + if(o == haveWidget("number")) { if(e->type() == TQEvent::MouseButtonDblClick) { emit assignNumber(); rc = true; @@ -180,7 +180,7 @@ bool TransactionEditor::eventFilter(TQObject* o, TQEvent* e) // we treat the return/enter key as such. if(KMyMoneyGlobalSettings::enterMovesBetweenFields()) { for(it_w = m_finalEditWidgets.begin(); !isFinal && it_w != m_finalEditWidgets.end(); ++it_w) { - if(TQT_BASE_OBJECT_CONST(*it_w) == TQT_BASE_OBJECT(o)) { + if(*it_w == o) { if(dynamic_cast(*it_w)) { isFinal = !(dynamic_cast(*it_w)->value().isZero()); } else diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp index f9c4b8b..62d35fc 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -510,7 +510,7 @@ void KMyMoney2App::dumpActions(void) const TDEAction* KMyMoney2App::action(const TQString& actionName) const { static TDEShortcut shortcut(""); - static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); + static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, this, 0, static_cast(0), ""); TDEAction* p = actionCollection()->action(actionName.latin1()); if(p) @@ -523,7 +523,7 @@ TDEAction* KMyMoney2App::action(const TQString& actionName) const TDEToggleAction* KMyMoney2App::toggleAction(const TQString& actionName) const { static TDEShortcut shortcut(""); - static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); + static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, this, 0, static_cast(0), ""); TDEAction* q = actionCollection()->action(actionName.latin1()); diff --git a/kmymoney2/plugins/kmymoneyplugin.cpp b/kmymoney2/plugins/kmymoneyplugin.cpp index 18430ab..8f0c51a 100644 --- a/kmymoney2/plugins/kmymoneyplugin.cpp +++ b/kmymoney2/plugins/kmymoneyplugin.cpp @@ -47,7 +47,7 @@ KMyMoneyPlugin::Plugin::~Plugin() TDEAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const { static TDEShortcut shortcut(""); - static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); + static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, this, 0, static_cast(0), ""); TDEAction* p = actionCollection()->action(actionName.latin1()); if(p) @@ -60,7 +60,7 @@ TDEAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const TDEToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName) const { static TDEShortcut shortcut(""); - static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast(this), 0, static_cast(0), ""); + static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, this, 0, static_cast(0), ""); TDEAction* q = actionCollection()->action(actionName.latin1()); diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp index 270e630..7d05df1 100644 --- a/kmymoney2/views/kgloballedgerview.cpp +++ b/kmymoney2/views/kgloballedgerview.cpp @@ -1274,14 +1274,14 @@ bool TDEGlobalLedgerView::eventFilter(TQObject* o, TQEvent* e) TQKeyEvent *k = TQT_TQKEYEVENT(e); if(m_inEditMode) { // tqDebug(TQString("object = %1, key = %2").arg(o->className()).arg(k->key())); - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_register)) { + if(o == m_register) { // we hide all key press events from the register // while editing a transaction rc = true; } } else { // tqDebug(TQString("object = %1, key = %2").arg(o->className()).arg(k->key())); - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_register)) { + if(o == m_register) { if((k->state() & TQt::KeyButtonMask) == 0) { switch(k->key()) { case TQt::Key_Return: diff --git a/kmymoney2/widgets/kmymoneycompletion.cpp b/kmymoney2/widgets/kmymoneycompletion.cpp index 8a4b599..529ec7f 100644 --- a/kmymoney2/widgets/kmymoneycompletion.cpp +++ b/kmymoney2/widgets/kmymoneycompletion.cpp @@ -169,7 +169,7 @@ bool kMyMoneyCompletion::eventFilter(TQObject* o, TQEvent* e) KMyMoneyCombo *c = dynamic_cast(m_parent); TQListViewItem* item; - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_parent) || (c && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(c->lineEdit()))) { + if(o == m_parent || (c && o == c->lineEdit())) { if(isVisible()) { if(type == TQEvent::KeyPress) { TQKeyEvent* ev = TQT_TQKEYEVENT (e); diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp index b52dff4..7fcb242 100644 --- a/kmymoney2/widgets/register.cpp +++ b/kmymoney2/widgets/register.cpp @@ -679,7 +679,7 @@ void Register::slotAutoColumnSizing(int section) bool Register::eventFilter(TQObject* o, TQEvent* e) { - if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(horizontalHeader()) && e->type() == TQEvent::MouseButtonPress) { + if(o == horizontalHeader() && e->type() == TQEvent::MouseButtonPress) { TQMouseEvent *me = dynamic_cast(e); if(me->button() == Qt::RightButton) { emit headerClicked(); @@ -687,13 +687,13 @@ bool Register::eventFilter(TQObject* o, TQEvent* e) // eat up left mouse button press for now return true; - } else if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(horizontalHeader()) && e->type() == TQEvent::Paint) { + } else if(o == horizontalHeader() && e->type() == TQEvent::Paint) { // always show the header in bold (to suppress cell selection) TQFont f(horizontalHeader()->font()); f.setBold(true); horizontalHeader()->setFont(f); - } else if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::KeyPress) { + } else if(o == this && e->type() == TQEvent::KeyPress) { TQKeyEvent* ke = dynamic_cast(e); if(ke->key() == TQt::Key_Menu) { emit openContextMenu();