Fix BlackMisc header includes

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

refs #630

src/blackmisc/weather/cloudlayer.cpp

@@ -11,8 +11,7 @@
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 
-#include <tuple>
-#include <QRegularExpression>
+#include <QHash>
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/weather/cloudlayer.h

@@ -12,10 +12,15 @@
 #ifndef BLACKMISC_WEATHER_CLOUDLAYER_H
 #define BLACKMISC_WEATHER_CLOUDLAYER_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
 #include "blackmisc/aviation/altitude.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/weather/cloudlayerlist.cpp

@@ -7,7 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "cloudlayerlist.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/weather/cloudlayerlist.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/weather/cloudlayerlist.h

@@ -12,12 +12,22 @@
 #ifndef BLACKMISC_WEATHER_CLOUDLAYERLIST_H
 #define BLACKMISC_WEATHER_CLOUDLAYERLIST_H
 
-#include "cloudlayer.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/cloudlayer.h"
+
+#include <QMetaType>
+#include <initializer_list>
+#include <tuple>
 
 namespace BlackMisc
 {
+    namespace Aviation
+    {
+        class CAltitude;
+    }
+
     namespace Weather
     {
         /*!

src/blackmisc/weather/gridpoint.cpp

@@ -11,6 +11,8 @@
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 
+#include <QtDebug>
+
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;

src/blackmisc/weather/gridpoint.h

@@ -13,14 +13,20 @@
 #define BLACKMISC_WEATHER_GRIDPOINT_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
 #include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
 #include "blackmisc/weather/cloudlayerlist.h"
 #include "blackmisc/weather/temperaturelayerlist.h"
 #include "blackmisc/weather/visibilitylayerlist.h"
 #include "blackmisc/weather/windlayerlist.h"
-#include "blackmisc/pq/pressure.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/weather/metar.cpp

@@ -7,7 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "metar.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/weather/cloudlayer.h"
+#include "blackmisc/weather/metar.h"
+#include "blackmisc/weather/presentweather.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;

src/blackmisc/weather/metar.h

@@ -12,21 +12,28 @@
 #ifndef BLACKMISC_AVIATION_METAR_H
 #define BLACKMISC_AVIATION_METAR_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
 #include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/valueobject.h"
 #include "blackmisc/weather/cloudlayerlist.h"
 #include "blackmisc/weather/presentweatherlist.h"
 #include "blackmisc/weather/windlayer.h"
-#include "blackmisc/pq/time.h"
-#include "blackmisc/pq/length.h"
-#include "blackmisc/pq/temperature.h"
-#include "blackmisc/pq/pressure.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {
     namespace Weather
     {
+        class CCloudLayer;
+        class CPresentWeather;
+
         /*!
          * Value object encapsulating information about METAR
          * FIXME: runway visibilities

src/blackmisc/weather/metardecoder.cpp

@@ -9,11 +9,29 @@
 
 //! \cond PRIVATE
 
-#include "metardecoder.h"
+
+#include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/aviation/altitude.h"
 #include "blackmisc/logmessage.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/length.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 "blackmisc/statusmessage.h"
+#include "blackmisc/weather/cloudlayer.h"
+#include "blackmisc/weather/metardecoder.h"
 #include "blackmisc/weather/presentweather.h"
+#include "blackmisc/weather/windlayer.h"
+
+#include <QHash>
 #include <QRegularExpression>
-#include <QDebug>
+#include <QRegularExpressionMatch>
+#include <QStringList>
+#include <QtGlobal>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;

src/blackmisc/weather/metardecoder.h

@@ -13,12 +13,12 @@
 #define BLACKMISC_WEATHER_METARDECODER_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
 #include "blackmisc/weather/metar.h"
-#include <QString>
+
 #include <QObject>
-#include <QVector>
+#include <QString>
 #include <memory>
+#include <vector>
 
 namespace BlackMisc
 {

src/blackmisc/weather/metarset.cpp

@@ -7,7 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "metarset.h"
+#include "blackmisc/weather/metarset.h"
+
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/weather/metarset.h

@@ -12,10 +12,17 @@
 #ifndef BLACKMISC_WEATHER_METARSET_H
 #define BLACKMISC_WEATHER_METARSET_H
 
+#include "blackmisc/aviation/airporticaocode.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/weather/metar.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/metaclassprivate.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/metar.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/weather/presentweather.h

@@ -13,9 +13,16 @@
 #define BLACKMISC_WEATHER_PRESENTWEATHER_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
-#include <type_traits>
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QHash>
+#include <QMetaType>
+#include <QString>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/weather/presentweatherlist.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "presentweatherlist.h"
+#include "blackmisc/weather/presentweatherlist.h"
 
 namespace BlackMisc
 {

src/blackmisc/weather/presentweatherlist.h

@@ -12,9 +12,13 @@
 #ifndef BLACKMISC_WEATHER_PRESENTWEATHERLIST_H
 #define BLACKMISC_WEATHER_PRESENTWEATHERLIST_H
 
-#include "presentweather.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/presentweather.h"
+#include "presentweather.h"
+
+#include <QMetaType>
 
 namespace BlackMisc
 {

src/blackmisc/weather/registermetadataweather.cpp

@@ -8,7 +8,9 @@
  */
 
 #include "registermetadataweather.h"
-#include "weather.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/weather.h"
 
 namespace BlackMisc
 {

src/blackmisc/weather/registermetadataweather.h

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

src/blackmisc/weather/temperaturelayer.cpp

@@ -11,9 +11,6 @@
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 
-#include <tuple>
-#include <QRegularExpression>
-
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 

src/blackmisc/weather/temperaturelayer.h

@@ -12,11 +12,17 @@
 #ifndef BLACKMISC_WEATHER_TEMPERATURELAYER_H
 #define BLACKMISC_WEATHER_TEMPERATURELAYER_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
 #include "blackmisc/aviation/altitude.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/weather/temperaturelayerlist.cpp

@@ -7,7 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "temperaturelayerlist.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/weather/temperaturelayerlist.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/weather/temperaturelayerlist.h

@@ -12,12 +12,23 @@
 #ifndef BLACKMISC_WEATHER_TEMPERATURELAYERLIST_H
 #define BLACKMISC_WEATHER_TEMPERATURELAYERLIST_H
 
-#include "temperaturelayer.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/temperaturelayer.h"
+#include "temperaturelayer.h"
+
+#include <QMetaType>
+#include <initializer_list>
+#include <tuple>
 
 namespace BlackMisc
 {
+    namespace Aviation
+    {
+        class CAltitude;
+    }
+
     namespace Weather
     {
         /*!

src/blackmisc/weather/visibilitylayer.h

@@ -12,11 +12,17 @@
 #ifndef BLACKMISC_WEATHER_VISIBILITYLAYER_H
 #define BLACKMISC_WEATHER_VISIBILITYLAYER_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
 #include "blackmisc/aviation/altitude.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/pq/length.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/weather/visibilitylayerlist.cpp

@@ -7,7 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "visibilitylayerlist.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/weather/visibilitylayerlist.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/weather/visibilitylayerlist.h

@@ -12,12 +12,22 @@
 #ifndef BLACKMISC_WEATHER_VISIBILITYLAYERLIST_H
 #define BLACKMISC_WEATHER_VISIBILITYLAYERLIST_H
 
-#include "visibilitylayer.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/visibilitylayer.h"
+
+#include <QMetaType>
+#include <initializer_list>
+#include <tuple>
 
 namespace BlackMisc
 {
+    namespace Aviation
+    {
+        class CAltitude;
+    }
+
     namespace Weather
     {
         /*!

src/blackmisc/weather/weatherdataplugininfo.cpp

@@ -7,7 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "weatherdataplugininfo.h"
+#include "blackmisc/weather/weatherdataplugininfo.h"
+
+#include <QJsonValue>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackmisc/weather/weatherdataplugininfo.h

@@ -13,8 +13,13 @@
 #define BLACKMISC_WEATHER_WEATHERDATAPLUGININFO_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/valueobject.h"
 
+#include <QJsonObject>
+#include <QMetaType>
+#include <QString>
+
 namespace BlackMisc
 {
     namespace Weather

src/blackmisc/weather/weatherdataplugininfolist.cpp

@@ -7,7 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "weatherdataplugininfolist.h"
+#include "blackmisc/metaclassprivate.h"
+#include "blackmisc/range.h"
+#include "blackmisc/weather/weatherdataplugininfo.h"
+#include "blackmisc/weather/weatherdataplugininfolist.h"
+
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/weather/weatherdataplugininfolist.h

@@ -12,16 +12,21 @@
 #ifndef BLACKMISC_WEATHER_WEATHERDATAPLUGININFOLIST_H
 #define BLACKMISC_WEATHER_WEATHERDATAPLUGININFOLIST_H
 
-#include "weatherdataplugininfo.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/sequence.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/weatherdataplugininfo.h"
+
+#include <QMetaType>
 #include <QStringList>
 
 namespace BlackMisc
 {
     namespace Weather
     {
+        class CWeatherDataPluginInfo;
+
         //! Value object encapsulating a list of CWeatherDataPluginInfo objects.
         class BLACKMISC_EXPORT CWeatherDataPluginInfoList :
             public BlackMisc::CSequence<CWeatherDataPluginInfo>,

src/blackmisc/weather/weathergrid.cpp

@@ -7,8 +7,23 @@
  * contained in the LICENSE file.
  */
 
-#include "weathergrid.h"
+#include "blackmisc/aviation/altitude.h"
 #include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/range.h"
+#include "blackmisc/weather/cloudlayer.h"
+#include "blackmisc/weather/cloudlayerlist.h"
+#include "blackmisc/weather/temperaturelayer.h"
+#include "blackmisc/weather/temperaturelayerlist.h"
+#include "blackmisc/weather/visibilitylayer.h"
+#include "blackmisc/weather/visibilitylayerlist.h"
+#include "blackmisc/weather/weathergrid.h"
+#include "blackmisc/weather/windlayer.h"
+#include "blackmisc/weather/windlayerlist.h"
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;

src/blackmisc/weather/weathergrid.h

@@ -12,13 +12,22 @@
 #ifndef BLACKMISC_WEATHER_WEATHERGRID_H
 #define BLACKMISC_WEATHER_WEATHERGRID_H
 
-#include "gridpoint.h"
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/pq/length.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/geo/geoobjectlist.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/gridpoint.h"
+
+#include <QMetaType>
+#include <initializer_list>
 
 namespace BlackMisc
 {
+    namespace Geo
+    {
+        class ICoordinateGeodetic;
+    }
+
     namespace Weather
     {
         /*!

src/blackmisc/weather/weathergridprovider.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "weathergridprovider.h"
+#include "blackmisc/weather/weathergridprovider.h"
 
 using namespace BlackMisc;
 

src/blackmisc/weather/weathergridprovider.h

@@ -13,13 +13,15 @@
 #define BLACKMISC_WEATHER_WEATHERGRIDPROVIDER_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/identifier.h"
-#include "blackmisc/weather/weathergrid.h"
-#include "blackmisc/pq/length.h"
 #include "blackmisc/slot.h"
+#include "blackmisc/weather/weathergrid.h"
+
+#include <QObject>
+#include <QtGlobal>
 
 namespace BlackMisc
 {
+
     namespace Weather
     {
         //! Direct threadsafe in memory access to weather grid

src/blackmisc/weather/windlayer.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "blackmisc/weather/windlayer.h"
+#include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 

src/blackmisc/weather/windlayer.h

@@ -12,13 +12,17 @@
 #ifndef BLACKMISC_WEATHER_WINDLAYER_H
 #define BLACKMISC_WEATHER_WINDLAYER_H
 
+#include "blackmisc/aviation/altitude.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/speed.h"
-#include "blackmisc/aviation/altitude.h"
-#include <type_traits>
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/weather/windlayerlist.cpp

@@ -7,7 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "windlayerlist.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/weather/windlayerlist.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/weather/windlayerlist.h

@@ -12,12 +12,22 @@
 #ifndef BLACKMISC_WEATHER_WINDLAYERLIST_H
 #define BLACKMISC_WEATHER_WINDLAYERLIST_H
 
-#include "windlayer.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/weather/windlayer.h"
+
+#include <QMetaType>
+#include <initializer_list>
+#include <tuple>
 
 namespace BlackMisc
 {
+    namespace Aviation
+    {
+        class CAltitude;
+    }
+
     namespace Weather
     {
         /*!