Move qRegisterMetaType<> to after Q_DECLARE_METATYPE() in 'Service'.

MythTV · Mar 8, 2013 · 32435cc · 32435cc
1 parent c25b33a
commit 32435cc
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/mythtv/libs/libmythservicecontracts/service.h b/mythtv/libs/libmythservicecontracts/service.h
@@ -45,10 +45,7 @@ class SERVICE_PUBLIC Service : public QObject
 
     public:
 
-        Service( QObject *parent = 0 ) : QObject( parent ) 
-        {
-            qRegisterMetaType< QFileInfo   >();
-        }
+        inline Service( QObject *parent = NULL );
 
     public:
 
@@ -72,7 +69,13 @@ class SERVICE_PUBLIC Service : public QObject
 //////////////////////////////////////////////////////////////////////////////
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_DECLARE_METATYPE( QFileInfo  )
+Q_DECLARE_METATYPE( QFileInfo )
+inline Service::Service(QObject *parent) : QObject(parent)
+{
+    qRegisterMetaType< QFileInfo >();
+}
+#else
+inline Service::Service(QObject *parent) : QObject(parent) {}
 #endif
 
 #endif