From 94bbe52c73c3d9ab40b988690e54f90881520786 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Sat, 1 Dec 2018 13:16:57 -0500
Subject: [PATCH] Fixes several QDateTime time spec issues that effected
 contest logs and Cabrillo exports

---
 item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp | 10 ++++++++--
 models/CabrilloLog.cpp                              |  1 -
 widgets/logqso.cpp                                  |  1 -
 widgets/logqso.ui                                   |  6 ++++++
 widgets/mainwindow.cpp                              | 10 +++++-----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp b/item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp
index 5b7f76eb8..fde7b8c13 100644
--- a/item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp
+++ b/item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp
@@ -1,8 +1,10 @@
 #ifndef DATE_TIME_AS_SECS_SINCE_EPOCH_DELEGATE_HPP_
 #define DATE_TIME_AS_SECS_SINCE_EPOCH_DELEGATE_HPP_
 
+#include <memory>
 #include <QStyledItemDelegate>
 #include <QVariant>
+#include <QLocale>
 #include <QDateTime>
 #include <QAbstractItemModel>
 #include <QDateTimeEdit>
@@ -33,12 +35,16 @@ public:
 
   QString displayText (QVariant const& value, QLocale const& locale) const override
   {
-    return locale.toString (to_date_time (value), QLocale::ShortFormat);
+    return locale.toString (to_date_time (value), locale.dateFormat (QLocale::ShortFormat) + " hh:mm:ss");
   }
 
   QWidget * createEditor (QWidget * parent, QStyleOptionViewItem const& /*option*/, QModelIndex const& /*index*/) const override
   {
-    return new QDateTimeEdit {parent};
+    std::unique_ptr<QDateTimeEdit> editor {new QDateTimeEdit {parent}};
+    editor->setTimeSpec (Qt::UTC); // needed because it ignores time
+                                   // spec of the QDateTime that it is
+                                   // set from
+    return editor.release ();
   }
 
   void setEditorData (QWidget * editor, QModelIndex const& index) const override
diff --git a/models/CabrilloLog.cpp b/models/CabrilloLog.cpp
index 965d6f957..95aba4378 100644
--- a/models/CabrilloLog.cpp
+++ b/models/CabrilloLog.cpp
@@ -10,7 +10,6 @@
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QDataStream>
-#include <QDebug>
 #include "Configuration.hpp"
 #include "Bands.hpp"
 #include "qt_db_helpers.hpp"
diff --git a/widgets/logqso.cpp b/widgets/logqso.cpp
index e5b8a2e56..64f589d20 100644
--- a/widgets/logqso.cpp
+++ b/widgets/logqso.cpp
@@ -4,7 +4,6 @@
 #include <QSettings>
 #include <QStandardPaths>
 #include <QDir>
-#include <QDebug>
 
 #include "logbook/logbook.h"
 #include "MessageBox.hpp"
diff --git a/widgets/logqso.ui b/widgets/logqso.ui
index 75ca35db3..a03a3028a 100644
--- a/widgets/logqso.ui
+++ b/widgets/logqso.ui
@@ -81,6 +81,9 @@
          <property name="displayFormat">
           <string>dd/MM/yyyy HH:mm:ss</string>
          </property>
+         <property name="timeSpec">
+          <enum>Qt::UTC</enum>
+         </property>
         </widget>
        </item>
       </layout>
@@ -113,6 +116,9 @@
          <property name="displayFormat">
           <string>dd/MM/yyyy HH:mm:ss</string>
          </property>
+         <property name="timeSpec">
+          <enum>Qt::UTC</enum>
+         </property>
         </widget>
        </item>
       </layout>
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 97e025931..8faf33fbd 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -188,7 +188,7 @@ namespace
 
   int ms_minute_error ()
   {
-    auto const& now = QDateTime::currentDateTime ();
+    auto const& now = QDateTime::currentDateTimeUtc ();
     auto const& time = now.time ();
     auto second = time.second ();
     return now.msecsTo (now.addSecs (second > 30 ? 60 - second : -second)) - time.msec ();
@@ -1508,7 +1508,7 @@ QString MainWindow::save_wave_file (QString const& name, short const * data, int
   BWFFile::InfoDictionary list_info {
       {{{'I','S','R','C'}}, source.toLocal8Bit ()},
       {{{'I','S','F','T'}}, program_title (revision ()).simplified ().toLocal8Bit ()},
-      {{{'I','C','R','D'}}, QDateTime::currentDateTime ()
+      {{{'I','C','R','D'}}, QDateTime::currentDateTimeUtc ()
                           .toString ("yyyy-MM-ddTHH:mm:ss.zzzZ").toLocal8Bit ()},
       {{{'I','C','M','T'}}, comment.toLocal8Bit ()},
         };
@@ -2712,7 +2712,7 @@ void MainWindow::msgAvgDecode2()
 
 void MainWindow::decode()                                       //decode()
 {
-  QDateTime now = QDateTime::currentDateTime();
+  QDateTime now = QDateTime::currentDateTimeUtc ();
   if( m_dateTimeLastTX.isValid () ) {
     qint64 isecs_since_tx = m_dateTimeLastTX.secsTo(now);
     dec_data.params.lapcqonly= (isecs_since_tx > 600); 
@@ -3266,7 +3266,7 @@ void MainWindow::pskPost (DecodedText const& decodedtext)
   if(grid.contains (grid_regexp)) {
 //    qDebug() << "To PSKreporter:" << deCall << grid << frequency << msgmode << snr;
     psk_Reporter->addRemoteStation(deCall,grid,QString::number(frequency),msgmode,
-           QString::number(snr),QString::number(QDateTime::currentDateTime().toTime_t()));
+           QString::number(snr),QString::number(QDateTime::currentDateTimeUtc ().toTime_t()));
   }
 }
 
@@ -3399,7 +3399,7 @@ void MainWindow::guiUpdate()
   if(m_tune) m_bTxTime=true;                 //"Tune" takes precedence
 
   if(m_transmitting or m_auto or m_tune) {
-    m_dateTimeLastTX = QDateTime::currentDateTime ();
+    m_dateTimeLastTX = QDateTime::currentDateTimeUtc ();
 
 // Check for "txboth" (testing purposes only)
     QFile f(m_appDir + "/txboth");