Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ba6005e901)
r14.1.x
Michele Calgaro 1 year ago
parent 6d209e2164
commit 1c3fb8b2e1
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -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 // 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. // a TAB key when the object 'o' points to the category or memo field.
if(KMyMoneyGlobalSettings::enterMovesBetweenFields()) { 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; terminate = false;
TQKeyEvent evt(e->type(), TQKeyEvent evt(e->type(),
Key_Tab, 0, k->state(), TQString(), Key_Tab, 0, k->state(), TQString(),

@ -153,7 +153,7 @@ bool TDESelectTransactionsDlg::eventFilter(TQObject* o, TQEvent* e)
bool rc = false; bool rc = false;
TQKeyEvent* k; TQKeyEvent* k;
if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_register)) { if(o == m_register) {
switch(e->type()) { switch(e->type()) {
case TQEvent::KeyPress: case TQEvent::KeyPress:
k = dynamic_cast<TQKeyEvent*>(e); k = dynamic_cast<TQKeyEvent*>(e);

@ -153,7 +153,7 @@ void TransactionEditor::slotReloadEditWidgets(void)
bool TransactionEditor::eventFilter(TQObject* o, TQEvent* e) bool TransactionEditor::eventFilter(TQObject* o, TQEvent* e)
{ {
bool rc = false; bool rc = false;
if(TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(haveWidget("number"))) { if(o == haveWidget("number")) {
if(e->type() == TQEvent::MouseButtonDblClick) { if(e->type() == TQEvent::MouseButtonDblClick) {
emit assignNumber(); emit assignNumber();
rc = true; rc = true;
@ -180,7 +180,7 @@ bool TransactionEditor::eventFilter(TQObject* o, TQEvent* e)
// we treat the return/enter key as such. // we treat the return/enter key as such.
if(KMyMoneyGlobalSettings::enterMovesBetweenFields()) { if(KMyMoneyGlobalSettings::enterMovesBetweenFields()) {
for(it_w = m_finalEditWidgets.begin(); !isFinal && it_w != m_finalEditWidgets.end(); ++it_w) { 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<const kMyMoneyEdit*>(*it_w)) { if(dynamic_cast<const kMyMoneyEdit*>(*it_w)) {
isFinal = !(dynamic_cast<const kMyMoneyEdit*>(*it_w)->value().isZero()); isFinal = !(dynamic_cast<const kMyMoneyEdit*>(*it_w)->value().isZero());
} else } else

@ -510,7 +510,7 @@ void KMyMoney2App::dumpActions(void) const
TDEAction* KMyMoney2App::action(const TQString& actionName) const TDEAction* KMyMoney2App::action(const TQString& actionName) const
{ {
static TDEShortcut shortcut(""); static TDEShortcut shortcut("");
static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast<const TQObject*>(this), 0, static_cast<TDEActionCollection*>(0), ""); static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, this, 0, static_cast<TDEActionCollection*>(0), "");
TDEAction* p = actionCollection()->action(actionName.latin1()); TDEAction* p = actionCollection()->action(actionName.latin1());
if(p) if(p)
@ -523,7 +523,7 @@ TDEAction* KMyMoney2App::action(const TQString& actionName) const
TDEToggleAction* KMyMoney2App::toggleAction(const TQString& actionName) const TDEToggleAction* KMyMoney2App::toggleAction(const TQString& actionName) const
{ {
static TDEShortcut shortcut(""); static TDEShortcut shortcut("");
static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast<const TQObject*>(this), 0, static_cast<TDEActionCollection*>(0), ""); static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, this, 0, static_cast<TDEActionCollection*>(0), "");
TDEAction* q = actionCollection()->action(actionName.latin1()); TDEAction* q = actionCollection()->action(actionName.latin1());

@ -47,7 +47,7 @@ KMyMoneyPlugin::Plugin::~Plugin()
TDEAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const TDEAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const
{ {
static TDEShortcut shortcut(""); static TDEShortcut shortcut("");
static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast<const TQObject*>(this), 0, static_cast<TDEActionCollection*>(0), ""); static TDEAction dummyAction(TQString("Dummy"), TQString(), shortcut, this, 0, static_cast<TDEActionCollection*>(0), "");
TDEAction* p = actionCollection()->action(actionName.latin1()); TDEAction* p = actionCollection()->action(actionName.latin1());
if(p) if(p)
@ -60,7 +60,7 @@ TDEAction* KMyMoneyPlugin::Plugin::action(const TQString& actionName) const
TDEToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName) const TDEToggleAction* KMyMoneyPlugin::Plugin::toggleAction(const TQString& actionName) const
{ {
static TDEShortcut shortcut(""); static TDEShortcut shortcut("");
static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, static_cast<const TQObject*>(this), 0, static_cast<TDEActionCollection*>(0), ""); static TDEToggleAction dummyAction(TQString("Dummy"), TQString(), shortcut, this, 0, static_cast<TDEActionCollection*>(0), "");
TDEAction* q = actionCollection()->action(actionName.latin1()); TDEAction* q = actionCollection()->action(actionName.latin1());

@ -1274,14 +1274,14 @@ bool TDEGlobalLedgerView::eventFilter(TQObject* o, TQEvent* e)
TQKeyEvent *k = TQT_TQKEYEVENT(e); TQKeyEvent *k = TQT_TQKEYEVENT(e);
if(m_inEditMode) { if(m_inEditMode) {
// tqDebug(TQString("object = %1, key = %2").arg(o->className()).arg(k->key())); // 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 // we hide all key press events from the register
// while editing a transaction // while editing a transaction
rc = true; rc = true;
} }
} else { } else {
// tqDebug(TQString("object = %1, key = %2").arg(o->className()).arg(k->key())); // 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) { if((k->state() & TQt::KeyButtonMask) == 0) {
switch(k->key()) { switch(k->key()) {
case TQt::Key_Return: case TQt::Key_Return:

@ -169,7 +169,7 @@ bool kMyMoneyCompletion::eventFilter(TQObject* o, TQEvent* e)
KMyMoneyCombo *c = dynamic_cast<KMyMoneyCombo*>(m_parent); KMyMoneyCombo *c = dynamic_cast<KMyMoneyCombo*>(m_parent);
TQListViewItem* item; 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(isVisible()) {
if(type == TQEvent::KeyPress) { if(type == TQEvent::KeyPress) {
TQKeyEvent* ev = TQT_TQKEYEVENT (e); TQKeyEvent* ev = TQT_TQKEYEVENT (e);

@ -679,7 +679,7 @@ void Register::slotAutoColumnSizing(int section)
bool Register::eventFilter(TQObject* o, TQEvent* e) 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<TQMouseEvent*>(e); TQMouseEvent *me = dynamic_cast<TQMouseEvent*>(e);
if(me->button() == Qt::RightButton) { if(me->button() == Qt::RightButton) {
emit headerClicked(); emit headerClicked();
@ -687,13 +687,13 @@ bool Register::eventFilter(TQObject* o, TQEvent* e)
// eat up left mouse button press for now // eat up left mouse button press for now
return true; 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) // always show the header in bold (to suppress cell selection)
TQFont f(horizontalHeader()->font()); TQFont f(horizontalHeader()->font());
f.setBold(true); f.setBold(true);
horizontalHeader()->setFont(f); 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<TQKeyEvent*>(e); TQKeyEvent* ke = dynamic_cast<TQKeyEvent*>(e);
if(ke->key() == TQt::Key_Menu) { if(ke->key() == TQt::Key_Menu) {
emit openContextMenu(); emit openContextMenu();

Loading…
Cancel
Save