[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/apps
From:       Alex Merry <huntedhacker () tiscali ! co ! uk>
Date:       2007-08-31 22:52:53
Message-ID: 1188600773.276942.9335.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 707067 by alexmerry:

deprecated--



 M  +1 -1      dolphin/src/terminalsidebarpage.cpp  
 M  +3 -3      keditbookmarks/actionsimpl.cpp  
 M  +3 -3      keditbookmarks/updater.cpp  
 M  +1 -1      lib/konq/konq_popupmenu.cc  


--- trunk/KDE/kdebase/apps/dolphin/src/terminalsidebarpage.cpp #707066:707067
@@ -65,7 +65,7 @@
     }
 
     if (m_terminal == 0) {
-        KPluginFactory* factory = KLibLoader::self()->factory("libkonsolepart");
+        KPluginFactory* factory = KPluginLoader("libkonsolepart").factory();
         KParts::ReadOnlyPart* part = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
         if (part != 0) {
             m_layout->addWidget(part->widget());
--- trunk/KDE/kdebase/apps/keditbookmarks/actionsimpl.cpp #707066:707067
@@ -55,7 +55,7 @@
 #include <ktoggleaction.h>
 
 #include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <kservicetypetrader.h>
 
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
@@ -470,8 +470,8 @@
 
 void ActionsImpl::slotPrint() {
     KEBApp::self()->bkInfo()->commitChanges();
-    s_part = KParts::ComponentFactory
-                        ::createPartInstanceFromQuery<KParts::ReadOnlyPart>(
+    s_part = KServiceTypeTrader
+                        ::createInstanceFromQuery<KParts::ReadOnlyPart>(
                                 "text/html", QString());
     s_part->setProperty("pluginsEnabled", QVariant(false));
     s_part->setProperty("javaScriptEnabled", QVariant(false));
--- trunk/KDE/kdebase/apps/keditbookmarks/updater.cpp #707066:707067
@@ -31,8 +31,8 @@
 
 #include <kmimetype.h>
 #include <kparts/part.h>
-#include <kparts/componentfactory.h>
 #include <kparts/browserextension.h>
+#include <kservicetypetrader.h>
 #include <assert.h>
 
 FavIconUpdater::FavIconUpdater(QObject *parent)
@@ -79,8 +79,8 @@
 
     if (!m_part) {
         KParts::ReadOnlyPart *part
-            = KParts::ComponentFactory
-            ::createPartInstanceFromQuery<KParts::ReadOnlyPart>("text/html", QString());
+            = KServiceTypeTrader
+            ::createInstanceFromQuery<KParts::ReadOnlyPart>("text/html", QString());
 
         part->setProperty("pluginsEnabled", QVariant(false));
         part->setProperty("javaScriptEnabled", QVariant(false));
--- trunk/KDE/kdebase/apps/lib/konq/konq_popupmenu.cc #707066:707067
@@ -33,12 +33,12 @@
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <kglobalsettings.h>
+#include <kmimetypetrader.h>
 #include <kstandarddirs.h>
 #include <kxmlguifactory.h>
 #include <kxmlguibuilder.h>
 #include <kconfiggroup.h>
 #include <kdesktopfile.h>
-#include <kparts/componentfactory.h>
 #include <kfileshare.h>
 #include <kauthorized.h>
 #include <kglobal.h>
[prev in list] [next in list] [prev in thread] [next in thread]