Convert some the code in [d4f718c] Myth Services UTC commit, to use M…

…ythDate utility functions. Note the code as is will work so there is no need to update immediately if you are working with the services API.
MythTV · Jun 21, 2012 · f2dd6f9 · f2dd6f9
1 parent 4c37533
commit f2dd6f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/mythtv/libs/libmythservicecontracts/service.cpp b/mythtv/libs/libmythservicecontracts/service.cpp
@@ -11,6 +11,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "service.h"
+#include "mythdate.h"
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -75,9 +76,7 @@ void* Service::ConvertToParameterPtr( int            nTypeId,
 
         case QMetaType::QDateTime   :
         {
-            QDateTime dt = QDateTime::fromString( sValue, Qt::ISODate );
-            dt.setTimeSpec(Qt::UTC);
-            *(( QDateTime      *)pParam) = dt.toLocalTime();
+            *(( QDateTime      *)pParam) = MythDate::fromString( sValue );
             break;
         }
         case QMetaType::QTime       : *(( QTime          *)pParam) = QTime::fromString    ( sValue, Qt::ISODate ); break;

diff --git a/mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp b/mythtv/libs/libmythupnp/serializers/jsonSerializer.cpp
@@ -11,10 +11,10 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "jsonSerializer.h"
+#include "mythdate.h"
 
 #include <QTextCodec>
 #include <QVariant>
-#include <QDateTime>
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -147,8 +147,9 @@ void JSONSerializer::RenderValue( const QVariant &vValue )
         case QVariant::Map:         RenderMap       ( vValue.toMap()        );  break;
         case QVariant::DateTime:
         {
-            m_Stream << "\"" << Encode( vValue.toDateTime().toUTC()
-                     .toString(Qt::ISODate) ) << "\"";
+            m_Stream << "\"" << Encode( 
+                MythDate::toString( vValue.toDateTime(), MythDate::ISODate ) )
+                << "\"";
             break;
         }
         default:

diff --git a/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp b/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp
@@ -11,9 +11,9 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "xmlSerializer.h"
+#include "mythdate.h"
 
 #include <QMetaClassInfo>
-#include <QDateTime>
 
 // --------------------------------------------------------------------------
 // This version should be bumped if the serializer code is changed in a way
@@ -173,7 +173,9 @@ void XmlSerializer::RenderValue( const QString &sName, const QVariant &vValue )
             if (dt.isNull())
                 m_pXmlWriter->writeAttribute( "xsi:nil", "true" );
 
-            m_pXmlWriter->writeCharacters( dt.toUTC().toString(Qt::ISODate) );
+            m_pXmlWriter->writeCharacters( 
+                MythDate::toString( dt, MythDate::ISODate ) );
+
             break;
         }
 
@@ -333,4 +335,4 @@ QString XmlSerializer::FindOptionValue( const QStringList &sOptions, const QStri
     }
 
     return QString();
-}
+}