From 515dc7fef1a00c4a9ff04ff4fab578028408b9bb Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Fri, 28 Aug 2020 18:01:48 +0100
Subject: [PATCH] Issue #77 Move QPair typedefs to their corresponding value
 type headers

---
 .../aviation/aircraftsituationchange.h        |  1 -
 .../aviation/aircraftsituationlist.h          |  1 -
 src/blackmisc/aviation/altitude.h             |  4 ++
 src/blackmisc/pair.h                          | 42 -------------------
 src/blackmisc/pq/angle.h                      |  4 ++
 src/blackmisc/pq/length.h                     |  4 ++
 src/blackmisc/pq/speed.h                      |  3 ++
 7 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 src/blackmisc/pair.h

diff --git a/src/blackmisc/aviation/aircraftsituationchange.h b/src/blackmisc/aviation/aircraftsituationchange.h
index 04de5f971..68c33f563 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.h
+++ b/src/blackmisc/aviation/aircraftsituationchange.h
@@ -15,7 +15,6 @@
 #include "altitude.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/speed.h"
-#include "blackmisc/pair.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h
index 82ca40d3c..b0c9ccaa6 100644
--- a/src/blackmisc/aviation/aircraftsituationlist.h
+++ b/src/blackmisc/aviation/aircraftsituationlist.h
@@ -19,7 +19,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/pair.h"
 #include "blackmisc/variant.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h
index 5bc9fffb2..28a54f5bb 100644
--- a/src/blackmisc/aviation/altitude.h
+++ b/src/blackmisc/aviation/altitude.h
@@ -27,6 +27,7 @@
 #include "blackmisc/mixin/mixinmetatype.h"
 #include "blackmisc/blackmiscexport.h"
 
+#include <QPair>
 #include <QMetaType>
 #include <QString>
 #include <QRegularExpression>
@@ -239,11 +240,14 @@ namespace BlackMisc
                 BLACK_METAMEMBER(altitudeType)
             );
         };
+
+        using CAltitudePair = QPair<CAltitude, CAltitude>; //!< Pair of altitude
     } // ns
 } // ns
 
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CAltitude)
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CAltitude::ReferenceDatum)
 Q_DECLARE_METATYPE(BlackMisc::Aviation::CAltitude::AltitudeType)
+Q_DECLARE_METATYPE(BlackMisc::Aviation::CAltitudePair)
 
 #endif // guard
diff --git a/src/blackmisc/pair.h b/src/blackmisc/pair.h
deleted file mode 100644
index 10581f6b5..000000000
--- a/src/blackmisc/pair.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 2018
- * Swift Project Community / Contributors
- *
- * This file is part of Swift Project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-//! \file
-
-#ifndef BLACKMISC_PAIR_H
-#define BLACKMISC_PAIR_H
-
-#include "blackmisc/aviation/altitude.h"
-#include "blackmisc/pq/angle.h"
-#include "blackmisc/pq/length.h"
-#include "blackmisc/pq/speed.h"
-#include "blackmisc/variant.h"
-
-#include <QPair>
-#include <QDBusMetaType>
-
-namespace BlackMisc
-{
-    namespace PhysicalQuantities
-    {
-        using CAnglePair  = QPair<CAngle, CAngle>;   //!< Pair of angle
-        using CLengthPair = QPair<CLength, CLength>; //!< Pair of length
-        using CSpeedPair  = QPair<CSpeed, CSpeed>;   //!< Pair of speed
-    }
-    namespace Aviation
-    {
-        using CAltitudePair = QPair<CAltitude, CAltitude>; //!< Pair of altitude
-    }
-} // namespace
-
-Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CAnglePair)
-Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CLengthPair)
-Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CSpeedPair)
-Q_DECLARE_METATYPE(BlackMisc::Aviation::CAltitudePair)
-
-#endif // guard
diff --git a/src/blackmisc/pq/angle.h b/src/blackmisc/pq/angle.h
index fbdf80086..557ea1d6d 100644
--- a/src/blackmisc/pq/angle.h
+++ b/src/blackmisc/pq/angle.h
@@ -19,6 +19,7 @@
 
 #include <QMetaType>
 #include <QString>
+#include <QPair>
 
 namespace BlackMisc
 {
@@ -114,9 +115,12 @@ namespace BlackMisc
             //! Normalize: 0≤ degrees <360
             static double normalizeDegrees360(double degrees, int roundDigits = -1);
         };
+
+        using CAnglePair  = QPair<CAngle, CAngle>;   //!< Pair of angle
     } // ns
 } // ns
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CAngle)
+Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CAnglePair)
 
 #endif // guard
diff --git a/src/blackmisc/pq/length.h b/src/blackmisc/pq/length.h
index e1c693ba6..11888644b 100644
--- a/src/blackmisc/pq/length.h
+++ b/src/blackmisc/pq/length.h
@@ -13,6 +13,7 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/pq/physicalquantity.h"
+#include <QPair>
 
 namespace BlackMisc
 {
@@ -37,9 +38,12 @@ namespace BlackMisc
             //! \copydoc CPhysicalQuantity(const QString &unitString)
             CLength(const QString &unitString) : CPhysicalQuantity(unitString) {}
         };
+
+        using CLengthPair = QPair<CLength, CLength>; //!< Pair of length
     } // ns
 } // ns
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CLength)
+Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CLengthPair)
 
 #endif // guard
diff --git a/src/blackmisc/pq/speed.h b/src/blackmisc/pq/speed.h
index a7446fb0c..867bd4e1a 100644
--- a/src/blackmisc/pq/speed.h
+++ b/src/blackmisc/pq/speed.h
@@ -13,6 +13,7 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/pq/physicalquantity.h"
+#include <QPair>
 
 namespace BlackMisc
 {
@@ -34,9 +35,11 @@ namespace BlackMisc
             CSpeed(const QString &unitString) : CPhysicalQuantity(unitString) {}
         };
 
+        using CSpeedPair  = QPair<CSpeed, CSpeed>;   //!< Pair of speeds
     } // ns
 } // ns
 
 Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CSpeed)
+Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CSpeedPair)
 
 #endif // guard