diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp
index 756e77a..3401711 100644
--- a/kparts/browserextension.cpp
+++ b/kparts/browserextension.cpp
@@ -737,7 +737,7 @@ BrowserExtension::ActionSlotMap * BrowserExtension::actionSlotMapPtr()
 
 BrowserExtension *BrowserExtension::childObject( QObject *obj )
 {
-    return KGlobal::findDirectChild<KParts::BrowserExtension *>(obj);
+    return obj->findChild<KParts::BrowserExtension *>();
 }
 
 namespace KParts
@@ -788,7 +788,7 @@ bool BrowserHostExtension::openUrlInFrame( const QUrl &,
 
 BrowserHostExtension *BrowserHostExtension::childObject( QObject *obj )
 {
-    return KGlobal::findDirectChild<KParts::BrowserHostExtension *>(obj);
+    return obj->findChild<KParts::BrowserHostExtension *>();
 }
 
 BrowserHostExtension *
@@ -820,6 +820,6 @@ void LiveConnectExtension::unregister( const unsigned long ) {}
 
 LiveConnectExtension *LiveConnectExtension::childObject( QObject *obj )
 {
-    return KGlobal::findDirectChild<KParts::LiveConnectExtension *>(obj);
+    return obj->findChild<rParts::LiveConnectExtension *>();
 }
 
diff --git a/kparts/fileinfoextension.cpp b/kparts/fileinfoextension.cpp
index 030d30e..48a0661 100644
--- a/kparts/fileinfoextension.cpp
+++ b/kparts/fileinfoextension.cpp
@@ -35,7 +35,7 @@ KParts::FileInfoExtension::~FileInfoExtension()
 
 KParts::FileInfoExtension* KParts::FileInfoExtension::childObject(QObject* obj)
 {
-    return KGlobal::findDirectChild<KParts::FileInfoExtension*>(obj);
+    return obj->findChild<KParts::FileInfoExtension*>();
 }
 
 KParts::FileInfoExtension::QueryModes KParts::FileInfoExtension::supportedQueryModes() const
diff --git a/kparts/htmlextension.cpp b/kparts/htmlextension.cpp
index 0025473..d1df222 100644
--- a/kparts/htmlextension.cpp
+++ b/kparts/htmlextension.cpp
@@ -43,7 +43,7 @@ bool HtmlExtension::hasSelection() const
 
 HtmlExtension * KParts::HtmlExtension::childObject( QObject *obj )
 {
-    return KGlobal::findDirectChild<KParts::HtmlExtension *>(obj);
+    return obj->findChild<KParts::HtmlExtension *>();
 }
 
 SelectorInterface::QueryMethods SelectorInterface::supportedQueryMethods() const
diff --git a/kparts/listingextension.cpp b/kparts/listingextension.cpp
index 8956084..e2ad2a1 100644
--- a/kparts/listingextension.cpp
+++ b/kparts/listingextension.cpp
@@ -35,7 +35,7 @@ KParts::ListingFilterExtension::~ListingFilterExtension()
 
 KParts::ListingFilterExtension* KParts::ListingFilterExtension::childObject (QObject* obj)
 {
-    return KGlobal::findDirectChild<KParts::ListingFilterExtension*>(obj);
+    return obj->findChild<KParts::ListingFilterExtension*>();
 }
 
 KParts::ListingFilterExtension::FilterModes KParts::ListingFilterExtension::supportedFilterModes() const
@@ -61,7 +61,7 @@ KParts::ListingNotificationExtension::~ListingNotificationExtension()
 
 KParts::ListingNotificationExtension* KParts::ListingNotificationExtension::childObject(QObject* obj)
 {
-    return KGlobal::findDirectChild<KParts::ListingNotificationExtension*>(obj);
+    return obj->findChild<KParts::ListingNotificationExtension*>();
 }
 
 KParts::ListingNotificationExtension::NotificationEventTypes KParts::ListingNotificationExtension::supportedNotificationEventTypes() const
diff --git a/kparts/scriptableextension.cpp b/kparts/scriptableextension.cpp
index 8c50f4b..f38568c 100644
--- a/kparts/scriptableextension.cpp
+++ b/kparts/scriptableextension.cpp
@@ -42,7 +42,7 @@ ScriptableExtension::~ScriptableExtension()
 
 ScriptableExtension* ScriptableExtension::childObject(QObject* obj)
 {
-    return KGlobal::findDirectChild<KParts::ScriptableExtension*>(obj);
+    return obj->findChild<KParts::ScriptableExtension*>();
 }
 
 ScriptableExtension* ScriptableExtension::adapterFromLiveConnect(QObject* parentObj,
diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp
index b2c0477..3261e1e 100644
--- a/kparts/statusbarextension.cpp
+++ b/kparts/statusbarextension.cpp
@@ -112,7 +112,7 @@ StatusBarExtension::~StatusBarExtension()
 
 StatusBarExtension *StatusBarExtension::childObject( QObject *obj )
 {
-    return KGlobal::findDirectChild<KParts::StatusBarExtension*>(obj);
+    return obj->findChild<KParts::StatusBarExtension*>();
 }
 
 bool StatusBarExtension::eventFilter(QObject * watched, QEvent* ev)
diff --git a/kparts/textextension.cpp b/kparts/textextension.cpp
index 81068b9..8a95425 100644
--- a/kparts/textextension.cpp
+++ b/kparts/textextension.cpp
@@ -47,7 +47,7 @@ QString KParts::TextExtension::completeText(Format) const
 
 KParts::TextExtension * KParts::TextExtension::childObject(QObject *obj)
 {
-    return KGlobal::findDirectChild<KParts::TextExtension *>(obj);
+    return obj->findChild<KParts::TextExtension *>();
 }
 
 int KParts::TextExtension::pageCount() const