Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/mythtv/libs/libmythservicecontracts/service.cpp b/mythtv/libs/libmythservicecontracts/service.cpp
- index d20fc01..fd1451c 100644
- --- a/mythtv/libs/libmythservicecontracts/service.cpp
- +++ b/mythtv/libs/libmythservicecontracts/service.cpp
- @@ -84,7 +84,13 @@ void* Service::ConvertToParameterPtr( int nTypeId,
- case QMetaType::QString : *(( QString *)pParam) = sValue; break;
- case QMetaType::QByteArray : *(( QByteArray *)pParam) = sValue.toUtf8 (); break;
- - case QMetaType::QDateTime : *(( QDateTime *)pParam) = QDateTime::fromString( sValue, Qt::ISODate ); break;
- + case QMetaType::QDateTime :
- + {
- + QDateTime dt = QDateTime::fromString( sValue, Qt::ISODate );
- + dt.setTimeSpec(Qt::UTC);
- + *(( QDateTime *)pParam) = dt.toLocalTime();
- + break;
- + }
- case QMetaType::QTime : *(( QTime *)pParam) = QTime::fromString ( sValue, Qt::ISODate ); break;
- case QMetaType::QDate : *(( QDate *)pParam) = QDate::fromString ( sValue, Qt::ISODate ); break;
- }
- diff --git a/mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp b/mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp
- index 5d61ead..e67af64 100644
- --- a/mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp
- +++ b/mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp
- @@ -25,6 +25,7 @@
- #include <QTextCodec>
- #include <QVariant>
- +#include <QDateTime>
- //////////////////////////////////////////////////////////////////////////////
- //
- @@ -155,6 +156,12 @@ void JSONSerializer::RenderValue( const QVariant &vValue )
- case QVariant::List: RenderList ( vValue.toList() ); break;
- case QVariant::StringList: RenderStringList( vValue.toStringList() ); break;
- case QVariant::Map: RenderMap ( vValue.toMap() ); break;
- + case QVariant::DateTime:
- + {
- + m_Stream << "\"" << Encode( vValue.toDateTime().toUTC()
- + .toString(Qt::ISODate) ) << "\"";
- + break;
- + }
- default:
- {
- m_Stream << "\"" << Encode( vValue.toString() ) << "\"";
- diff --git a/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp b/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp
- index 8db05c6..269b4c7 100644
- --- a/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp
- +++ b/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp
- @@ -24,6 +24,7 @@
- #include "xmlSerializer.h"
- #include <QMetaClassInfo>
- +#include <QDateTime>
- // --------------------------------------------------------------------------
- // This version should be bumped if the serializer code is changed in a way
- @@ -176,6 +177,13 @@ void XmlSerializer::RenderValue( const QString &sName, const QVariant &vValue )
- break;
- }
- + case QVariant::DateTime:
- + {
- + m_pXmlWriter->writeCharacters( vValue.toDateTime().toUTC()
- + .toString(Qt::ISODate) );
- + break;
- + }
- +
- default:
- {
- m_pXmlWriter->writeCharacters( vValue.toString() );
Add Comment
Please, Sign In to add comment