Index: korganizer/korganizer_part.h
===================================================================
--- korganizer/korganizer_part.h	(revision 782948)
+++ korganizer/korganizer_part.h	(working copy)
@@ -52,7 +52,7 @@
 {
   Q_OBJECT
   public:
-    KOrganizerPart( QWidget *parentWidget, QObject *parent, const QStringList & );
+    KOrganizerPart( QWidget *parentWidget, QObject *parent, const QVariantList & );
     virtual ~KOrganizerPart();
 
     static KAboutData *createAboutData();
Index: korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
===================================================================
--- korganizer/plugins/printing/whatsnext/whatsnextprint.cpp	(revision 782948)
+++ korganizer/plugins/printing/whatsnext/whatsnextprint.cpp	(working copy)
@@ -39,14 +39,9 @@
 
 #include <QButtonGroup>
 
-class WhatsNextPrintFactory : public KOrg::PrintPluginFactory {
-  public:
-    KOrg::PrintPlugin *createPluginFactory() { return new CalPrintWhatsNext; }
-};
+K_PLUGIN_FACTORY(WhatsNextPrintFactory, registerPlugin<CalPrintWhatsNext>();)
+K_EXPORT_PLUGIN(WhatsNextPrintFactory( "korg_whatsnextprint" ))
 
-K_EXPORT_COMPONENT_FACTORY( korg_whatsnextprint, WhatsNextPrintFactory )
-
-
 /**************************************************************
  *           Print What's Next
  **************************************************************/
Index: korganizer/plugins/printing/list/listprint.cpp
===================================================================
--- korganizer/plugins/printing/list/listprint.cpp	(revision 782948)
+++ korganizer/plugins/printing/list/listprint.cpp	(working copy)
@@ -39,15 +39,9 @@
 
 #include <QButtonGroup>
 
-class ListPrintFactory : public KOrg::PrintPluginFactory {
-  public:
-    KOrg::PrintPlugin *createPluginFactory() { return new CalPrintList; }
-};
+K_PLUGIN_FACTORY(ListPrintFactory, registerPlugin<CalPrintList>();)
+K_EXPORT_PLUGIN(ListPrintFactory( "korg_listprint" ))
 
-K_EXPORT_COMPONENT_FACTORY( korg_listprint, ListPrintFactory )
-
-
-
 /**************************************************************
  *           Print Day
  **************************************************************/
Index: korganizer/plugins/timespanview/timespanview.cpp
===================================================================
--- korganizer/plugins/timespanview/timespanview.cpp	(revision 782948)
+++ korganizer/plugins/timespanview/timespanview.cpp	(working copy)
@@ -34,17 +34,9 @@
 using namespace KOrg;
 #include "timespanview.moc"
 
-class TimespanViewFactory : public KOrg::PartFactory {
-  public:
-    KOrg::Part *createPluginFactory( KOrg::MainWindow *parent )
-    {
-      return new TimespanView( parent );
-    }
-};
+K_PLUGIN_FACTORY(TimespanViewFactory, registerPlugin<TimespanView>();)
+K_EXPORT_PLUGIN(TimespanViewFactory( "korg_timespanview" ))
 
-K_EXPORT_COMPONENT_FACTORY( korg_timespanview, TimespanViewFactory )
-
-
 TimespanView::TimespanView(KOrg::MainWindow *parent ) : KOrg::Part(parent), mView(0)
 {
   setComponentData( KComponentData( "korganizer" ) );
Index: korganizer/korganizer_part.cpp
===================================================================
--- korganizer/korganizer_part.cpp	(revision 782948)
+++ korganizer/korganizer_part.cpp	(working copy)
@@ -59,11 +59,11 @@
 //Added by qt3to4:
 #include <QVBoxLayout>
 
-typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory;
-K_EXPORT_COMPONENT_FACTORY( korganizerpart, KOrganizerFactory )
+K_PLUGIN_FACTORY(KOrganizerFactory, registerPlugin<KOrganizerPart>();)
+K_EXPORT_PLUGIN(KOrganizerFactory( "korganizerpart" ))
 
 KOrganizerPart::KOrganizerPart( QWidget *parentWidget, QObject *parent,
-                                const QStringList & ) :
+                                const QVariantList & ) :
   KParts::ReadOnlyPart(parent), mTopLevelWidget( parentWidget->topLevelWidget() )
 {
   KGlobal::locale()->insertCatalog( "libkcal" );
