Remove various '#define' strings - part 6

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

1 files changed, 8 insertions, 8 deletions

diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index c2a3f2a5..b7f09355 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -32,7 +32,7 @@
 
 KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *parent, const char *name)
  : TQWidget(parent, name)
- , KexiActionProxy(TQT_TQOBJECT(this), mainWin)
+ , KexiActionProxy(this, mainWin)
  , m_mainWin(mainWin)
  , m_viewWidget(0)
  , m_parentView(0)
@@ -214,10 +214,10 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 {
 	if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits("TQWidget")) {
 //		//hp==true if currently focused widget is a child of this table view
-//		const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), focusWidget());
+//		const bool hp = Kexi::hasParent( o, focusWidget());
 //		kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl;
-		if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) {
-			if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) {
+		if (KexiUtils::hasParent( this, o)) {
+			if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( this, focusWidget())) {
 				//focus out: when currently focused widget is not a parent of this view
 				emit focus(false);
 			} else if (e->type()==TQEvent::FocusIn) {
@@ -231,9 +231,9 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 				if (v) {
 					while (v->m_parentView)
 						v = v->m_parentView;
-					if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->focusWidget()) ))
-						v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->focusWidget());
-//					v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //focusWidget();
+					if (KexiUtils::hasParent( this, v->focusWidget() ))
+						v->m_lastFocusedChildBeforeFocusOut = v->focusWidget();
+//					v->m_lastFocusedChildBeforeFocusOut = o; //focusWidget();
 				}
 			}
 
@@ -286,7 +286,7 @@ void KexiViewBase::setFocus()
 		else
 			setFocusInternal();
 	}
-	m_mainWin->invalidateSharedActions(TQT_TQOBJECT(this));
+	m_mainWin->invalidateSharedActions(this);
 }
 
 TDEAction* KexiViewBase::sharedAction( const char *action_name )