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

List:       kde-commits
Subject:    KDE/kdepim/korganizer
From:       Allen Winter <winter () kde ! org>
Date:       2008-05-06 21:50:52
Message-ID: 1210110652.598763.5016.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 804771 by winterz:

pass the KAboutData to the factory so it can be accessed later,
like by Kontact's about dialog.  This seems a bit hacky, not
sure if there's a better way to write this.


 M  +8 -6      korganizer_part.cpp  
 M  +0 -4      korganizer_part.h  


--- trunk/KDE/kdepim/korganizer/korganizer_part.cpp #804770:804771
@@ -55,8 +55,15 @@
 #include <QLayout>
 #include <QVBoxLayout>
 
+
+static KAboutData createAboutData()
+{
+  static KOrg::AboutData about;
+  return about;
+}
+
 K_PLUGIN_FACTORY( KOrganizerFactory, registerPlugin<KOrganizerPart>(); )
-K_EXPORT_PLUGIN( KOrganizerFactory( "korganizer" ) )
+K_EXPORT_PLUGIN( KOrganizerFactory( createAboutData() ) )
 
 KOrganizerPart::KOrganizerPart( QWidget *parentWidget, QObject *parent, const QVariantList & )
   : KParts::ReadOnlyPart(parent), mTopLevelWidget( parentWidget->topLevelWidget() )
@@ -126,11 +133,6 @@
   KOCore::self()->removeXMLGUIClient( mTopLevelWidget );
 }
 
-KAboutData *KOrganizerPart::createAboutData()
-{
-  return new KOrg::AboutData;
-}
-
 void KOrganizerPart::slotChangeInfo( Incidence *incidence )
 {
   if ( incidence ) {
--- trunk/KDE/kdepim/korganizer/korganizer_part.h #804770:804771
@@ -30,8 +30,6 @@
 
 #include <korganizer/mainwindow.h>
 
-class KAboutData;
-
 class CalendarView;
 class ActionManager;
 
@@ -55,8 +53,6 @@
     KOrganizerPart( QWidget *parentWidget, QObject *parent, const QVariantList & );
     virtual ~KOrganizerPart();
 
-    static KAboutData *createAboutData();
-
     virtual KOrg::CalendarViewBase *view() const;
 
     /** Load calendar file from URL. Merge into current calendar, if \a merge is true.
[prev in list] [next in list] [prev in thread] [next in thread]