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

List:       kde-commits
Subject:    koffice/libs/main
From:       David Faure <faure () kde ! org>
Date:       2010-11-03 21:41:15
Message-ID: 20101103214115.BCAA2AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192731 by dfaure:

Resurrect the plugin for the properties dialog, and port its factory away from \
KGenericFactory. However it still uses KTar... :/


 M  +11 -0     CMakeLists.txt  
 M  +11 -3     KoDocInfoPropsFactory.cpp  
 M  +1 -1      KoDocumentInfoPropsPage.cpp  
 M  +1 -1      KoDocumentInfoPropsPage.h  
 A             kodocinfopropspage.desktop   kodocinfopropspage.desktop#1053367 \
[TRAILING SPACE]


--- trunk/koffice/libs/main/CMakeLists.txt #1192730:1192731
@@ -156,8 +156,19 @@
 )
 install(TARGETS komain ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
+########### plugin for the properties dialog ###############
+
+set(kodocinfopropspage_PART_SRCS KoDocInfoPropsFactory.cpp )
+
+kde4_add_plugin(kodocinfopropspage ${kodocinfopropspage_PART_SRCS})
+
+target_link_libraries(kodocinfopropspage  ${KDE4_KIO_LIBS} komain )
+
+install(TARGETS kodocinfopropspage DESTINATION ${PLUGIN_INSTALL_DIR} )
+
 ########### install files ###############
 
+install(FILES kodocinfopropspage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install(FILES kofficedocker.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install(FILES koffice_shell.rc DESTINATION ${DATA_INSTALL_DIR}/koffice )
 install( FILES
--- trunk/koffice/libs/main/KoDocInfoPropsFactory.cpp #1192730:1192731
@@ -21,7 +21,15 @@
 
 #include <KoDocumentInfoPropsPage.h>
 
-#include <kgenericfactory.h>
+#include <kpluginfactory.h>
 
-typedef KGenericFactory<KoDocumentInfoPropsPage, KPropertiesDialog> PropsDlgFactory;
-K_EXPORT_COMPONENT_FACTORY(kodocinfopropspage, PropsDlgFactory("koffice"))
+static QObject* createDocInfoPropsPage(QWidget* w, QObject* parent, const \
QVariantList& args) +{
+    Q_UNUSED(w);
+    KPropertiesDialog* props = qobject_cast<KPropertiesDialog *>(parent);
+    Q_ASSERT(props);
+    return new KoDocumentInfoPropsPage(props, args);
+}
+
+K_PLUGIN_FACTORY(PropsDlgFactory, registerPlugin<KoDocumentInfoPropsPage>(QString(), \
createDocInfoPropsPage);) +K_EXPORT_PLUGIN(PropsDlgFactory("koffice"))
--- trunk/koffice/libs/main/KoDocumentInfoPropsPage.cpp #1192730:1192731
@@ -51,7 +51,7 @@
 };
 
 KoDocumentInfoPropsPage::KoDocumentInfoPropsPage(KPropertiesDialog *props,
-        const QStringList &)
+        const QVariantList &)
         : KPropertiesDialogPlugin(props)
         , d(new KoDocumentInfoPropsPagePrivate)
 {
--- trunk/koffice/libs/main/KoDocumentInfoPropsPage.h #1192730:1192731
@@ -32,7 +32,7 @@
 
 public:
     explicit KoDocumentInfoPropsPage(KPropertiesDialog *props,
-                                     const QStringList & = QStringList());
+                                     const QVariantList & = QVariantList());
     virtual ~KoDocumentInfoPropsPage();
 
     virtual void applyChanges();


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