From c71b72c824ae6c565e2684793102678f4572dde1 Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Thu, 13 Jul 2017 18:02:07 +0000
Subject: [PATCH] Fixes the issue with the IARU Region setting not being saved
 and restored correctly

Use proper QDataStream insertor  and extractor for IARURegions::Region
enum. Unfortunately  this requires that  all will have to  reset their
region one more time even if it was working and correct.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7867 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 Configuration.cpp    | 4 ++--
 IARURegions.cpp      | 1 +
 IARURegions.hpp      | 2 +-
 MetaDataRegistry.cpp | 7 +++++++
 Modes.hpp            | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Configuration.cpp b/Configuration.cpp
index 164615e0a..03400aea6 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1270,7 +1270,7 @@ void Configuration::impl::read_settings ()
 
   macros_.setStringList (settings_->value ("Macros", QStringList {"TNX 73 GL"}).toStringList ());
 
-  region_ = settings_->value ("Region", IARURegions::ALL).value<IARURegions::Region> ();
+  region_ = settings_->value ("Region", QVariant::fromValue (IARURegions::ALL)).value<IARURegions::Region> ();
 
   if (settings_->contains ("FrequenciesForRegionModes"))
     {
@@ -1434,7 +1434,7 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("CalibrationSlopePPM", frequency_calibration_slope_ppm_);
   settings_->setValue ("pwrBandTxMemory", pwrBandTxMemory_);
   settings_->setValue ("pwrBandTuneMemory", pwrBandTuneMemory_);
-  settings_->setValue ("Region", region_);
+  settings_->setValue ("Region", QVariant::fromValue (region_));
 }
 
 void Configuration::impl::set_rig_invariants ()
diff --git a/IARURegions.cpp b/IARURegions.cpp
index e326029b8..051935247 100644
--- a/IARURegions.cpp
+++ b/IARURegions.cpp
@@ -5,6 +5,7 @@
 #include <QString>
 #include <QVariant>
 #include <QModelIndex>
+#include <QMetaType>
 
 #include "moc_IARURegions.cpp"
 
diff --git a/IARURegions.hpp b/IARURegions.hpp
index 00069acff..93291e081 100644
--- a/IARURegions.hpp
+++ b/IARURegions.hpp
@@ -66,7 +66,7 @@ public:
 // that can  be streamed and  queued as a  signal argument as  well as
 // showing the human readable string when output to debug streams.
 #if QT_VERSION < 0x050500
-// Qt 5.6 introduces the Q_ENUM macro which automatically registers
+// Qt 5.5 introduces the Q_ENUM macro which automatically registers
 // the meta-type
 Q_DECLARE_METATYPE (IARURegions::Region);
 #endif
diff --git a/MetaDataRegistry.cpp b/MetaDataRegistry.cpp
index fdf64c8a4..8a3404dbb 100644
--- a/MetaDataRegistry.cpp
+++ b/MetaDataRegistry.cpp
@@ -12,6 +12,7 @@
 #include "Transceiver.hpp"
 #include "TransceiverFactory.hpp"
 #include "WFPalette.hpp"
+#include "IARURegions.hpp"
 
 #include "FrequencyLineEdit.hpp"
 
@@ -79,4 +80,10 @@ void register_types ()
 
   // Waterfall palette
   qRegisterMetaTypeStreamOperators<WFPalette::Colours> ("Colours");
+
+  // IARURegions
+#if QT_VERSION < 0x050500
+  qRegisterMetaType<IARURegions::Region> ("IARURegions::Region");
+#endif
+  qRegisterMetaTypeStreamOperators<IARURegions::Region> ("IARURegions::Region");
 }
diff --git a/Modes.hpp b/Modes.hpp
index 4c0831053..8504cda61 100644
--- a/Modes.hpp
+++ b/Modes.hpp
@@ -73,7 +73,7 @@ public:
 // be streamed and queued as a signal argument as well as showing the
 // human readable string when output to debug streams.
 #if QT_VERSION < 0x050500
-// Qt 5.6 introduces the Q_ENUM macro which automatically registers
+// Qt 5.5 introduces the Q_ENUM macro which automatically registers
 // the meta-type
 Q_DECLARE_METATYPE (Modes::Mode);
 #endif