4 files changed, 17 insertions, 17 deletions

diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 7b57d6733..f8067ddd6 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -43,7 +43,7 @@
 
 KexiDialogBase::KexiDialogBase(KexiMainWindow *parent, const TQString &caption)
  : KMdiChildView(caption, parent, "KexiDialogBase")
- , KexiActionProxy(TQT_TQOBJECT(this), parent)
+ , KexiActionProxy(this, parent)
  , m_isRegistered(false)
  , m_origCaption(caption)
  , m_schemaData(0)
@@ -100,7 +100,7 @@ void KexiDialogBase::addView(KexiViewBase *view, int mode)
 //	addActionProxyChild( view );
 
 	//set focus proxy inside this view
-	TQWidget *ch = TQT_TQWIDGET(view->child( 0, "TQWidget", false ));
+	TQWidget *ch = static_cast<TQWidget*>(view->child( 0, "TQWidget", false ));
 	if (ch)
 		view->setFocusProxy(ch);
 
@@ -191,7 +191,7 @@ void KexiDialogBase::closeEvent( TQCloseEvent * e )
 	TQObjectList *list = m_stack->queryList( "KexiViewBase", 0, false, false);
 	KexiViewBase *view;
 	TQObjectListIt it( *list );
-	for ( ;(view = static_cast<KexiViewBase*>(TQT_TQWIDGET(it.current())) ) != 0; ++it ) {
+	for ( ;(view = static_cast<KexiViewBase*>(it.current()) ) != 0; ++it ) {
 		bool cancel = false;
 		emit view->closing(cancel);
 		if (cancel) {
@@ -394,7 +394,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
 	addActionProxyChild( newView ); //new proxy child
 	m_stack->raiseWidget( newView );
 	newView->propertySetSwitched();
-	m_parentWindow->invalidateSharedActions( TQT_TQOBJECT(newView) );
+	m_parentWindow->invalidateSharedActions( newView );
 	TQTimer::singleShot(10, newView, TQT_SLOT(setFocus())); //newView->setFocus(); //js ok?
 //	setFocus();
 	return true;
@@ -439,7 +439,7 @@ bool KexiDialogBase::eventFilter(TQObject *obj, TQEvent *e)
 	}*/
 	if ((e->type()==TQEvent::FocusIn && m_parentWindow->activeWindow()==this)
 		|| e->type()==TQEvent::MouseButtonPress) {
-		if (m_stack->visibleWidget() && KexiUtils::hasParent(TQT_TQOBJECT(m_stack->visibleWidget()), obj)) {
+		if (m_stack->visibleWidget() && KexiUtils::hasParent(m_stack->visibleWidget(), obj)) {
 			//pass the activation
 			activate();
 		}
@@ -625,7 +625,7 @@ void KexiDialogBase::activate()
 {
 	KexiViewBase *v = selectedView();
 	//kdDebug() << "focusWidget(): " << focusWidget()->name() << endl;
-	if (KexiUtils::hasParent( TQT_TQOBJECT(v), TQT_TQOBJECT(KMdiChildView::focusedChildWidget())))//focusWidget()))
+	if (KexiUtils::hasParent( v, KMdiChildView::focusedChildWidget()))//focusWidget()))
 		KMdiChildView::activate();
 	else {//ah, focused widget is not in this view, move focus:
 		if (v)
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index e907110a5..48b4f9f03 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -392,7 +392,7 @@ bool Part::remove(KexiMainWindow *win, KexiPart::Item &item)
 
 KexiDialogTempData* Part::createTempData(KexiDialogBase* dialog)
 {
-	return new KexiDialogTempData(TQT_TQOBJECT(dialog));
+	return new KexiDialogTempData(dialog);
 }
 
 TQString Part::i18nMessage(const TQCString& englishMessage, KexiDialogBase* dlg) const
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index 20eae6c41..5370ba577 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -202,12 +202,12 @@ TQWidget* KexiSharedActionHost::focusWindow()
 		fw = dynamic_cast<KMdiMainFrm*>(d->mainWin)->activeWindow();
 	}
 	else {
-		TQWidget *aw = TQT_TQWIDGET(tqApp->activeWindow());
+		TQWidget *aw = tqApp->activeWindow();
 		if (!aw)
 			aw = d->mainWin;
 		fw = aw->focusWidget();
 	}
-	while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw)))
+	while (fw && !acceptsSharedActions(fw))
 		fw = fw->parentWidget();
 	return fw;
 }
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index c2a3f2a5a..b7f09355a 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 )