X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/03f4481bdfb8e96b26acfccbf2b2bc780b060cf2..fcafd387f7905f91c86b0459409c72e4bfe52ba1:/src/dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index e155573cc..deee4af94 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -25,28 +25,31 @@
 
 #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)
-    setComponentData( DolphinPartFactory::componentData() );
+    setComponentData(DolphinPartFactory::componentData(), false);
     m_extension = new DolphinPartBrowserExtension(this);
 
     // make sure that other apps using this part find Dolphin's view-file-columns icons
@@ -110,6 +113,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringLi
 
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
+
+    loadPlugins(this, this, componentData());
 }
 
 DolphinPart::~DolphinPart()
@@ -217,6 +222,7 @@ bool DolphinPart::openUrl(const KUrl& url)
     emit m_extension->setLocationBarUrl(prettyUrl);
     emit started(0); // get the wheel to spin
     m_view->setUrl(url);
+    emit aboutToOpenURL();
     if (reload)
         m_view->reload();
     return true;