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

3 files changed, 18 insertions, 20 deletions

diff --git a/kmdi/kmdi/dockcontainer.cpp b/kmdi/kmdi/dockcontainer.cpp
index 017d8a02a..eb8518a4a 100644
--- a/kmdi/kmdi/dockcontainer.cpp
+++ b/kmdi/kmdi/dockcontainer.cpp
@@ -119,7 +119,7 @@ DockContainer::~DockContainer()
     it = m_map.begin();
     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);
@@ -148,8 +148,8 @@ void DockContainer::init()
   // try to restore splitter size
   if ( parentDockWidget() && parentDockWidget()->parent() )
   {
-    KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-                tqparent()->qt_cast("KDockSplitter"));
+    KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+                tqparent());
     if ( sp )
       sp->setSeparatorPosX( m_separatorPos );
   }
@@ -184,12 +184,11 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
     if (((KDockWidget*)tqparentWidget())->mayBeShow())
       ((KDockWidget*)tqparentWidget())->dockBack();
 
-    if (w->getHeader()->qt_cast("KDockWidgetHeader"))
+    if (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))
     {
       kdDebug(760)<<"*** KDockWidgetHeader has been found"<<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" );
 
@@ -256,8 +255,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 				kdDebug()<<"NO HEADER"<<endl;
 				break;
 			}
-		      KDockWidgetHeader *hdr=static_cast<KDockWidgetHeader*>(w->getHeader()->
-	        	qt_cast("KDockWidgetHeader"));
+		      KDockWidgetHeader *hdr=::tqqt_cast<KDockWidgetHeader*>(w->getHeader());
 			if (!hdr) {
 				kdDebug()<<"Wrong header type in DockContainer::eventFilter"<<endl;
 				break;
@@ -357,7 +355,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
   m_map.remove(w);
   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);
@@ -405,7 +403,7 @@ void DockContainer::tabClicked(int t)
     }
     m_ws->raiseWidget(t);
     if (m_ws->widget(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()) tmpDw->getWidget()->setFocus();
       } else kdDebug(760)<<"Something really weird is going on"<<endl;
@@ -422,8 +420,8 @@ void DockContainer::tabClicked(int t)
        // try save splitter position
       if ( parentDockWidget() && parentDockWidget()->parent() )
       {
-        KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-                    tqparent()->qt_cast("KDockSplitter"));
+        KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+                    tqparent());
         if ( sp )
           m_separatorPos = sp->separatorPos();
       }
@@ -475,8 +473,8 @@ void DockContainer::save(KConfig* cfg,const TQString& group_or_prefix)
   // try to save the splitter position
   if ( parentDockWidget() && parentDockWidget()->parent() )
   {
-    KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-                tqparent()->qt_cast("KDockSplitter"));
+    KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+                tqparent());
     if ( sp )
       cfg->writeEntry( "separatorPosition", m_separatorPos );
   }
diff --git a/kmdi/kmdi/guiclient.cpp b/kmdi/kmdi/guiclient.cpp
index c5d2ab115..6d61f16e3 100644
--- a/kmdi/kmdi/guiclient.cpp
+++ b/kmdi/kmdi/guiclient.cpp
@@ -201,8 +201,8 @@ void ToggleToolViewAction::anDWChanged()
   else if ((!isChecked()) && m_dw->mayBeHide())
     setChecked(true);
   else if (isChecked() && (m_dw->parentDockTabGroup() &&
-          ((static_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
-                  tqparent()->qt_cast("KDockWidget")))->mayBeShow())))
+          ((::tqqt_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
+                  tqparent()))->mayBeShow())))
     setChecked(false);
 }
 
diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp
index 4b643e3d4..26044879e 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/kmdi/kmdi/mainwindow.cpp
@@ -311,16 +311,16 @@ void MainWindow::setToolViewStyle(int flag)
 {
   d->m_styleIDEAlMode = flag; // see KMultiTabBar for the first 3 bits
 
-  DockContainer *tmpL=(DockContainer*) (m_leftContainer->getWidget()->qt_cast("KMDI::DockContainer"));
+  DockContainer *tmpL=::tqqt_cast<KMDI::DockContainer*>(m_leftContainer->getWidget());
   if (tmpL) tmpL->setStyle(flag);
 
-  DockContainer *tmpR=(DockContainer*) (m_rightContainer->getWidget()->qt_cast("KMDI::DockContainer"));
+  DockContainer *tmpR=::tqqt_cast<KMDI::DockContainer*>(m_rightContainer->getWidget());
   if (tmpR) tmpR->setStyle(flag);
 
-  DockContainer *tmpT=(DockContainer*) (m_topContainer->getWidget()->qt_cast("KMDI::DockContainer"));
+  DockContainer *tmpT=::tqqt_cast<KMDI::DockContainer*>(m_topContainer->getWidget());
   if (tmpT) tmpT->setStyle(flag);
 
-  DockContainer *tmpB=(DockContainer*) (m_bottomContainer->getWidget()->qt_cast("KMDI::DockContainer"));
+  DockContainer *tmpB=::tqqt_cast<KMDI::DockContainer*>(m_bottomContainer->getWidget());
   if (tmpB) tmpB->setStyle(flag);
 
   d->m_toolviewStyle = flag;