Convert qt_cast() to ::qt_cast<>

This should fix some random segfaults
It needs to be tested to make sure that interfaces still work,
e.g. kate/kwrite interfaces in interface/ktexteditor


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1218078 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 10 deletions

diff --git a/kmdi/kmdidockcontainer.cpp b/kmdi/kmdidockcontainer.cpp
index e14d826e4..8198541fe 100644
--- a/kmdi/kmdidockcontainer.cpp
+++ b/kmdi/kmdidockcontainer.cpp
@@ -140,7 +140,7 @@ KMdiDockContainer::~KMdiDockContainer()
 		KDockWidget *w = it.key();
 		if ( m_overlapButtons.tqcontains( w ) )
 		{
-			( static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] );
+			( ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[w] );
 			m_overlapButtons.remove( w );
 		}
 		m_map.remove( w );
@@ -172,7 +172,7 @@ void KMdiDockContainer::init()
 	// try to restore splitter size
 	if ( parentDockWidget() && parentDockWidget()->tqparent() )
 	{
-		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
+		KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->tqparent() );
 		if ( sp )
 			sp->setSeparatorPosX( m_separatorPos );
 	}
@@ -207,12 +207,12 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 		if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() )
 			( ( KDockWidget* ) tqparentWidget() ) ->dockBack();
 
-		if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) )
+		if ( ::tqqt_cast<KDockWidgetHeader*>(w->getHeader()) )
 		{
 			kdDebug( 760 ) << k_funcinfo << "The dockwidget we're adding has a header" << endl;
 			kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl;
 
-			KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) );
+			KDockWidgetHeader *hdr = ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() );
 			KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" );
 
 			TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) );
@@ -272,7 +272,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 			break;
 		}
 
-		KDockWidgetHeader *hdr = static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) );
+		KDockWidgetHeader *hdr = ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() );
 		if ( !hdr )
 		{
 			kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl;
@@ -387,7 +387,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
 	m_revMap.remove( id );
 	if ( m_overlapButtons.tqcontains( w ) )
 	{
-		( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] );
+		( ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[ w ] );
 		m_overlapButtons.remove( w );
 	}
 	KDockContainer::removeWidget( w );
@@ -442,7 +442,7 @@ void KMdiDockContainer::tabClicked( int t )
 		if ( m_ws->widget( t ) )
 		{
 			m_ws->raiseWidget( t );
-			KDockWidget * tmpDw = static_cast<KDockWidget*>( m_ws->widget( t )->qt_cast( "KDockWidget" ) );
+			KDockWidget * tmpDw = ::tqqt_cast<KDockWidget*>( m_ws->widget( t ) );
 			if ( tmpDw )
 			{
 				if ( tmpDw->getWidget() )
@@ -467,7 +467,7 @@ void KMdiDockContainer::tabClicked( int t )
 		// try save splitter position
 		if ( parentDockWidget() && parentDockWidget()->tqparent() )
 		{
-			KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
+			KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->tqparent() );
 			if ( sp )
 				m_separatorPos = sp->separatorPos();
 		}
@@ -638,8 +638,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 	// try to save the splitter position
 	if ( parentDockWidget() && parentDockWidget() ->tqparent() )
 	{
-		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() ->
-		                     tqparent() ->qt_cast( "KDockSplitter" ) );
+		KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget() -> tqparent() );
 		if ( sp )
 			cfg->writeEntry( "separatorPosition", m_separatorPos );
 	}