1 files changed, 11 insertions, 11 deletions

diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index e89f4a4e..65f2e68f 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -214,26 +214,26 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 {
 	if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut) {// && o->inherits(TQWIDGET_OBJECT_NAME_STRING)) {
 //		//hp==true if currently focused widget is a child of this table view
-//		const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), tqfocusWidget());
+//		const bool hp = Kexi::hasParent( static_cast<TQWidget*>(o), focusWidget());
 //		kexidbg << "KexiViewBase::eventFilter(): " << o->name() << " " << e->type() << endl;
 		if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(o))) {
-			if (e->type()==TQEvent::FocusOut && tqfocusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(tqfocusWidget()))) {
+			if (e->type()==TQEvent::FocusOut && focusWidget() && !KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(focusWidget()))) {
 				//focus out: when currently focused widget is not a parent of this view
 				emit focus(false);
 			} else if (e->type()==TQEvent::FocusIn) {
 				emit focus(true);
 			}
-			if (e->type()==TQEvent::FocusOut) { // && tqfocusWidget() && Kexi::hasParent( this, tqfocusWidget())) { // && tqfocusWidget()->inherits("KexiViewBase")) {
-//				kdDebug() << tqfocusWidget()->className() << " " << tqfocusWidget()->name()<< endl;
+			if (e->type()==TQEvent::FocusOut) { // && focusWidget() && Kexi::hasParent( this, focusWidget())) { // && focusWidget()->inherits("KexiViewBase")) {
+//				kdDebug() << focusWidget()->className() << " " << focusWidget()->name()<< endl;
 //				kdDebug() << o->className() << " " << o->name()<< endl;
 				KexiViewBase *v = KexiUtils::findParent<KexiViewBase>(o, "KexiViewBase") ;
-//				TQWidget *www=v->tqfocusWidget();
+//				TQWidget *www=v->focusWidget();
 				if (v) {
 					while (v->m_parentView)
 						v = v->m_parentView;
-					if (KexiUtils::hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(v->tqfocusWidget()) ))
-						v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(v->tqfocusWidget());
-//					v->m_lastFocusedChildBeforeFocusOut = static_cast<TQWidget*>(o); //tqfocusWidget();
+					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();
 				}
 			}
 
@@ -263,7 +263,7 @@ void KexiViewBase::setViewWidget(TQWidget* w, bool focusProxy)
 
 void KexiViewBase::addChildView( KexiViewBase* childView )
 {
-	m_tqchildren.append( childView );
+	m_children.append( childView );
 	addActionProxyChild( childView );
 	childView->m_parentView = this;
 //	if (m_parentView)
@@ -318,8 +318,8 @@ void KexiViewBase::setAvailable(const char* action_name, bool set)
 void KexiViewBase::updateActions(bool activated)
 {
 	//do nothing here
-	//do the same for tqchildren :)
- 	for (TQPtrListIterator<KexiViewBase> it(m_tqchildren); it.current(); ++it) {
+	//do the same for children :)
+ 	for (TQPtrListIterator<KexiViewBase> it(m_children); it.current(); ++it) {
 		it.current()->updateActions(activated);
 	}
 }