From koffice-devel  Sat Dec 04 14:34:52 2010
From: Dag Andersen <danders () get2net ! dk>
Date: Sat, 04 Dec 2010 14:34:52 +0000
To: koffice-devel
Subject: Review request: Fix for "problem with linking in Solaris"
Message-Id: <201012041534.52618.danders () get2net ! dk>
X-MARC-Message: https://marc.info/?l=koffice-devel&m=129147334924873
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary-00=_MGl+McIURGBWu4/"

--Boundary-00=_MGl+McIURGBWu4/
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit

Following patch fixes problem.
Tested by reporter.
Ok to commit to branch?
-- 
Mvh.
Dag Andersen

--Boundary-00=_MGl+McIURGBWu4/
Content-Type: text/x-patch;
  charset="UTF-8";
  name="registermetatype.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="registermetatype.diff"

Index: main.cpp
===================================================================
--- main.cpp	(revision 1194491)
+++ main.cpp	(working copy)
@@ -19,23 +19,11 @@
 
 #include "kptaboutdata.h"
 
-#include "kptschedule.h"
-
 #include <kdemacros.h>
 #include <KoApplication.h>
 #include <kcmdlineargs.h>
 
-namespace KPlato
-{
 
-void registerMetaTypes()
-{
-    qRegisterMetaType<Schedule::Log>("Schedule::Log");
-}
-
-}  //KPlato namespace
-
-
 extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) {
     KAboutData * aboutData=KPlato::newAboutData();
 
@@ -50,8 +38,6 @@
     if (!app.start())
 	return 1;
 
-    KPlato::registerMetaTypes();
-
     app.exec();
 
     delete (aboutData);
Index: libs/kernel/kptschedulerplugin.cpp
===================================================================
--- libs/kernel/kptschedulerplugin.cpp	(revision 1194491)
+++ libs/kernel/kptschedulerplugin.cpp	(working copy)
@@ -43,6 +43,9 @@
     : QObject(parent),
     d( new SchedulerPlugin::Private() )
 {
+    // register Schedule::Log so it can be used in queued connections
+    qRegisterMetaType<Schedule::Log>("Schedule::Log");
+
     m_synctimer.setInterval( 500 );
     connect(&m_synctimer, SIGNAL(timeout()), SLOT(slotSyncData()));
 }

--Boundary-00=_MGl+McIURGBWu4/
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel

--Boundary-00=_MGl+McIURGBWu4/--