From: David Faure <faure@kde.org>
Date: Thu, 17 Apr 2008 21:49:53 +0000 (+0000)
Subject: Ported dolphinpart to K_PLUGIN_FACTORY
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/fcafd387f7905f91c86b0459409c72e4bfe52ba1

Ported dolphinpart to K_PLUGIN_FACTORY
Ported konqueror's part loading to KPluginLoader. Factorized some code into a tryLoadingService.
If you miss some khtml actions, update kdelibs/kdecore/util.

svn path=/trunk/KDE/kdebase/apps/; revision=798291
---

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 9e6f6047e..deee4af94 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -25,24 +25,27 @@
 
 #include <konq_operations.h>
 
-#include <kpropertiesdialog.h>
-#include <kglobalsettings.h>
+#include <kaboutdata.h>
 #include <kactioncollection.h>
+#include <kconfiggroup.h>
+#include <kdebug.h>
 #include <kdirlister.h>
+#include <kglobalsettings.h>
 #include <kiconloader.h>
+#include <klocale.h>
 #include <kmessagebox.h>
-#include <kparts/genericfactory.h>
+#include <kpluginfactory.h>
+#include <kpropertiesdialog.h>
 #include <ktoggleaction.h>
-#include <kconfiggroup.h>
 
 #include <QActionGroup>
 #include <QApplication>
 #include <QClipboard>
 
-typedef KParts::GenericFactory<DolphinPart> DolphinPartFactory;
-K_EXPORT_COMPONENT_FACTORY(dolphinpart, DolphinPartFactory)
+K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphin"))
 
-DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringList& args)
+DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
 {
     Q_UNUSED(args)
diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 5942d651e..eaf9cb74e 100644
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -46,7 +46,7 @@ class DolphinPart : public KParts::ReadOnlyPart
     Q_PROPERTY( QString currentViewMode READ currentViewMode WRITE setCurrentViewMode )
 
 public:
-    explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QStringList& args);
+    explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args);
     ~DolphinPart();
 
     static KAboutData* createAboutData();