Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ class SERVICE_PUBLIC LiveStreamInfo : public QObject
PROPERTYIMP ( int , CurrentSegment )
PROPERTYIMP ( int , SegmentCount )
PROPERTYIMP ( int , PercentComplete )
PROPERTYIMP ( QDateTime , Created )
PROPERTYIMP ( QDateTime , LastModified )
PROPERTYIMP ( QString , RelativeURL )
PROPERTYIMP ( QString , FullURL )
PROPERTYIMP ( QString , StatusStr )
PROPERTYIMP_REF( QDateTime , Created )
PROPERTYIMP_REF( QDateTime , LastModified )
PROPERTYIMP_REF( QString , RelativeURL )
PROPERTYIMP_REF( QString , FullURL )
PROPERTYIMP_REF( QString , StatusStr )
PROPERTYIMP ( int , StatusInt )
PROPERTYIMP ( QString , StatusMessage )
PROPERTYIMP ( QString , SourceFile )
PROPERTYIMP ( QString , SourceHost )
PROPERTYIMP_REF( QString , StatusMessage )
PROPERTYIMP_REF( QString , SourceFile )
PROPERTYIMP_REF( QString , SourceHost )
PROPERTYIMP ( int , SourceWidth )
PROPERTYIMP ( int , SourceHeight )
PROPERTYIMP ( int , AudioOnlyBitrate );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class SERVICE_PUBLIC LogInfo : public QObject

Q_PROPERTY( QString LogArgs READ LogArgs WRITE setLogArgs )

PROPERTYIMP( QString, LogArgs );
PROPERTYIMP_REF( QString, LogArgs );

public:

Expand Down
22 changes: 11 additions & 11 deletions mythtv/libs/libmythservicecontracts/datacontracts/logMessage.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ class SERVICE_PUBLIC LogMessage : public QObject
Q_PROPERTY( QString Message READ Message
WRITE setMessage )

PROPERTYIMP( QString , HostName )
PROPERTYIMP( QString , Application )
PROPERTYIMP( int , PID )
PROPERTYIMP( int , TID )
PROPERTYIMP( QString , Thread )
PROPERTYIMP( QString , Filename )
PROPERTYIMP( int , Line )
PROPERTYIMP( QString , Function )
PROPERTYIMP( QDateTime, Time )
PROPERTYIMP( QString , Level )
PROPERTYIMP( QString , Message );
PROPERTYIMP_REF( QString , HostName )
PROPERTYIMP_REF( QString , Application )
PROPERTYIMP ( int , PID )
PROPERTYIMP ( int , TID )
PROPERTYIMP_REF( QString , Thread )
PROPERTYIMP_REF( QString , Filename )
PROPERTYIMP ( int , Line )
PROPERTYIMP_REF( QString , Function )
PROPERTYIMP_REF( QDateTime, Time )
PROPERTYIMP_REF( QString , Level )
PROPERTYIMP_REF( QString , Message );

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ class SERVICE_PUBLIC MusicMetadataInfo : public QObject
Q_PROPERTY( bool Compilation READ Compilation WRITE setCompilation )

PROPERTYIMP ( int , Id )
PROPERTYIMP ( QString , Artist )
PROPERTYIMP ( QString , CompilationArtist )
PROPERTYIMP ( QString , Album )
PROPERTYIMP ( QString , Title )
PROPERTYIMP_REF( QString , Artist )
PROPERTYIMP_REF( QString , CompilationArtist )
PROPERTYIMP_REF( QString , Album )
PROPERTYIMP_REF( QString , Title )
PROPERTYIMP ( int , TrackNo )
PROPERTYIMP ( QString , Genre )
PROPERTYIMP_REF( QString , Genre )
PROPERTYIMP ( int , Year )
PROPERTYIMP ( int , PlayCount )
PROPERTYIMP ( int , Length )
PROPERTYIMP ( int , Rating )
PROPERTYIMP ( QString , FileName )
PROPERTYIMP ( QString , HostName )
PROPERTYIMP ( QDateTime , LastPlayed )
PROPERTYIMP_REF( QString , FileName )
PROPERTYIMP_REF( QString , HostName )
PROPERTYIMP_REF( QDateTime , LastPlayed )
PROPERTYIMP ( bool , Compilation )

public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class SERVICE_PUBLIC MusicMetadataInfoList : public QObject
PROPERTYIMP ( int , CurrentPage )
PROPERTYIMP ( int , TotalPages )
PROPERTYIMP ( int , TotalAvailable )
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, MusicMetadataInfos )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,28 @@ class SERVICE_PUBLIC ChannelInfo : public QObject
Q_PROPERTY( QVariantList Programs READ Programs )

PROPERTYIMP ( uint , ChanId )
PROPERTYIMP ( QString , ChanNum )
PROPERTYIMP ( QString , CallSign )
PROPERTYIMP ( QString , IconURL )
PROPERTYIMP ( QString , ChannelName )
PROPERTYIMP_REF ( QString , ChanNum )
PROPERTYIMP_REF ( QString , CallSign )
PROPERTYIMP_REF ( QString , IconURL )
PROPERTYIMP_REF ( QString , ChannelName )
PROPERTYIMP ( uint , MplexId )
PROPERTYIMP ( uint , ServiceId )
PROPERTYIMP ( uint , ATSCMajorChan )
PROPERTYIMP ( uint , ATSCMinorChan )
PROPERTYIMP ( QString , Format )
PROPERTYIMP ( QString , FrequencyId )
PROPERTYIMP_REF ( QString , Format )
PROPERTYIMP_REF ( QString , FrequencyId )
PROPERTYIMP ( int , FineTune )
PROPERTYIMP ( QString , ChanFilters )
PROPERTYIMP_REF ( QString , ChanFilters )
PROPERTYIMP ( int , SourceId )
PROPERTYIMP ( int , InputId )
PROPERTYIMP ( bool , CommFree )
PROPERTYIMP ( bool , UseEIT )
PROPERTYIMP ( bool , Visible )
PROPERTYIMP ( QString , ExtendedVisible )
PROPERTYIMP ( QString , XMLTVID )
PROPERTYIMP ( QString , DefaultAuth )
PROPERTYIMP ( QString , ChannelGroups )
PROPERTYIMP ( QString , Inputs )
PROPERTYIMP_REF ( QString , ExtendedVisible )
PROPERTYIMP_REF ( QString , XMLTVID )
PROPERTYIMP_REF ( QString , DefaultAuth )
PROPERTYIMP_REF ( QString , ChannelGroups )
PROPERTYIMP_REF ( QString , Inputs )
PROPERTYIMP ( uint , ServiceType )

PROPERTYIMP_RO_REF( QVariantList, Programs )
Expand Down Expand Up @@ -185,25 +185,25 @@ class SERVICE_PUBLIC Program : public QObject
Q_PROPERTY( QObject* Artwork READ Artwork )
Q_PROPERTY( QObject* Cast READ Cast )

PROPERTYIMP ( QDateTime , StartTime )
PROPERTYIMP ( QDateTime , EndTime )
PROPERTYIMP ( QString , Title )
PROPERTYIMP ( QString , SubTitle )
PROPERTYIMP ( QString , Category )
PROPERTYIMP ( QString , CatType )
PROPERTYIMP_REF( QDateTime , StartTime )
PROPERTYIMP_REF( QDateTime , EndTime )
PROPERTYIMP_REF( QString , Title )
PROPERTYIMP_REF( QString , SubTitle )
PROPERTYIMP_REF( QString , Category )
PROPERTYIMP_REF( QString , CatType )
PROPERTYIMP ( bool , Repeat )

PROPERTYIMP ( QString , SeriesId )
PROPERTYIMP ( QString , ProgramId )
PROPERTYIMP_REF( QString , SeriesId )
PROPERTYIMP_REF( QString , ProgramId )
PROPERTYIMP ( double , Stars )
PROPERTYIMP ( QDateTime , LastModified )
PROPERTYIMP_REF( QDateTime , LastModified )
PROPERTYIMP ( int , ProgramFlags )
PROPERTYIMP ( int , VideoProps )
PROPERTYIMP ( int , AudioProps )
PROPERTYIMP ( int , SubProps )
PROPERTYIMP ( QDate , Airdate )
PROPERTYIMP ( QString , Description )
PROPERTYIMP ( QString , Inetref )
PROPERTYIMP_REF( QString , Description )
PROPERTYIMP_REF( QString , Inetref )
PROPERTYIMP ( int , Season )
PROPERTYIMP ( int , Episode )
PROPERTYIMP ( int , TotalEpisodes)
Expand All @@ -212,8 +212,8 @@ class SERVICE_PUBLIC Program : public QObject
// DEPRECATED
// These don't belong here, they are Recording only metadata
PROPERTYIMP ( qlonglong , FileSize )
PROPERTYIMP ( QString , FileName )
PROPERTYIMP ( QString , HostName )
PROPERTYIMP_REF( QString , FileName )
PROPERTYIMP_REF( QString , HostName )
// ----

PROPERTYIMP_PTR( ChannelInfo , Channel )
Expand Down
10 changes: 5 additions & 5 deletions mythtv/libs/libmythservicecontracts/datacontracts/programGuide.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ class SERVICE_PUBLIC ProgramGuide : public QObject

Q_PROPERTY( QVariantList Channels READ Channels )

PROPERTYIMP ( QDateTime , StartTime )
PROPERTYIMP ( QDateTime , EndTime )
PROPERTYIMP_REF ( QDateTime , StartTime )
PROPERTYIMP_REF ( QDateTime , EndTime )
PROPERTYIMP ( bool , Details )

PROPERTYIMP ( int , StartIndex )
PROPERTYIMP ( int , Count )
PROPERTYIMP ( int , TotalAvailable)
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, Channels )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class SERVICE_PUBLIC ProgramList : public QObject
PROPERTYIMP ( int , StartIndex )
PROPERTYIMP ( int , Count )
PROPERTYIMP ( int , TotalAvailable )
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, Programs );

Expand Down
42 changes: 21 additions & 21 deletions mythtv/libs/libmythservicecontracts/datacontracts/recRule.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,35 +75,35 @@ class SERVICE_PUBLIC RecRule : public QObject
PROPERTYIMP ( int , Id )
PROPERTYIMP ( int , ParentId )
PROPERTYIMP ( bool , Inactive )
PROPERTYIMP ( QString , Title )
PROPERTYIMP ( QString , SubTitle )
PROPERTYIMP ( QString , Description )
PROPERTYIMP_REF( QString , Title )
PROPERTYIMP_REF( QString , SubTitle )
PROPERTYIMP_REF( QString , Description )
PROPERTYIMP ( uint , Season )
PROPERTYIMP ( uint , Episode )
PROPERTYIMP ( QString , Category )
PROPERTYIMP ( QDateTime , StartTime )
PROPERTYIMP ( QDateTime , EndTime )
PROPERTYIMP ( QString , SeriesId )
PROPERTYIMP ( QString , ProgramId )
PROPERTYIMP ( QString , Inetref )
PROPERTYIMP_REF( QString , Category )
PROPERTYIMP_REF( QDateTime , StartTime )
PROPERTYIMP_REF( QDateTime , EndTime )
PROPERTYIMP_REF( QString , SeriesId )
PROPERTYIMP_REF( QString , ProgramId )
PROPERTYIMP_REF( QString , Inetref )
PROPERTYIMP ( int , ChanId )
PROPERTYIMP ( QString , CallSign )
PROPERTYIMP_REF( QString , CallSign )
PROPERTYIMP ( int , FindDay )
PROPERTYIMP ( QTime , FindTime )
PROPERTYIMP ( QString , Type )
PROPERTYIMP ( QString , SearchType )
PROPERTYIMP_REF( QString , Type )
PROPERTYIMP_REF( QString , SearchType )
PROPERTYIMP ( int , RecPriority )
PROPERTYIMP ( uint , PreferredInput )
PROPERTYIMP ( int , StartOffset )
PROPERTYIMP ( int , EndOffset )
PROPERTYIMP ( QString , DupMethod )
PROPERTYIMP ( QString , DupIn )
PROPERTYIMP_REF( QString , DupMethod )
PROPERTYIMP_REF( QString , DupIn )
PROPERTYIMP ( bool , NewEpisOnly )
PROPERTYIMP ( uint , Filter )
PROPERTYIMP ( QString , RecProfile )
PROPERTYIMP ( QString , RecGroup )
PROPERTYIMP ( QString , StorageGroup )
PROPERTYIMP ( QString , PlayGroup )
PROPERTYIMP_REF( QString , RecProfile )
PROPERTYIMP_REF( QString , RecGroup )
PROPERTYIMP_REF( QString , StorageGroup )
PROPERTYIMP_REF( QString , PlayGroup )
PROPERTYIMP ( bool , AutoExpire )
PROPERTYIMP ( int , MaxEpisodes )
PROPERTYIMP ( bool , MaxNewest )
Expand All @@ -115,9 +115,9 @@ class SERVICE_PUBLIC RecRule : public QObject
PROPERTYIMP ( bool , AutoUserJob3 )
PROPERTYIMP ( bool , AutoUserJob4 )
PROPERTYIMP ( int , Transcoder )
PROPERTYIMP ( QDateTime , NextRecording )
PROPERTYIMP ( QDateTime , LastRecorded )
PROPERTYIMP ( QDateTime , LastDeleted )
PROPERTYIMP_REF( QDateTime , NextRecording )
PROPERTYIMP_REF( QDateTime , LastRecorded )
PROPERTYIMP_REF( QDateTime , LastDeleted )
PROPERTYIMP ( int , AverageDelay )

public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class SERVICE_PUBLIC RecRuleFilter : public QObject
Q_PROPERTY( QString Description READ Description WRITE setDescription )

PROPERTYIMP ( int , Id )
PROPERTYIMP ( QString , Description )
PROPERTYIMP_REF( QString , Description )

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ class SERVICE_PUBLIC RecRuleFilterList : public QObject
PROPERTYIMP ( int , StartIndex )
PROPERTYIMP ( int , Count )
PROPERTYIMP ( int , TotalAvailable )
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, RecRuleFilters );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class SERVICE_PUBLIC RecRuleList : public QObject
PROPERTYIMP ( int , StartIndex )
PROPERTYIMP ( int , Count )
PROPERTYIMP ( int , TotalAvailable )
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, RecRules );

Expand Down
20 changes: 10 additions & 10 deletions mythtv/libs/libmythservicecontracts/datacontracts/recording.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,24 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
PROPERTYIMP ( uint , RecordedId )
PROPERTYIMP_ENUM( RecStatus::Type , Status )
PROPERTYIMP ( int , Priority )
PROPERTYIMP ( QDateTime , StartTs )
PROPERTYIMP ( QDateTime , EndTs )
PROPERTYIMP_REF ( QDateTime , StartTs )
PROPERTYIMP_REF ( QDateTime , EndTs )

PROPERTYIMP ( qlonglong , FileSize ) // v1.3
PROPERTYIMP ( QString , FileName ) // v1.3
PROPERTYIMP ( QString , HostName ) // v1.3
PROPERTYIMP ( QDateTime , LastModified) // v1.3
PROPERTYIMP_REF ( QString , FileName ) // v1.3
PROPERTYIMP_REF ( QString , HostName ) // v1.3
PROPERTYIMP_REF ( QDateTime , LastModified) // v1.3

PROPERTYIMP ( int , RecordId )
PROPERTYIMP ( QString , RecGroup )
PROPERTYIMP ( QString , StorageGroup)
PROPERTYIMP ( QString , PlayGroup )
PROPERTYIMP_REF ( QString , RecGroup )
PROPERTYIMP_REF ( QString , StorageGroup)
PROPERTYIMP_REF ( QString , PlayGroup )
PROPERTYIMP_ENUM( RecordingType , RecType )
PROPERTYIMP_ENUM( RecordingDupInType , DupInType )
PROPERTYIMP_ENUM( RecordingDupMethodType , DupMethod )
PROPERTYIMP ( int , EncoderId )
PROPERTYIMP ( QString , EncoderName )
PROPERTYIMP ( QString , Profile )
PROPERTYIMP_REF ( QString , EncoderName )
PROPERTYIMP_REF ( QString , Profile )

// Used only by Serializer
PROPERTYIMP( bool, SerializeDetails );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class SERVICE_PUBLIC SettingList : public QObject
Q_PROPERTY( QString HostName READ HostName WRITE setHostName )
Q_PROPERTY( QVariantMap Settings READ Settings )

PROPERTYIMP ( QString , HostName )
PROPERTYIMP_REF ( QString, HostName )
PROPERTYIMP_RO_REF( QVariantMap, Settings )

public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class SERVICE_PUBLIC StorageGroupDir : public QObject
Q_PROPERTY( uint KiBFree READ KiBFree WRITE setKiBFree )

PROPERTYIMP ( int , Id )
PROPERTYIMP ( QString , GroupName )
PROPERTYIMP ( QString , HostName )
PROPERTYIMP ( QString , DirName )
PROPERTYIMP_REF( QString , GroupName )
PROPERTYIMP_REF( QString , HostName )
PROPERTYIMP_REF( QString , DirName )
PROPERTYIMP ( bool , DirRead )
PROPERTYIMP ( bool , DirWrite )
PROPERTYIMP ( uint , KiBFree );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class SERVICE_PUBLIC TimeZoneInfo : public QObject
Q_PROPERTY( QDateTime CurrentDateTime READ CurrentDateTime
WRITE setCurrentDateTime )

PROPERTYIMP( QString , TimeZoneID )
PROPERTYIMP( int , UTCOffset )
PROPERTYIMP( QDateTime, CurrentDateTime );
PROPERTYIMP_REF( QString , TimeZoneID )
PROPERTYIMP ( int , UTCOffset )
PROPERTYIMP_REF( QDateTime, CurrentDateTime );

public:

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythservicecontracts/datacontracts/titleInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class SERVICE_PUBLIC TitleInfo : public QObject
Q_PROPERTY( QString Inetref READ Inetref WRITE setInetref )
Q_PROPERTY( int Count READ Count WRITE setCount )

PROPERTYIMP ( QString , Title )
PROPERTYIMP ( QString , Inetref )
PROPERTYIMP_REF( QString , Title )
PROPERTYIMP_REF( QString , Inetref )
PROPERTYIMP ( int , Count );

public:
Expand Down
10 changes: 5 additions & 5 deletions mythtv/libs/libmythservicecontracts/datacontracts/versionInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ class SERVICE_PUBLIC VersionInfo : public QObject
Q_PROPERTY( QString Binary READ Binary WRITE setBinary )
Q_PROPERTY( QString Schema READ Schema WRITE setSchema )

PROPERTYIMP( QString, Version )
PROPERTYIMP( QString, Branch )
PROPERTYIMP( QString, Protocol )
PROPERTYIMP( QString, Binary )
PROPERTYIMP( QString, Schema );
PROPERTYIMP_REF( QString, Version )
PROPERTYIMP_REF( QString, Branch )
PROPERTYIMP_REF( QString, Protocol )
PROPERTYIMP_REF( QString, Binary )
PROPERTYIMP_REF( QString, Schema );

public:

Expand Down
32 changes: 16 additions & 16 deletions mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class SERVICE_PUBLIC ArtworkItem : public QObject
Q_PROPERTY( int Width READ Width WRITE setWidth )
Q_PROPERTY( int Height READ Height WRITE setHeight )

PROPERTYIMP ( QString , Type )
PROPERTYIMP ( QString , Url )
PROPERTYIMP ( QString , Thumbnail )
PROPERTYIMP_REF( QString , Type )
PROPERTYIMP_REF( QString , Url )
PROPERTYIMP_REF( QString , Thumbnail )
PROPERTYIMP ( int , Width )
PROPERTYIMP ( int , Height );

Expand Down Expand Up @@ -96,27 +96,27 @@ class SERVICE_PUBLIC VideoLookup : public QObject

Q_PROPERTY( QVariantList Artwork READ Artwork )

PROPERTYIMP ( QString , Title )
PROPERTYIMP ( QString , SubTitle )
PROPERTYIMP_REF( QString , Title )
PROPERTYIMP_REF( QString , SubTitle )
PROPERTYIMP ( int , Season )
PROPERTYIMP ( int , Episode )
PROPERTYIMP ( int , Year )
PROPERTYIMP ( QString , Tagline )
PROPERTYIMP ( QString , Description )
PROPERTYIMP ( QString , Certification )
PROPERTYIMP ( QString , Inetref )
PROPERTYIMP ( QString , Collectionref )
PROPERTYIMP ( QString , HomePage )
PROPERTYIMP ( QDateTime , ReleaseDate )
PROPERTYIMP_REF( QString , Tagline )
PROPERTYIMP_REF( QString , Description )
PROPERTYIMP_REF( QString , Certification )
PROPERTYIMP_REF( QString , Inetref )
PROPERTYIMP_REF( QString , Collectionref )
PROPERTYIMP_REF( QString , HomePage )
PROPERTYIMP_REF( QDateTime , ReleaseDate )
PROPERTYIMP ( float , UserRating )
PROPERTYIMP ( int , Length )
PROPERTYIMP ( QString , Language )
PROPERTYIMP ( QStringList, Countries )
PROPERTYIMP_REF( QString , Language )
PROPERTYIMP_REF( QStringList, Countries )
PROPERTYIMP ( float , Popularity )
PROPERTYIMP ( int , Budget )
PROPERTYIMP ( int , Revenue )
PROPERTYIMP ( QString , IMDB )
PROPERTYIMP ( QString , TMSRef )
PROPERTYIMP_REF( QString , IMDB )
PROPERTYIMP_REF( QString , TMSRef )

PROPERTYIMP_RO_REF( QVariantList, Artwork)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ class SERVICE_PUBLIC VideoLookupList : public QObject
Q_PROPERTY( QVariantList VideoLookups READ VideoLookups )

PROPERTYIMP ( int , Count )
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, VideoLookups );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,18 @@ class SERVICE_PUBLIC VideoMetadataInfo : public QObject
Q_PROPERTY( QObject* Genres READ Genres )

PROPERTYIMP ( int , Id )
PROPERTYIMP ( QString , Title )
PROPERTYIMP ( QString , SubTitle )
PROPERTYIMP ( QString , Tagline )
PROPERTYIMP ( QString , Director )
PROPERTYIMP ( QString , Studio )
PROPERTYIMP ( QString , Description )
PROPERTYIMP ( QString , Certification )
PROPERTYIMP ( QString , Inetref )
PROPERTYIMP_REF( QString , Title )
PROPERTYIMP_REF( QString , SubTitle )
PROPERTYIMP_REF( QString , Tagline )
PROPERTYIMP_REF( QString , Director )
PROPERTYIMP_REF( QString , Studio )
PROPERTYIMP_REF( QString , Description )
PROPERTYIMP_REF( QString , Certification )
PROPERTYIMP_REF( QString , Inetref )
PROPERTYIMP ( int , Collectionref )
PROPERTYIMP ( QString , HomePage )
PROPERTYIMP ( QDateTime , ReleaseDate )
PROPERTYIMP ( QDateTime , AddDate )
PROPERTYIMP_REF( QString , HomePage )
PROPERTYIMP_REF( QDateTime , ReleaseDate )
PROPERTYIMP_REF( QDateTime , AddDate )
PROPERTYIMP ( float , UserRating )
PROPERTYIMP ( int , ChildID )
PROPERTYIMP ( int , Length )
Expand All @@ -91,15 +91,15 @@ class SERVICE_PUBLIC VideoMetadataInfo : public QObject
PROPERTYIMP ( bool , Visible )
PROPERTYIMP ( bool , Watched )
PROPERTYIMP ( bool , Processed )
PROPERTYIMP ( QString , ContentType )
PROPERTYIMP ( QString , FileName )
PROPERTYIMP ( QString , Hash )
PROPERTYIMP ( QString , HostName )
PROPERTYIMP ( QString , Coverart )
PROPERTYIMP ( QString , Fanart )
PROPERTYIMP ( QString , Banner )
PROPERTYIMP ( QString , Screenshot )
PROPERTYIMP ( QString , Trailer )
PROPERTYIMP_REF( QString , ContentType )
PROPERTYIMP_REF( QString , FileName )
PROPERTYIMP_REF( QString , Hash )
PROPERTYIMP_REF( QString , HostName )
PROPERTYIMP_REF( QString , Coverart )
PROPERTYIMP_REF( QString , Fanart )
PROPERTYIMP_REF( QString , Banner )
PROPERTYIMP_REF( QString , Screenshot )
PROPERTYIMP_REF( QString , Trailer )

PROPERTYIMP_PTR( ArtworkInfoList , Artwork )
PROPERTYIMP_PTR( CastMemberList , Cast )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class SERVICE_PUBLIC VideoMetadataInfoList : public QObject
PROPERTYIMP ( int , CurrentPage )
PROPERTYIMP ( int , TotalPages )
PROPERTYIMP ( int , TotalAvailable )
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, VideoMetadataInfos );

Expand Down
32 changes: 16 additions & 16 deletions mythtv/libs/libmythservicecontracts/datacontracts/videoMultiplex.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,25 @@ class SERVICE_PUBLIC VideoMultiplex : public QObject
PROPERTYIMP ( int , TransportId )
PROPERTYIMP ( int , NetworkId )
PROPERTYIMP ( long long , Frequency )
PROPERTYIMP ( QString , Inversion )
PROPERTYIMP_REF( QString , Inversion )
PROPERTYIMP ( long long , SymbolRate )
PROPERTYIMP ( QString , FEC )
PROPERTYIMP ( QString , Polarity )
PROPERTYIMP ( QString , Modulation )
PROPERTYIMP ( QString , Bandwidth )
PROPERTYIMP ( QString , LPCodeRate )
PROPERTYIMP ( QString , HPCodeRate )
PROPERTYIMP ( QString , TransmissionMode )
PROPERTYIMP ( QString , GuardInterval )
PROPERTYIMP_REF( QString , FEC )
PROPERTYIMP_REF( QString , Polarity )
PROPERTYIMP_REF( QString , Modulation )
PROPERTYIMP_REF( QString , Bandwidth )
PROPERTYIMP_REF( QString , LPCodeRate )
PROPERTYIMP_REF( QString , HPCodeRate )
PROPERTYIMP_REF( QString , TransmissionMode )
PROPERTYIMP_REF( QString , GuardInterval )
PROPERTYIMP ( bool , Visible )
PROPERTYIMP ( QString , Constellation )
PROPERTYIMP ( QString , Hierarchy )
PROPERTYIMP ( QString , ModulationSystem )
PROPERTYIMP ( QString , RollOff )
PROPERTYIMP ( QString , SIStandard )
PROPERTYIMP_REF( QString , Constellation )
PROPERTYIMP_REF( QString , Hierarchy )
PROPERTYIMP_REF( QString , ModulationSystem )
PROPERTYIMP_REF( QString , RollOff )
PROPERTYIMP_REF( QString , SIStandard )
PROPERTYIMP ( int , ServiceVersion )
PROPERTYIMP ( QDateTime , UpdateTimeStamp )
PROPERTYIMP ( QString , DefaultAuthority )
PROPERTYIMP_REF( QDateTime , UpdateTimeStamp )
PROPERTYIMP_REF( QString , DefaultAuthority )

public:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ class SERVICE_PUBLIC VideoMultiplexList : public QObject
PROPERTYIMP ( int , CurrentPage )
PROPERTYIMP ( int , TotalPages )
PROPERTYIMP ( int , TotalAvailable )
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, VideoMultiplexes );

Expand Down
14 changes: 7 additions & 7 deletions mythtv/libs/libmythservicecontracts/datacontracts/videoSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ class SERVICE_PUBLIC VideoSource : public QObject
Q_PROPERTY( uint ScanFrequency READ ScanFrequency WRITE setScanFrequency )

PROPERTYIMP ( int , Id )
PROPERTYIMP ( QString , SourceName )
PROPERTYIMP ( QString , Grabber )
PROPERTYIMP ( QString , UserId )
PROPERTYIMP ( QString , FreqTable )
PROPERTYIMP ( QString , LineupId )
PROPERTYIMP ( QString , Password )
PROPERTYIMP_REF( QString , SourceName )
PROPERTYIMP_REF( QString , Grabber )
PROPERTYIMP_REF( QString , UserId )
PROPERTYIMP_REF( QString , FreqTable )
PROPERTYIMP_REF( QString , LineupId )
PROPERTYIMP_REF( QString , Password )
PROPERTYIMP ( bool , UseEIT )
PROPERTYIMP ( QString , ConfigPath )
PROPERTYIMP_REF( QString , ConfigPath )
PROPERTYIMP ( int , NITId )
PROPERTYIMP ( uint , BouquetId )
PROPERTYIMP ( uint , RegionId )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class SERVICE_PUBLIC VideoSourceList : public QObject

Q_PROPERTY( QVariantList VideoSources READ VideoSources )

PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )

PROPERTYIMP_RO_REF( QVariantList, VideoSources )

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ class SERVICE_PUBLIC VideoStreamInfo : public QObject
Q_PROPERTY( int Channels READ Channels WRITE setChannels )
Q_PROPERTY( qlonglong Duration READ Duration WRITE setDuration )

PROPERTYIMP ( QString , CodecType )
PROPERTYIMP ( QString , CodecName )
PROPERTYIMP_REF( QString , CodecType )
PROPERTYIMP_REF( QString , CodecName )
PROPERTYIMP ( int , Width )
PROPERTYIMP ( int , Height )
PROPERTYIMP ( float , AspectRatio )
PROPERTYIMP ( QString , FieldOrder )
PROPERTYIMP_REF( QString , FieldOrder )
PROPERTYIMP ( float , FrameRate )
PROPERTYIMP ( float , AvgFrameRate )
PROPERTYIMP ( int , Channels )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ class SERVICE_PUBLIC VideoStreamInfoList : public QObject
Q_PROPERTY( QVariantList VideoStreamInfos READ VideoStreamInfos )

PROPERTYIMP ( int , Count )
PROPERTYIMP ( QDateTime , AsOf )
PROPERTYIMP ( QString , Version )
PROPERTYIMP ( QString , ProtoVer )
PROPERTYIMP_REF ( QDateTime , AsOf )
PROPERTYIMP_REF ( QString , Version )
PROPERTYIMP_REF ( QString , ProtoVer )
PROPERTYIMP ( int , ErrorCode )
PROPERTYIMP ( QString , ErrorMsg )
PROPERTYIMP_REF ( QString , ErrorMsg )

PROPERTYIMP_RO_REF( QVariantList, VideoStreamInfos );

Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythservicecontracts/datacontracts/wolInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ class SERVICE_PUBLIC WOLInfo : public QObject
Q_PROPERTY( int Retry READ Retry WRITE setRetry )
Q_PROPERTY( QString Command READ Command WRITE setCommand )

PROPERTYIMP( bool , Enabled )
PROPERTYIMP( int , Reconnect )
PROPERTYIMP( int , Retry )
PROPERTYIMP( QString, Command )
PROPERTYIMP ( bool , Enabled )
PROPERTYIMP ( int , Reconnect )
PROPERTYIMP ( int , Retry )
PROPERTYIMP_REF( QString, Command )

public:

Expand Down