Review request: Fix for "problem with linking in Solaris"
Dag Andersen <[email protected]> Sat, 4 Dec 2010 15:34:52 +0100
| Newsgroups | gmane.comp.kde.devel.koffice |
|---|---|
| Message-ID | <[email protected]> |
Following patch fixes problem. Tested by reporter. Ok to commit to branch? -- Mvh. Dag Andersen _______________________________________________ koffice-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/koffice-devel
registermetatype.diff
(text/x-patch, 1.2 KB)
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()));
}