Fix BlackMisc header includes

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

refs #630

src/blackmisc/network/authenticateduser.cpp

@@ -9,9 +9,16 @@
 
 #include "blackmisc/network/authenticateduser.h"
 #include "blackmisc/iconlist.h"
+#include "blackmisc/icons.h"
+#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategorylist.h"
 #include "blackmisc/propertyindex.h"
+#include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"
-#include <tuple>
+
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/network/authenticateduser.h

@@ -15,9 +15,18 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/country.h"
 #include "blackmisc/datastore.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/network/rolelist.h"
+#include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonObject>
+#include <QMetaType>
+#include <QString>
+#include <QStringList>
 
 namespace BlackMisc
 {

src/blackmisc/network/client.cpp

@@ -8,10 +8,15 @@
  */
 
 #include "blackmisc/network/client.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/aviation/callsign.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/metaclassprivate.h"
 
+#include <QPixmap>
 #include <QString>
+#include <QStringList>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/network/client.h

@@ -12,12 +12,20 @@
 #ifndef BLACKMISC_NETWORK_CLIENT_H
 #define BLACKMISC_NETWORK_CLIENT_H
 
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/network/user.h"
-#include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/network/voicecapabilities.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/network/clientlist.cpp

@@ -8,7 +8,10 @@
  */
 
 #include "blackmisc/network/clientlist.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/metaclassprivate.h"
+
+#include <QString>
+#include <tuple>
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/network/clientlist.h

@@ -12,16 +12,14 @@
 #ifndef BLACKMISC_NETWORK_CLIENTLIST_H
 #define BLACKMISC_NETWORK_CLIENTLIST_H
 
+#include "blackmisc/aviation/callsignobjectlist.h"
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/collection.h"
 #include "blackmisc/network/client.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/collection.h"
-#include "blackmisc/aviation/callsignobjectlist.h"
-#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/variant.h"
 
-#include <QObject>
-#include <QString>
-#include <QList>
+#include <QMetaType>
 
 namespace BlackMisc
 {

src/blackmisc/network/entityflags.cpp

@@ -8,11 +8,11 @@
  */
 
 #include "blackmisc/network/entityflags.h"
-#include "blackmisc/dbus.h"
-#include <QtDBus/QDBusMetaType>
-#include <QStringList>
 #include "blackmisc/verify.h"
 
+#include <QStringList>
+#include <QtGlobal>
+
 namespace BlackMisc
 {
     namespace Network

src/blackmisc/network/entityflags.h

@@ -14,7 +14,10 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/statusmessage.h"
-#include <QObject>
+
+#include <QFlags>
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/network/networkutils.cpp

@@ -7,14 +7,27 @@
  * contained in the LICENSE file.
  */
 
-#include "networkutils.h"
-#include <QtNetwork/QNetworkInterface>
-#include <QtNetwork/QTcpSocket>
-#include <QCoreApplication>
-#include <QHostAddress>
+#include "blackmisc/network/networkutils.h"
+#include "blackmisc/network/server.h"
+
 #include <QAbstractSocket>
-#include <QUrl>
+#include <QDateTime>
+#include <QDebug>
+#include <QHostAddress>
+#include <QJsonDocument>
+#include <QList>
+#include <QNetworkAddressEntry>
+#include <QNetworkInterface>
+#include <QNetworkReply>
+#include <QObject>
 #include <QSslConfiguration>
+#include <QSslSocket>
+#include <QTcpSocket>
+#include <QTextStream>
+#include <QUrl>
+#include <QUrlQuery>
+#include <QVariant>
+#include <QtDebug>
 
 using namespace BlackMisc::Network;
 

src/blackmisc/network/networkutils.h

@@ -13,20 +13,28 @@
 #define BLACKMISC_NETWORKUTILS_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/network/server.h"
 #include "blackmisc/network/url.h"
-#include <QUrl>
+
+#include <QByteArray>
 #include <QHttpPart>
-#include <QStringList>
-#include <QUrlQuery>
-#include <QNetworkRequest>
-#include <QNetworkReply>
+#include <QJsonArray>
 #include <QJsonObject>
+#include <QNetworkRequest>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
+class QHttpPart;
+class QNetworkReply;
+class QUrl;
+class QUrlQuery;
 
 namespace BlackMisc
 {
     namespace Network
     {
+        class CServer;
+
         //! Utilities, e.g. checking whether a network connection can be established
         class BLACKMISC_EXPORT CNetworkUtils
         {

src/blackmisc/network/registermetadatanetwork.h

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

src/blackmisc/network/role.cpp

@@ -7,7 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "role.h"
+#include "blackmisc/network/role.h"
+#include <QJsonValue>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/network/role.h

@@ -13,8 +13,14 @@
 #define BLACKMISC_NETWORK_ROLE_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
 #include "blackmisc/datastore.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonObject>
+#include <QMetaType>
 #include <QString>
 
 namespace BlackMisc

src/blackmisc/network/rolelist.cpp

@@ -7,8 +7,13 @@
  * contained in the LICENSE file.
  */
 
+#include "blackmisc/network/role.h"
 #include "blackmisc/network/rolelist.h"
 
+#include <QJsonObject>
+#include <QJsonValue>
+#include <tuple>
+
 namespace BlackMisc
 {
     namespace Network

src/blackmisc/network/rolelist.h

@@ -13,14 +13,22 @@
 #define BLACKMISC_NETWORK_ROLELIST_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/network/role.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/network/role.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonArray>
+#include <QMetaType>
+#include <QString>
+#include <QStringList>
 
 namespace BlackMisc
 {
     namespace Network
     {
+        class CRole;
+
         //! Value object encapsulating a list of servers.
         class BLACKMISC_EXPORT CRoleList :
             public CSequence<CRole>,

src/blackmisc/network/server.cpp

@@ -8,9 +8,14 @@
  */
 
 #include "blackmisc/network/server.h"
+#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategorylist.h"
 #include "blackmisc/propertyindex.h"
+#include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"
-#include <tuple>
+
+#include <Qt>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/network/server.h

@@ -13,9 +13,15 @@
 #define BLACKMISC_NETWORK_SERVER_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/network/user.h"
+#include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/network/serverlist.cpp

@@ -8,6 +8,10 @@
  */
 
 #include "blackmisc/network/serverlist.h"
+#include "blackmisc/metaclassprivate.h"
+#include "blackmisc/network/server.h"
+
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/network/serverlist.h

@@ -13,14 +13,20 @@
 #define BLACKMISC_NETWORK_SERVERLIST_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/network/server.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/network/server.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {
     namespace Network
     {
+        class CServer;
+
         //! Value object encapsulating a list of servers.
         class BLACKMISC_EXPORT CServerList :
             public CSequence<CServer>,

src/blackmisc/network/textmessage.cpp

@@ -8,10 +8,15 @@
  */
 
 #include "blackmisc/network/textmessage.h"
-#include "blackmisc/pq/constants.h"
-#include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/selcal.h"
+#include "blackmisc/pq/constants.h"
+#include "blackmisc/pq/physicalquantity.h"
+
+#include <QRegExp>
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;

src/blackmisc/network/textmessage.h

@@ -12,13 +12,21 @@
 #ifndef BLACKMISC_NETWORK_TEXTMESSAGE_H
 #define BLACKMISC_NETWORK_TEXTMESSAGE_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/timestampbased.h"
-#include "blackmisc/pq/frequency.h"
 #include "blackmisc/aviation/callsign.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
+#include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include <QDateTime>
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QPixmap>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/network/textmessagelist.cpp

@@ -8,7 +8,14 @@
  */
 
 #include "blackmisc/network/textmessagelist.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/iterator.h"
+#include "blackmisc/metaclassprivate.h"
+#include "blackmisc/network/textmessage.h"
+#include "blackmisc/range.h"
+
+#include <QtGlobal>
+#include <algorithm>
+#include <tuple>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;

src/blackmisc/network/textmessagelist.h

@@ -12,19 +12,25 @@
 #ifndef BLACKMISC_NETWORK_TEXTMESSAGELIST_H
 #define BLACKMISC_NETWORK_TEXTMESSAGELIST_H
 
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/network/textmessage.h"
-#include "blackmisc/timestampobjectlist.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/network/textmessage.h"
+#include "blackmisc/pq/frequency.h"
 #include "blackmisc/sequence.h"
-#include <QObject>
-#include <QString>
+#include "blackmisc/timestampobjectlist.h"
+#include "blackmisc/variant.h"
+
 #include <QList>
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {
     namespace Network
     {
+        class CTextMessage;
+
         //! Value object encapsulating a list of text messages
         class BLACKMISC_EXPORT CTextMessageList :
             public CSequence<CTextMessage>,

src/blackmisc/network/url.cpp

@@ -8,9 +8,12 @@
  */
 
 #include "blackmisc/network/url.h"
-#include "blackmisc/network/networkutils.h"
 #include "blackmisc/propertyindex.h"
 
+#include <QJsonValue>
+#include <QPair>
+#include <QtGlobal>
+
 namespace BlackMisc
 {
     namespace Network

src/blackmisc/network/url.h

@@ -13,9 +13,16 @@
 #define BLACKMISC_NETWORK_NETWORKLOCATION_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"
-#include <QUrl>
+#include "blackmisc/variant.h"
+
+#include <QJsonObject>
+#include <QMetaType>
 #include <QNetworkRequest>
+#include <QString>
+#include <QUrl>
 
 namespace BlackMisc
 {

src/blackmisc/network/urllist.cpp

@@ -8,8 +8,11 @@
  */
 
 #include "blackmisc/network/urllist.h"
-#include "blackmisc/network/networkutils.h"
 #include "blackmisc/math/mathutils.h"
+#include "blackmisc/network/networkutils.h"
+
+#include <QtGlobal>
+#include <tuple>
 
 using namespace BlackMisc::Math;
 

src/blackmisc/network/urllist.h

@@ -13,10 +13,14 @@
 #define BLACKMISC_NETWORK_NETWORKLOCATIONLIST_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/network/url.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/network/url.h"
 #include "blackmisc/sequence.h"
-#include <QReadWriteLock>
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
+#include <QStringList>
 
 namespace BlackMisc
 {

src/blackmisc/network/user.cpp

@@ -9,11 +9,16 @@
 
 #include "blackmisc/network/user.h"
 #include "blackmisc/aviation/airporticaocode.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/propertyindex.h"
+#include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"
-#include <tuple>
+
+#include <QChar>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QThreadStorage>
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc::Aviation;
 

src/blackmisc/network/user.h

@@ -12,11 +12,18 @@
 #ifndef BLACKMISC_NETWORK_USER_H
 #define BLACKMISC_NETWORK_USER_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/network/userlist.cpp

@@ -8,7 +8,10 @@
  */
 
 #include "blackmisc/network/userlist.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/metaclassprivate.h"
+
+#include <QString>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/network/userlist.h

@@ -13,12 +13,12 @@
 #define BLACKMISC_NETWORK_USERLIST_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/collection.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/collection.h"
-#include <QObject>
-#include <QString>
-#include <QList>
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
 
 namespace BlackMisc
 {

src/blackmisc/network/voicecapabilites.cpp

@@ -7,9 +7,14 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/network/voicecapabilities.h"
+#include "blackmisc/icon.h"
 #include "blackmisc/iconlist.h"
-#include <tuple>
+#include "blackmisc/icons.h"
+#include "blackmisc/network/voicecapabilities.h"
+
+#include <QList>
+#include <QString>
+#include <QtGlobal>
 
 using namespace BlackMisc;