Ticket #10877: 10877-v2.patch

mythtv/libs/libmythbase/mthread.cpp

@@ -32 +32 @@
 // MythTV headers
 #include "mythlogging.h"
 #include "mythdbcon.h"
-#include "mthread.h"
 #include "mythtimer.h"
+#include "mythdate.h"
 #include "logging.h"
+#include "mthread.h"
 #include "mythdb.h"
 
 bool is_current_thread(MThread *thread)
@@ -227 +228 @@
 void MThread::ThreadSetup(const QString &name)
 {
     loggingRegisterThread(name);
-    qsrand(QDateTime::currentDateTime().toTime_t() ^
-           QTime::currentTime().msec());
+    qsrand(MythDate::current().toTime_t() ^ QTime::currentTime().msec());
 }
 
 void MThread::ThreadCleanup(void)

mythtv/libs/libmythbase/mythcommandlineparser.cpp

@@ -2443 +2443 @@
 
     logdir  = finfo.filePath();
     logfile = QCoreApplication::applicationName() + "." +
-              QDateTime::currentDateTime().toString("yyyyMMddhhmmss") +
-              QString(".%1").arg(pid) + ".log";
+        MythDate::toString(MythDate::current(), MythDate::kFilename) +
+        QString(".%1").arg(pid) + ".log";
 
     SetValue("logdir", logdir);
     SetValue("logfile", logfile);

mythtv/libs/libmythbase/mythcorecontext.cpp

@@ -39 +39 @@
 #include "logging.h"
 #include "mthread.h"
 #include "serverpool.h"
+#include "mythdate.h"
 
 #define LOC      QString("MythCoreContext: ")
 
@@ -106 +107 @@
       m_blockingClient(false)
 {
     MThread::ThreadSetup("CoreContext");
-    srandom(QDateTime::currentDateTime().toTime_t() ^
-            QTime::currentTime().msec());
+    srandom(MythDate::current().toTime_t() ^ QTime::currentTime().msec());
 }
 
 MythCoreContextPrivate::~MythCoreContextPrivate()

mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp

@@ -9 +9 @@
 #include <QKeyEvent>
 
 #include "mthread.h"
+#include "mythdate.h"
 #include "mythlogging.h"
 #include "mythcorecontext.h"
 #include "mythuiactions.h"
@@ -742 +743 @@
     reply.append(StatusToString(status));
     reply.append("\r\n");
     reply.append("DATE: ");
-    reply.append(QDateTime::currentDateTime().toString("ddd, d MMM yyyy hh:mm:ss"));
+    reply.append(MythDate::current().toString("ddd, d MMM yyyy hh:mm:ss"));
     reply.append(" GMT\r\n");
     if (header.size())
         reply.append(header);

mythtv/libs/libmythtv/HLS/httplivestream.cpp

@@ -29 +29 @@
 #include <QUrl>
 
 #include "mythcorecontext.h"
+#include "mythdate.h"
 #include "mythdirs.h"
 #include "mythtimer.h"
 #include "mthreadpool.h"
@@ -101 +102 @@
     m_bitrate(bitrate),
     m_audioBitrate(abitrate),    m_audioOnlyBitrate(aobitrate),
     m_sampleRate(srate),
-    m_created(QDateTime::currentDateTime()),
-    m_lastModified(QDateTime::currentDateTime()),
+    m_created(MythDate::current()),
+    m_lastModified(MythDate::current()),
     m_percentComplete(0),
     m_status(kHLSStatusUndefined)
 {
@@ -671 +672 @@
     m_curSegment         = query.value(7).toUInt();
     m_segmentCount       = query.value(8).toUInt();
     m_percentComplete    = query.value(9).toUInt();
-    m_created            = query.value(10).toDateTime();
-    m_lastModified       = query.value(11).toDateTime();
+    m_created            = MythDate::as_utc(query.value(10).toDateTime());
+    m_lastModified       = MythDate::as_utc(query.value(11).toDateTime());
     m_relativeURL        = query.value(12).toString();
     m_fullURL            = query.value(13).toString();
     m_status             = (HTTPLiveStreamStatus)(query.value(14).toInt());

mythtv/libs/libmythtv/osd.cpp

@@ -498 +498 @@
     {
         int startts = map["startts"].toInt();
         int endts   = map["endts"].toInt();
-        int nowts   = QDateTime::currentDateTime().toTime_t();
+        int nowts   = MythDate::current().toTime_t();
         if (startts > nowts)
         {
             bar->SetUsed(0);

mythtv/libs/libmythtv/recordingrule.cpp

@@ -180 +180 @@
     // and influence watch list weighting
     if (!asTemplate)
     {
-        m_nextRecording = query.value(43).toDateTime();
-        m_lastRecorded = query.value(44).toDateTime();
-        m_lastDeleted = query.value(45).toDateTime();
+        m_nextRecording = MythDate::as_utc(query.value(43).toDateTime());
+        m_lastRecorded = MythDate::as_utc(query.value(44).toDateTime());
+        m_lastDeleted = MythDate::as_utc(query.value(45).toDateTime());
         m_averageDelay = query.value(46).toInt();
     }
 

mythtv/libs/libmythui/mythuiclock.cpp

@@ -73 +73 @@
 
     if (txt.isEmpty())
     {
-        m_Time = QDateTime::currentDateTime();
+        m_Time = MythDate::current();
         txt = GetTimeText();
     }
 

mythtv/programs/mythbackend/services/channel.cpp

@@ -38 +38 @@
 #include "sourceutil.h"
 #include "cardutil.h"
 #include "datadirect.h"
+#include "mythdate.h"
 
 #include "serviceUtil.h"
 
@@ -562 +563 @@
             pVideoMultiplex->setRollOff(            query.value(19).toString()      );
             pVideoMultiplex->setSIStandard(         query.value(20).toString()      );
             pVideoMultiplex->setServiceVersion(     query.value(21).toInt()         );
-            pVideoMultiplex->setUpdateTimeStamp(    query.value(22).toDateTime()    );
+            pVideoMultiplex->setUpdateTimeStamp(
+                MythDate::as_utc(query.value(22).toDateTime()));
             pVideoMultiplex->setDefaultAuthority(   query.value(23).toString()      );
         }
     }
@@ -642 +644 @@
         pVideoMultiplex->setRollOff(            query.value(18).toString()      );
         pVideoMultiplex->setSIStandard(         query.value(19).toString()      );
         pVideoMultiplex->setServiceVersion(     query.value(20).toInt()         );
-        pVideoMultiplex->setUpdateTimeStamp(    query.value(21).toDateTime()    );
+        pVideoMultiplex->setUpdateTimeStamp(
+            MythDate::as_utc(query.value(21).toDateTime()));
         pVideoMultiplex->setDefaultAuthority(   query.value(22).toString()      );
     }
 

mythtv/programs/mythbackend/services/dvr.cpp

@@ -37 +37 @@
 #include "jobqueue.h"
 #include "encoderlink.h"
 #include "remoteutil.h"
+#include "mythdate.h"
 
 #include "serviceUtil.h"
 #include <mythscheduler.h>
@@ -323 +324 @@
     for(; it < tmpList.end(); ++it)
     {
         if (!bShowAll && ((*it)->GetRecordingStatus() <= rsWillRecord) &&
-            ((*it)->GetRecordingStartTime() >=
-             QDateTime::currentDateTime()))
+            ((*it)->GetRecordingStartTime() >= MythDate::current()))
         {
             recordingList.push_back(new RecordingInfo(**it));
         }
-        else if (bShowAll && ((*it)->GetRecordingStartTime() >=
-             QDateTime::currentDateTime()))
+        else if (bShowAll &&
+                 ((*it)->GetRecordingStartTime() >= MythDate::current()))
         {
             recordingList.push_back(new RecordingInfo(**it));
         }
@@ -359 +359 @@
     pPrograms->setStartIndex    ( nStartIndex     );
     pPrograms->setCount         ( nCount          );
     pPrograms->setTotalAvailable( recordingList.size() );
-    pPrograms->setAsOf          ( QDateTime::currentDateTime() );
+    pPrograms->setAsOf          ( MythDate::current() );
     pPrograms->setVersion       ( MYTH_BINARY_VERSION );
     pPrograms->setProtoVer      ( MYTH_PROTO_VERSION  );
     
@@ -383 +383 @@
     for(; it < tmpList.end(); ++it)
     {
         if (((*it)->GetRecordingStatus() == rsConflict) &&
-            ((*it)->GetRecordingStartTime() >=
-             QDateTime::currentDateTime()))
+            ((*it)->GetRecordingStartTime() >= MythDate::current()))
         {
             recordingList.push_back(new RecordingInfo(**it));
         }
@@ -414 +413 @@
     pPrograms->setStartIndex    ( nStartIndex     );
     pPrograms->setCount         ( nCount          );
     pPrograms->setTotalAvailable( recordingList.size() );
-    pPrograms->setAsOf          ( QDateTime::currentDateTime() );
+    pPrograms->setAsOf          ( MythDate::current() );
     pPrograms->setVersion       ( MYTH_BINARY_VERSION );
     pPrograms->setProtoVer      ( MYTH_PROTO_VERSION  );
 
@@ -578 +577 @@
     pRecRules->setStartIndex    ( nStartIndex     );
     pRecRules->setCount         ( nCount          );
     pRecRules->setTotalAvailable( recList.size() );
-    pRecRules->setAsOf          ( QDateTime::currentDateTime() );
+    pRecRules->setAsOf          ( MythDate::current() );
     pRecRules->setVersion       ( MYTH_BINARY_VERSION );
     pRecRules->setProtoVer      ( MYTH_PROTO_VERSION  );
 

mythtv/programs/mythbackend/services/myth.cpp

@@ -496 +496 @@
             pLogMessage->setFilename( query.value(5).toString() );
             pLogMessage->setLine( query.value(6).toInt() );
             pLogMessage->setFunction( query.value(7).toString() );
-            pLogMessage->setTime( query.value(8).toDateTime() );
+            pLogMessage->setTime(MythDate::as_utc(query.value(8).toDateTime()));
             pLogMessage->setLevel( logLevelGetName(
                                        (LogLevel_t)query.value(9).toInt()) );
             pLogMessage->setMessage( query.value(10).toString() );

mythtv/programs/mythbackend/upnpcdstv.cpp

@@ -285 +285 @@
                          MSqlQuery               &query )
 {
     int            nChanid      = query.value( 0).toInt();
-    QDateTime      dtStartTime  = query.value( 1).toDateTime();
-    QDateTime      dtEndTime    = query.value( 2).toDateTime();
+    QDateTime      dtStartTime  = MythDate::as_utc(query.value(1).toDateTime());
+    QDateTime      dtEndTime    = MythDate::as_utc(query.value(2).toDateTime());
     QString        sTitle       = query.value( 3).toString();
     QString        sSubtitle    = query.value( 4).toString();
     QString        sDescription = query.value( 5).toString();
@@ -296 +296 @@
     uint64_t       nFileSize    = query.value( 9).toULongLong();
     QString        sBaseName    = query.value(10).toString();
 
-    QDateTime      dtProgStart  = query.value(11).toDateTime();
-    QDateTime      dtProgEnd    = query.value(12).toDateTime();
+    QDateTime      dtProgStart  =MythDate::as_utc(query.value(11).toDateTime());
+    QDateTime      dtProgEnd    =MythDate::as_utc(query.value(12).toDateTime());
     QString        sStorageGrp  = query.value(13).toString();
 
     // ----------------------------------------------------------------------

mythtv/programs/mythbackend/upnpcdsvideo.cpp

@@ -252 +252 @@
     // int             nSeason      = query.value(10).toInt();
     // int             nEpisode     = query.value(11).toInt();
     QString        sCoverArt    = query.value(12).toString();
-    QDateTime      dtInsertDate = query.value(13).toDateTime();
+    QDateTime      dtInsertDate =MythDate::as_utc(query.value(13).toDateTime());
     QString        sHostName    = query.value(14).toString();
 
     // ----------------------------------------------------------------------