Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 9 insertions, 9 deletions

diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index df2816fe..0c153c75 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 9ecae92f..8a0e678a 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 308e565e..3c08b265 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 3305fff1..943ec1e8 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 c1405c1d..ab76fa95 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<TQT_BASE_OBJECT_NAME*>(m_editor)), TQT_TQOBJECT(w)))) {
+	if (!w || w!=viewport() && TQT_TQOBJECT(w)!=TQT_TQOBJECT(this) && (!m_editor || !KexiUtils::hasParent(TQT_TQOBJECT(dynamic_cast<TQObject*>(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<TQT_BASE_OBJECT_NAME*>(m_editor) || TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_editor->widget()))) {
+			else if (m_editor && (o==dynamic_cast<TQObject*>(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) {