From f007f85c4dc9ed297291c2a209bba73663ecd37b Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 31 Jan 2011 06:26:14 +0000
Subject: 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
---
 kdecore/kaccelmanager.cpp   | 3 ++-
 kdecore/kgenericfactory.tcc | 4 ++--
 kdecore/kkeynative_x11.cpp  | 2 +-
 kdecore/kkeyserver_x11.cpp  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'kdecore')

diff --git a/kdecore/kaccelmanager.cpp b/kdecore/kaccelmanager.cpp
index 3447803d1..4dc00f6aa 100644
--- a/kdecore/kaccelmanager.cpp
+++ b/kdecore/kaccelmanager.cpp
@@ -47,6 +47,7 @@
 
 #include "kaccelmanager_private.h"
 #include "../kdeui/kstdaction_p.h"
+#include "../kutils/kmultitabbar.h"
 
 
 /*********************************************************************
@@ -320,7 +321,7 @@ void KAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
 
   if (dynamic_cast<TQComboBox*>(w) || dynamic_cast<TQLineEdit*>(w) ||
       dynamic_cast<TQTextEdit*>(w) || dynamic_cast<TQTextView*>(w) ||
-      dynamic_cast<TQSpinBox*>(w) || w->qt_cast( "KMultiTabBar" ))
+      dynamic_cast<TQSpinBox*>(w) || static_cast<KMultiTabBar*>(w->qt_cast("KMultiTabBar")))
       return;
 
   // now treat 'ordinary' widgets
diff --git a/kdecore/kgenericfactory.tcc b/kdecore/kgenericfactory.tcc
index 22fbd7371..3d8737635 100644
--- a/kdecore/kgenericfactory.tcc
+++ b/kdecore/kgenericfactory.tcc
@@ -151,7 +151,7 @@ namespace KDEPrivate
                                        const TQStringList &args, Type2Type<TQWidget> )
         {
 
-            WidgetParentType *p = dynamic_cast<WidgetParentType *>( parent );
+            WidgetParentType *p = dynamic_cast<WidgetParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) );
             if ( parent && !p ) 
                 return 0;
             return new Product( p, name, args );
@@ -161,7 +161,7 @@ namespace KDEPrivate
                                        TQObject *parent, const char *name,
                                        const TQStringList &args, Type2Type<TQObject> )
         { 
-            ParentType *p = dynamic_cast<ParentType *>( parent );
+            ParentType *p = dynamic_cast<ParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) );
             if ( parent && !p )
                 return 0;
             return new Product( p, name, args ); 
diff --git a/kdecore/kkeynative_x11.cpp b/kdecore/kkeynative_x11.cpp
index 7733d3de7..8fed59deb 100644
--- a/kdecore/kkeynative_x11.cpp
+++ b/kdecore/kkeynative_x11.cpp
@@ -181,7 +181,7 @@ int KKeyNative::keyCodeQt() const
 {
 	int keyQt = KKeyServer::Sym(m_sym).qt(), modQt;
 
-	if( keyQt != Qt::Key_unknown && KKeyServer::modXToModQt( m_mod, modQt ) )
+	if( keyQt != TQt::Key_unknown && KKeyServer::modXToModQt( m_mod, modQt ) )
 		return keyQt | modQt;
 
 	return 0;
diff --git a/kdecore/kkeyserver_x11.cpp b/kdecore/kkeyserver_x11.cpp
index 96bd7d67d..8263d2735 100644
--- a/kdecore/kkeyserver_x11.cpp
+++ b/kdecore/kkeyserver_x11.cpp
@@ -490,7 +490,7 @@ int Sym::qt() const
 		if( g_rgQtToSymX[i].keySymX == m_sym )
 			return g_rgQtToSymX[i].keySymQt;
 #endif
-	return Qt::Key_unknown;
+	return TQt::Key_unknown;
 }
 
 TQString Sym::toString( bool bUserSpace ) const
@@ -646,7 +646,7 @@ bool symToKeyQt( uint keySym, int& keyQt )
 {
 	Sym sym( keySym );
 	keyQt = sym.qt();
-	return (keyQt != Qt::Key_unknown);
+	return (keyQt != TQt::Key_unknown);
 }
 
 bool modToModQt( uint mod, int& modQt )
-- 
cgit v1.2.1