Fix BlackMisc header includes

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

refs #630

src/blackmisc/audio/audiodeviceinfo.cpp

@@ -7,9 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "audiodeviceinfo.h"
-#include <tuple>
+#include "blackmisc/audio/audiodeviceinfo.h"
+
 #include <QHostInfo>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/audio/audiodeviceinfo.h

@@ -13,7 +13,10 @@
 #define BLACKMISC_AUDIO_AUDIODEVICE_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/valueobject.h"
+
+#include <QMetaType>
 #include <QString>
 
 namespace BlackMisc

src/blackmisc/audio/audiodeviceinfolist.cpp

@@ -7,8 +7,13 @@
  * contained in the LICENSE file.
  */
 
-#include "audiodeviceinfolist.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/audio/audiodeviceinfolist.h"
+#include "blackmisc/iterator.h"
+#include "blackmisc/range.h"
+
+#include <QString>
+#include <algorithm>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/audio/audiodeviceinfolist.h

@@ -12,13 +12,13 @@
 #ifndef BLACKMISC_AUDIO_AUDIODEVICELIST_H
 #define BLACKMISC_AUDIO_AUDIODEVICELIST_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/audio/audiodeviceinfo.h"
-#include "blackmisc/sequence.h"
+#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
-#include <QObject>
-#include <QString>
-#include <QList>
+#include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
 
 namespace BlackMisc
 {

src/blackmisc/audio/audioutils.cpp

@@ -9,7 +9,9 @@
 
 #include "audioutils.h"
 #include "blackmisc/buildconfig.h"
+
 #include <QProcess>
+#include <QStringList>
 
 namespace BlackMisc
 {

src/blackmisc/audio/registermetadataaudio.cpp

@@ -10,6 +10,8 @@
 #include "registermetadataaudio.h"
 #include "audio.h"
 
+#include <QDBusMetaType>
+
 namespace BlackMisc
 {
     namespace Audio

src/blackmisc/audio/registermetadataaudio.h

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

src/blackmisc/audio/settings/settingsaudio.cpp

@@ -7,8 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "settingsaudio.h"
-#include "logmessage.h"
+#include "blackmisc/audio/settings/settingsaudio.h"
+
+#include <QChar>
+#include <QtGlobal>
 
 using namespace BlackMisc::Audio;
 

src/blackmisc/audio/settings/settingsaudio.h

@@ -12,11 +12,15 @@
 #ifndef BLACKMISC_AUDIO_SETTINGS_AUDIO_H
 #define BLACKMISC_AUDIO_SETTINGS_AUDIO_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/statusmessagelist.h"
 #include "blackmisc/audio/notificationsounds.h"
-#include <QJsonObject>
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/audio/voiceroom.cpp

@@ -7,12 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "voiceroom.h"
+#include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
-#include <QChar>
+
 #include <QStringList>
-#include <tuple>
+#include <Qt>
 
 namespace BlackMisc
 {

src/blackmisc/audio/voiceroom.h

@@ -9,14 +9,18 @@
 
 //! \file
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
-#include <QString>
-
 #ifndef BLACKMISC_AUDIO_VOICEROOM_H
 #define BLACKMISC_AUDIO_VOICEROOM_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
 {
     namespace Audio

src/blackmisc/audio/voiceroomlist.cpp

@@ -7,8 +7,11 @@
  * contained in the LICENSE file.
  */
 
-#include "voiceroomlist.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/audio/voiceroom.h"
+#include "blackmisc/audio/voiceroomlist.h"
+
+#include <QString>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/audio/voiceroomlist.h

@@ -12,18 +12,20 @@
 #ifndef BLACKMISC_AUDIO_VOICEROOMLIST_H
 #define BLACKMISC_AUDIO_VOICEROOMLIST_H
 
-#include "voiceroom.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/sequence.h"
 #include "blackmisc/collection.h"
-#include <QObject>
-#include <QString>
-#include <QList>
+#include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+#include "voiceroom.h"
+
+#include <QMetaType>
 
 namespace BlackMisc
 {
     namespace Audio
     {
+        class CVoiceRoom;
+
         //! Value object encapsulating a list of voice rooms.
         class BLACKMISC_EXPORT CVoiceRoomList :
             public CSequence<CVoiceRoom>,