Fix BlackMisc header includes

* Include only what is used
* Use forward declaration when possible
* Sorted includes

refs #630

src/blackmisc/pq/angle.cpp

@@ -9,7 +9,10 @@
 
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/iconlist.h"
-#include "blackmisc/aviation/heading.h"
+#include "blackmisc/icons.h"
+#include "blackmisc/math/mathutils.h"
+
+#include <cmath>
 
 namespace BlackMisc
 {

src/blackmisc/pq/angle.h

@@ -13,8 +13,13 @@
 #define BLACKMISC_PQ_ANGLE_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/icon.h"
 #include "blackmisc/math/mathutils.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/units.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/pq/measurementunit.cpp

@@ -9,6 +9,7 @@
 
 #include "blackmisc/pq/measurementunit.h"
 #include "blackmisc/math/mathutils.h"
+#include <QLocale>
 
 using namespace BlackMisc::Math;
 

src/blackmisc/pq/measurementunit.h

@@ -13,18 +13,24 @@
 #define BLACKMISC_PQ_MEASUREMENTUNIT_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/icon.h"
 #include "blackmisc/math/mathutils.h"
+#include "blackmisc/stringutils.h"
+
 #include <QCoreApplication>
-#include <QtDBus/QDBusArgument>
-#include <QString>
-#include <QtGlobal>
-#include <QDebug>
+#include <QDBusArgument>
+#include <QHash>
 #include <QSharedData>
 #include <QSharedDataPointer>
-#include <QHash>
-#include <cstddef>
+#include <QString>
+#include <Qt>
+#include <QtDebug>
+#include <QtGlobal>
+#include <QList>
 #include <cmath>
+#include <cstddef>
+#include <string>
 
 namespace BlackMisc
 {

src/blackmisc/pq/physicalquantity.cpp

@@ -7,10 +7,32 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/pq/pq.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/dictionary.h"
+#include "blackmisc/pq/measurementunit.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/pqstring.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/mass.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/acceleration.h"
+
 #include <QCoreApplication>
+#include <QDBusArgument>
+#include <QHash>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QList>
+#include <QString>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/pq/physicalquantity.h

@@ -12,22 +12,26 @@
 #ifndef BLACKMISC_PQ_PHYSICALQUANTITY_H
 #define BLACKMISC_PQ_PHYSICALQUANTITY_H
 
-#include "blackmisc/pq/measurementunit.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/dbus.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/json.h"
+#include "blackmisc/pq/pqstring.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/math/mathutils.h"
-#include "blackmisc/pq/pqstring.h"
-#include <QtDBus/QDBusMetaType>
-#include <QtGlobal>
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
+
+#include <QDBusArgument>
+#include <QJsonObject>
 #include <QString>
-#include <QLocale>
-#include <typeinfo>
+#include <QtGlobal>
 
 namespace BlackMisc
 {
     namespace PhysicalQuantities
     {
-
         class CLength;
         class CPressure;
         class CFrequency;

src/blackmisc/pq/pqstring.cpp

@@ -8,8 +8,22 @@
  */
 
 #include "blackmisc/pq/pqstring.h"
-#include "blackmisc/pq/pq.h"
+#include "blackmisc/pq/acceleration.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/mass.h"
+#include "blackmisc/pq/measurementunit.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/units.h"
+
+#include <QLocale>
+#include <QRegExp>
 #include <QThreadStorage>
+#include <QtDebug>
 
 namespace BlackMisc
 {

src/blackmisc/pq/pqstring.h

@@ -13,9 +13,13 @@
 #define BLACKMISC_PQ_PQSTRING_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 
+#include <QMetaType>
+#include <QString>
+
 namespace BlackMisc
 {
     namespace PhysicalQuantities

src/blackmisc/pq/registermetadatapq.cpp

@@ -8,7 +8,19 @@
  */
 
 #include "registermetadatapq.h"
-#include "pq.h"
+#include "blackmisc/pq/acceleration.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/mass.h"
+#include "blackmisc/pq/pqstring.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {

src/blackmisc/pq/registermetadatapq.h

@@ -9,11 +9,11 @@
 
 //! \file
 
-#include "blackmisc/blackmiscexport.h"
-
 #ifndef BLACKMISC_PQ_REGISTERMETADATAPQ_H
 #define BLACKMISC_PQ_REGISTERMETADATAPQ_H
 
+#include "blackmisc/blackmiscexport.h"
+
 namespace BlackMisc
 {
     namespace PhysicalQuantities

src/blackmisc/pq/time.cpp

@@ -8,6 +8,10 @@
  */
 
 #include "blackmisc/pq/time.h"
+#include "blackmisc/math/mathutils.h"
+#include <QTime>
+#include <QtGlobal>
+#include <cmath>
 
 namespace BlackMisc
 {

src/blackmisc/pq/time.h

@@ -14,6 +14,14 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/pqstring.h"
+#include "blackmisc/pq/units.h"
+
+#include <QList>
+#include <QMetaType>
+#include <QString>
+
+class QTime;
 
 namespace BlackMisc
 {

src/blackmisc/pq/units.cpp

@@ -8,6 +8,9 @@
  */
 
 #include "blackmisc/pq/units.h"
+#include "blackmisc/math/mathutils.h"
+
+#include <QCoreApplication>
 
 namespace BlackMisc
 {

src/blackmisc/pq/units.h

@@ -16,11 +16,18 @@
 #undef min
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/dbus.h"
 #include "blackmisc/pq/measurementunit.h"
-#include <QtDBus/QDBusArgument>
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/variant.h"
+
+#include <math.h>
+#include <QDBusArgument>
 #include <QList>
-#include <QtCore/qmath.h>
-#include <QTranslator>
+#include <QMetaType>
+#include <QString>
+#include <QtGlobal>
+#include <cstddef>
 
 //
 // Used with the template for quantities. This is the reason for