Permalink
Browse files

Refactor of datacontracts so the compile with Qt5.

The qRegisterMetaType<> must come after Q_DECLARE_METATYPE().
  • Loading branch information...
daniel-kristjansson committed Feb 26, 2013
1 parent f894ecb commit b2d243a3e0ac8938e6a8cabe54d5f2f44a4ed1dc
Showing with 449 additions and 256 deletions.
  1. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/artworkInfo.h
  2. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/artworkInfoList.h
  3. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/blurayInfo.h
  4. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/captureCard.h
  5. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/captureCardList.h
  6. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/channelInfoList.h
  7. +14 −9 mythtv/libs/libmythservicecontracts/datacontracts/connectionInfo.h
  8. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/databaseInfo.h
  9. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/encoder.h
  10. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/encoderList.h
  11. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/frontendActionList.h
  12. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/frontendStatus.h
  13. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/labelValue.h
  14. +19 −12 mythtv/libs/libmythservicecontracts/datacontracts/lineup.h
  15. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/liveStreamInfo.h
  16. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/liveStreamInfoList.h
  17. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/logMessage.h
  18. +13 −8 mythtv/libs/libmythservicecontracts/datacontracts/logMessageList.h
  19. +23 −19 mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h
  20. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/programGuide.h
  21. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/programList.h
  22. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/recRule.h
  23. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/recRuleList.h
  24. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/recording.h
  25. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/settingList.h
  26. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/storageGroupDir.h
  27. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/storageGroupDirList.h
  28. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/timeZoneInfo.h
  29. +9 −5 mythtv/libs/libmythservicecontracts/datacontracts/versionInfo.h
  30. +19 −12 mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfo.h
  31. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfoList.h
  32. +13 −8 mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfo.h
  33. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfoList.h
  34. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/videoMultiplex.h
  35. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/videoMultiplexList.h
  36. +10 −5 mythtv/libs/libmythservicecontracts/datacontracts/videoSource.h
  37. +12 −7 mythtv/libs/libmythservicecontracts/datacontracts/videoSourceList.h
  38. +9 −5 mythtv/libs/libmythservicecontracts/datacontracts/wolInfo.h
  39. +2 −0 mythtv/libs/libmythservicecontracts/libmythservicecontracts.pro
@@ -38,11 +38,7 @@ class SERVICE_PUBLIC ArtworkInfo : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< ArtworkInfo >();
qRegisterMetaType< ArtworkInfo* >();
}
static inline void InitializeCustomTypes();
public:
@@ -70,4 +66,13 @@ class SERVICE_PUBLIC ArtworkInfo : public QObject
Q_DECLARE_METATYPE( DTC::ArtworkInfo )
Q_DECLARE_METATYPE( DTC::ArtworkInfo* )
namespace DTC
{
inline void ArtworkInfo::InitializeCustomTypes()
{
qRegisterMetaType< ArtworkInfo >();
qRegisterMetaType< ArtworkInfo* >();
}
}
#endif
@@ -38,13 +38,7 @@ class SERVICE_PUBLIC ArtworkInfoList : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< ArtworkInfoList >();
qRegisterMetaType< ArtworkInfoList* >();
ArtworkInfo::InitializeCustomTypes();
}
static inline void InitializeCustomTypes();
public:
@@ -81,4 +75,15 @@ class SERVICE_PUBLIC ArtworkInfoList : public QObject
Q_DECLARE_METATYPE( DTC::ArtworkInfoList )
Q_DECLARE_METATYPE( DTC::ArtworkInfoList* )
namespace DTC
{
inline void ArtworkInfoList::InitializeCustomTypes()
{
qRegisterMetaType< ArtworkInfoList >();
qRegisterMetaType< ArtworkInfoList* >();
ArtworkInfo::InitializeCustomTypes();
}
}
#endif
@@ -70,11 +70,7 @@ class SERVICE_PUBLIC BlurayInfo : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< BlurayInfo >();
qRegisterMetaType< BlurayInfo* >();
}
static inline void InitializeCustomTypes();
public:
@@ -108,4 +104,13 @@ class SERVICE_PUBLIC BlurayInfo : public QObject
Q_DECLARE_METATYPE( DTC::BlurayInfo )
Q_DECLARE_METATYPE( DTC::BlurayInfo* )
namespace DTC
{
inline void BlurayInfo::InitializeCustomTypes()
{
qRegisterMetaType< BlurayInfo >();
qRegisterMetaType< BlurayInfo* >();
}
}
#endif
@@ -80,11 +80,7 @@ class SERVICE_PUBLIC CaptureCard : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< CaptureCard >();
qRegisterMetaType< CaptureCard* >();
}
static inline void InitializeCustomTypes();
public:
@@ -140,4 +136,13 @@ class SERVICE_PUBLIC CaptureCard : public QObject
Q_DECLARE_METATYPE( DTC::CaptureCard )
Q_DECLARE_METATYPE( DTC::CaptureCard* )
namespace DTC
{
inline void CaptureCard::InitializeCustomTypes()
{
qRegisterMetaType< CaptureCard >();
qRegisterMetaType< CaptureCard* >();
}
}
#endif
@@ -37,13 +37,7 @@ class SERVICE_PUBLIC CaptureCardList : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< CaptureCardList >();
qRegisterMetaType< CaptureCardList* >();
CaptureCard::InitializeCustomTypes();
}
static inline void InitializeCustomTypes();
public:
@@ -80,4 +74,15 @@ class SERVICE_PUBLIC CaptureCardList : public QObject
Q_DECLARE_METATYPE( DTC::CaptureCardList )
Q_DECLARE_METATYPE( DTC::CaptureCardList* )
namespace DTC
{
inline void CaptureCardList::InitializeCustomTypes()
{
qRegisterMetaType< CaptureCardList >();
qRegisterMetaType< CaptureCardList* >();
CaptureCard::InitializeCustomTypes();
}
}
#endif
@@ -46,13 +46,7 @@ class SERVICE_PUBLIC ChannelInfoList : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< ChannelInfoList >();
qRegisterMetaType< ChannelInfoList* >();
ChannelInfo::InitializeCustomTypes();
}
static void InitializeCustomTypes();
public:
@@ -99,4 +93,15 @@ class SERVICE_PUBLIC ChannelInfoList : public QObject
Q_DECLARE_METATYPE( DTC::ChannelInfoList )
Q_DECLARE_METATYPE( DTC::ChannelInfoList* )
namespace DTC
{
inline void ChannelInfoList::InitializeCustomTypes()
{
qRegisterMetaType< ChannelInfoList >();
qRegisterMetaType< ChannelInfoList* >();
ChannelInfo::InitializeCustomTypes();
}
}
#endif
@@ -37,15 +37,7 @@ class SERVICE_PUBLIC ConnectionInfo : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< ConnectionInfo >();
qRegisterMetaType< ConnectionInfo* >();
VersionInfo ::InitializeCustomTypes();
DatabaseInfo::InitializeCustomTypes();
WOLInfo ::InitializeCustomTypes();
}
static inline void InitializeCustomTypes();
public:
@@ -88,4 +80,17 @@ typedef ConnectionInfo* ConnectionInfoPtr;
Q_DECLARE_METATYPE( DTC::ConnectionInfo )
Q_DECLARE_METATYPE( DTC::ConnectionInfo* )
namespace DTC
{
inline void ConnectionInfo::InitializeCustomTypes()
{
qRegisterMetaType< ConnectionInfo >();
qRegisterMetaType< ConnectionInfo* >();
VersionInfo ::InitializeCustomTypes();
DatabaseInfo::InitializeCustomTypes();
WOLInfo ::InitializeCustomTypes();
}
}
#endif
@@ -46,11 +46,7 @@ class SERVICE_PUBLIC DatabaseInfo : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< DatabaseInfo >();
qRegisterMetaType< DatabaseInfo* >();
}
static inline void InitializeCustomTypes();
public:
@@ -88,4 +84,13 @@ typedef DatabaseInfo * DatabaseInfoPtr;
Q_DECLARE_METATYPE( DTC::DatabaseInfo )
Q_DECLARE_METATYPE( DTC::DatabaseInfo* )
namespace DTC
{
inline void DatabaseInfo::InitializeCustomTypes()
{
qRegisterMetaType< DatabaseInfo >();
qRegisterMetaType< DatabaseInfo* >();
}
}
#endif
@@ -50,13 +50,7 @@ class SERVICE_PUBLIC Encoder : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< Encoder >();
qRegisterMetaType< Encoder* >();
Program::InitializeCustomTypes();
}
static inline void InitializeCustomTypes();
public:
@@ -99,4 +93,15 @@ class SERVICE_PUBLIC Encoder : public QObject
Q_DECLARE_METATYPE( DTC::Encoder )
Q_DECLARE_METATYPE( DTC::Encoder* )
namespace DTC
{
inline void Encoder::InitializeCustomTypes()
{
qRegisterMetaType< Encoder >();
qRegisterMetaType< Encoder* >();
Program::InitializeCustomTypes();
}
}
#endif
@@ -37,13 +37,7 @@ class SERVICE_PUBLIC EncoderList : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< EncoderList >();
qRegisterMetaType< EncoderList* >();
Encoder::InitializeCustomTypes();
}
static inline void InitializeCustomTypes();
public:
@@ -80,4 +74,15 @@ class SERVICE_PUBLIC EncoderList : public QObject
Q_DECLARE_METATYPE( DTC::EncoderList )
Q_DECLARE_METATYPE( DTC::EncoderList* )
namespace DTC
{
inline void EncoderList::InitializeCustomTypes()
{
qRegisterMetaType< EncoderList >();
qRegisterMetaType< EncoderList* >();
Encoder::InitializeCustomTypes();
}
}
#endif
@@ -18,11 +18,7 @@ namespace DTC
PROPERTYIMP_RO_REF(QVariantMap, ActionList)
public:
static void InitializeCustomTypes()
{
qRegisterMetaType<FrontendActionList>();
qRegisterMetaType<FrontendActionList*>();
}
static inline void InitializeCustomTypes();
public:
FrontendActionList(QObject *parent = 0) : QObject(parent)
@@ -44,4 +40,13 @@ namespace DTC
Q_DECLARE_METATYPE(DTC::FrontendActionList)
Q_DECLARE_METATYPE(DTC::FrontendActionList*)
namespace DTC
{
inline void FrontendActionList::InitializeCustomTypes()
{
qRegisterMetaType<FrontendActionList>();
qRegisterMetaType<FrontendActionList*>();
}
}
#endif // FRONTENDACTIONLIST_H
@@ -27,11 +27,7 @@ namespace DTC
PROPERTYIMP_RO_REF(QVariantMap, AudioTracks)
public:
static void InitializeCustomTypes()
{
qRegisterMetaType<FrontendStatus>();
qRegisterMetaType<FrontendStatus*>();
}
static inline void InitializeCustomTypes();
public:
FrontendStatus(QObject *parent = 0) : QObject(parent)
@@ -80,4 +76,13 @@ namespace DTC
Q_DECLARE_METATYPE(DTC::FrontendStatus)
Q_DECLARE_METATYPE(DTC::FrontendStatus*)
namespace DTC
{
inline void FrontendStatus::InitializeCustomTypes()
{
qRegisterMetaType<FrontendStatus>();
qRegisterMetaType<FrontendStatus*>();
}
}
#endif // FRONTENDSTATUS_H
@@ -40,11 +40,7 @@ class SERVICE_PUBLIC LabelValue : public QObject
public:
static void InitializeCustomTypes()
{
qRegisterMetaType< LabelValue >();
qRegisterMetaType< LabelValue* >();
}
static inline void InitializeCustomTypes();
public:
@@ -78,4 +74,13 @@ class SERVICE_PUBLIC LabelValue : public QObject
Q_DECLARE_METATYPE( DTC::LabelValue )
Q_DECLARE_METATYPE( DTC::LabelValue* )
namespace DTC
{
inline void LabelValue::InitializeCustomTypes()
{
qRegisterMetaType< LabelValue >();
qRegisterMetaType< LabelValue* >();
}
}
#endif
Oops, something went wrong.

0 comments on commit b2d243a

Please sign in to comment.