diff options
Diffstat (limited to 'kexi/core/kexidialogbase.cpp')
| -rw-r--r-- | kexi/core/kexidialogbase.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp index 7b57d673..f8067ddd 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) |