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

List:       koffice-devel
Subject:    Review request: Fix for "problem with linking in Solaris"
From:       Dag Andersen <danders () get2net ! dk>
Date:       2010-12-04 14:34:52
Message-ID: 201012041534.52618.danders () get2net ! dk
[Download RAW message or body]

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

["registermetatype.diff" (text/x-patch)]

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()));
 }


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


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