refs #485, refs #584 removed include blackmiscfreefunctions.h

samples/blackmisc/main.cpp

@@ -14,7 +14,6 @@
 #include "samplesjson.h"
 #include "samplesperformance.h"
 #include "samplesalgorithm.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/registermetadata.h"
 #include "blackmisc/pq/pq.h"
 

samples/blackmisc/sampleschangeobject.cpp

@@ -19,7 +19,6 @@
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/propertyindexallclasses.h"
 #include "blackmisc/predicates.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QDebug>
 
 using namespace BlackMisc;

samples/blackmisc/samplescontainer.cpp

@@ -11,7 +11,6 @@
 //! \ingroup sampleblackmisc
 
 #include "samplescontainer.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/propertyindexallclasses.h"
 #include <QDebug>
@@ -25,10 +24,6 @@ using namespace BlackMisc::Network;
 
 namespace BlackSample
 {
-
-    /*
-     * Samples
-     */
     int CSamplesContainer::samples()
     {
         // ATC stations

samples/blackmiscdbus/readme.txt

@@ -19,6 +19,6 @@ Adaptor: qdbusxml2cpp blackbus.testservice.xml -a atestservice
 # DBUS_ADAPTORS += BlackMiscTest.Testservice.xml BlackMiscTest.Datacontext.xml
 # DBUS_INTERFACES += BlackMiscTest.Testservice.xml BlackMiscTest.Datacontext.xml
 # DBUS_INTERFACES += BlackMiscTest.Datacontext.xml
-# QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h
-# QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h
+# QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i blackmisc/blackmiscallvalueclasses.h
+# QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i blackmisc/blackmiscallvalueclasses.h
 

samples/blackmiscdbus/testservice.cpp

@@ -11,7 +11,6 @@
 //! \ingroup sampleblackmiscdbus
 
 #include "testservice.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

samples/blackmiscdbus/testserviceinterface.h

@@ -13,7 +13,6 @@
 #ifndef BLACKSAMPLE_TESTSERVICE_INTERFACE_H
 #define BLACKSAMPLE_TESTSERVICE_INTERFACE_H
 
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/track.h"
 #include "blackmisc/aviation/transponder.h"

samples/blackmiscquantities/main.cpp

@@ -13,7 +13,6 @@
 #include "samplesphysicalquantities.h"
 #include "samplesaviation.h"
 #include "samplesgeo.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QTextStream>
 
 using namespace BlackMisc;

samples/blackmiscsim/samplesvpilotrules.cpp

@@ -12,7 +12,6 @@
 
 #include "samplesvpilotrules.h"
 #include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/registermetadata.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/sampleutils.h"

src/blackcore/airspacemonitor.cpp

@@ -15,7 +15,6 @@
 #include "blackmisc/project.h"
 #include "blackmisc/testing.h"
 #include "blackmisc/logmessage.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindexallclasses.h"
 #include "blackmisc/threadutils.h"
 #include "blackmisc/verify.h"

src/blackcore/contextapplicationproxy.cpp

@@ -10,7 +10,6 @@
 #include "blackcore/contextapplicationproxy.h"
 #include "blackcore/inputmanager.h"
 #include "blackmisc/settingscache.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/loghandler.h"
 #include "blackmisc/identifierlist.h"
 #include <QObject>

src/blackcore/contextruntime.cpp

@@ -13,7 +13,6 @@
 #include "blackcore/registermetadata.h"
 #include "blackmisc/network/server.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/registermetadata.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/logmessage.h"

src/blackcore/data/globalsetup.cpp

@@ -10,7 +10,6 @@
 #include "globalsetup.h"
 #include "blackmisc/project.h"
 #include "blackmisc/math/mathutils.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/stringutils.h"
 #include <QStringList>
 

src/blackcore/data/updateinfo.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "updateinfo.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/project.h"
 #include <QStringList>
 

src/blackcore/readme.txt

@@ -14,11 +14,11 @@ Set search path for plugins: env.var. QT_PLUGIN_PATH
 
 Done automatically (qmake), but if required manually
 Interface:
-qdbusxml2cpp -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h -p contextnetwork_interface.h: H:\Projects\Qt\VatsimClient\client\src\blackcore\blackcore.contextnetwork.xml
+qdbusxml2cpp -i blackmisc/blackmiscallvalueclasses.h -p contextnetwork_interface.h: H:\Projects\Qt\VatsimClient\client\src\blackcore\blackcore.contextnetwork.xml
 qdbusxml2cpp -i contextnetwork_interface.h -p :contextnetwork_interface.cpp H:\Projects\Qt\VatsimClient\client\src\blackcore\blackcore.contextnetwork.xml
 
 Adaptor: The : indicates generation of cpp file
-qdbusxml2cpp -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h -a contextnetwork_adaptor.h blackcore.contextnetwork.xml
+qdbusxml2cpp -i blackmisc/blackmiscallvalueclasses.h -a contextnetwork_adaptor.h blackcore.contextnetwork.xml
 qdbusxml2cpp -i context_adaptor.h -a :contextnetwork_adaptor.cpp blackcore.contextnetwork.xml
 
 Manually:
@@ -30,12 +30,12 @@ Removed generation:
 # Causes nmake to run qdbusxml2cpp to automatically generate the dbus adaptor and interface classes,
 # then automatically adds them to the sources to compile
 # !! Make sure the plugin is available as release build and known QT_PLUGIN_PATH
-# QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h
+# QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS = -i blackmisc/blackmiscallvalueclasses.h
 # DBUS_ADAPTORS += blackcore.contextnetwork.xml
 # DBUS_ADAPTORS += blackcore.contextvoice.xml
 # DBUS_ADAPTORS += blackcore.contextsettings.xml
 # DBUS_ADAPTORS += blackcore.contextapplication.xml
 
-# QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i blackmisc/blackmiscfreefunctions.h -i blackmisc/blackmiscallvalueclasses.h
+# QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i blackmisc/blackmiscallvalueclasses.h
 # DBUS_INTERFACES += blackcore.contextnetwork.xml
 

src/blackcore/voicevatlib.cpp

@@ -12,7 +12,6 @@
 #include "audiodevicevatlib.h"
 #include "audiomixervatlib.h"
 #include "blackmisc/logmessage.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/makeunique.h"
 #include <QDebug>
 #include <QTimer>

src/blackgui/enableforframelesswindow.cpp

@@ -9,7 +9,6 @@
 
 #include "enableforframelesswindow.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/worker.h"
 #include <QStatusBar>

src/blackgui/models/actionhotkeylistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "actionhotkeylistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 using namespace BlackMisc;
 using namespace BlackMisc::Input;

src/blackgui/models/aircrafticaolistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "aircrafticaolistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 

src/blackgui/models/aircraftmodellistmodel.cpp

@@ -9,7 +9,6 @@
 
 #include "aircraftmodellistmodel.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;

src/blackgui/models/airlineicaolistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "airlineicaolistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 

src/blackgui/models/airportlistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "airportlistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 

src/blackgui/models/atcstationlistmodel.cpp

@@ -10,7 +10,6 @@
 #include "atcstationlistmodel.h"
 #include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/network/user.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Audio;

src/blackgui/models/clientlistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "clientlistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/icons.h"
 #include <QMetaProperty>
 #include <QBrush>

src/blackgui/models/columnformatters.h

@@ -16,7 +16,6 @@
 #include "blackgui/led.h"
 #include "blackmisc/pq/pq.h"
 #include "blackmisc/aviation/comsystem.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/icon.h"
 #include <QDateTime>
 #include <QDate>

src/blackgui/models/countrylistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "countrylistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 
 using namespace BlackMisc;

src/blackgui/models/distributorlistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "distributorlistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 

src/blackgui/models/identifierlistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "identifierlistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 

src/blackgui/models/listmodelbase.cpp

@@ -16,7 +16,6 @@
 #include "blackmisc/verify.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/json.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/comparefunctions.h"
 #include <QMimeData>

src/blackgui/models/liverylistmodel.cpp

@@ -9,7 +9,6 @@
 
 #include "liverylistmodel.h"
 #include "blackmisc/rgbcolor.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 

src/blackgui/models/namevariantpairlistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "namevariantpairlistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 using namespace BlackMisc;
 

src/blackgui/models/serverlistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "serverlistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 

src/blackgui/models/simulatedaircraftlistmodel.cpp

@@ -10,7 +10,6 @@
 #include "simulatedaircraftlistmodel.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/aviation/aircraftsituation.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Aviation;

src/blackgui/models/statusmessagelistmodel.cpp

@@ -9,7 +9,6 @@
 
 #include "statusmessagelistmodel.h"
 #include "blackmisc/icon.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 #include <QIcon>

src/blackgui/models/textmessagelistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "textmessagelistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Network;

src/blackgui/models/userlistmodel.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "userlistmodel.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QMetaProperty>
 #include <QBrush>
 

src/blackgui/systemtraywindow.cpp

@@ -9,7 +9,6 @@
 
 #include "systemtraywindow.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QStatusBar>
 #include <QPushButton>
 #include <QApplication>

src/blackinput/linux/joysticklinux.cpp

@@ -13,6 +13,7 @@
 #include <QFileSystemWatcher>
 #include <QSocketNotifier>
 #include <QSignalMapper>
+#include <QDir>
 #include <linux/joystick.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -137,4 +138,4 @@ namespace BlackInput
             }
         }
     }
-} // namespace BlackInput
+} // ns

src/blackinput/linux/keyboardlinux.cpp

@@ -10,9 +10,6 @@
 #include "keyboardlinux.h"
 #include "blackmisc/logmessage.h"
 #include <QDebug>
-#include <QFileSystemWatcher>
-#include <QDir>
-#include <QFile>
 #include <QHash>
 #include <QSocketNotifier>
 #include <linux/input.h>

src/blackinput/linux/keyboardlinux.h

@@ -7,9 +7,7 @@
  * contained in the LICENSE file.
  */
 
-/*!
-    \file
-*/
+//! \file
 
 #ifndef BLACKINPUT_KEYBOARD_LINUX_H
 #define BLACKINPUT_KEYBOARD_LINUX_H
@@ -17,13 +15,12 @@
 #include "blackinput/keyboard.h"
 #include "blackmisc/input/hotkeycombination.h"
 #include <QHash>
+#include <QDir>
+#include <QFileSystemWatcher>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
 
-class QFileSystemWatcher;
-class QFile;
-
 namespace BlackInput
 {
     //! \brief Linux implemenation of IKeyboard using hook procedure
@@ -32,23 +29,20 @@ namespace BlackInput
         Q_OBJECT
 
     public:
-
-        //! \brief Copy Constructor
+        //! Copy Constructor
         CKeyboardLinux(CKeyboardLinux const &) = delete;
 
-        //! \brief Assignment operator
+        //! Assignment operator
         CKeyboardLinux &operator=(CKeyboardLinux const &) = delete;
 
-        //! \brief Destructor
+        //! Destructor
         virtual ~CKeyboardLinux();
 
     protected:
-
         //! \copydoc IKeyboard::init()
         virtual bool init() override;
 
     private slots:
-
         //! Changed directory to linux devices
         void deviceDirectoryChanged(const QString &);
 
@@ -56,10 +50,9 @@ namespace BlackInput
         void inputReadyRead(int);
 
     private:
-
         friend class IKeyboard;
 
-        //! \brief Constructor
+        //! Constructor
         CKeyboardLinux(QObject *parent = nullptr);
 
         void addRawInputDevice(const QString &filePath);
@@ -77,4 +70,4 @@ namespace BlackInput
     };
 }
 
-#endif // BLACKINPUT_KEYBOARD_LINUX_H
+#endif // guard

src/blackmisc/audio/audiodeviceinfo.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "audiodeviceinfo.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <tuple>
 #include <QHostInfo>
 
@@ -16,7 +15,6 @@ namespace BlackMisc
 {
     namespace Audio
     {
-
         CAudioDeviceInfo::CAudioDeviceInfo() :
             m_type(Unknown), m_deviceIndex(invalidDeviceIndex()),
             m_deviceName(""), m_hostName(QHostInfo::localHostName())

src/blackmisc/audio/audiodeviceinfo.h

@@ -13,7 +13,6 @@
 #define BLACKMISC_AUDIO_AUDIODEVICE_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/valueobject.h"
 #include <QString>
 

src/blackmisc/audio/voiceroom.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "voiceroom.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 #include <QChar>

src/blackmisc/audio/voiceroom.h

@@ -12,7 +12,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QString>
 
 #ifndef BLACKMISC_AUDIO_VOICEROOM_H

src/blackmisc/aviation/aircrafticaocode.cpp

@@ -10,7 +10,6 @@
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"

src/blackmisc/aviation/aircrafticaocode.h

@@ -15,7 +15,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/datastore.h"
 #include "blackmisc/statusmessagelist.h"
 

src/blackmisc/aviation/aircraftsituation.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/aviation/aircraftsituation.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 

src/blackmisc/aviation/airlineicaocode.cpp

@@ -9,11 +9,9 @@
 
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/datastoreutility.h"
-
 #include <tuple>
 #include <QThreadStorage>
 #include <QRegularExpression>

src/blackmisc/aviation/airlineicaocode.h

@@ -18,7 +18,6 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/aviation/airport.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/aviation/airport.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 

src/blackmisc/aviation/airporticaocode.h

@@ -14,7 +14,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/aviation/atcstation.cpp

@@ -12,7 +12,6 @@
 #include "blackmisc/audio/voiceroom.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/variant.h"
 
 using namespace BlackMisc::PhysicalQuantities;

src/blackmisc/aviation/callsign.h

@@ -16,7 +16,6 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/icon.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/aviation/comsystem.cpp

@@ -7,7 +7,6 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/aviation/comsystem.h"
 
 using namespace BlackMisc::PhysicalQuantities;

src/blackmisc/aviation/heading.cpp

@@ -7,7 +7,6 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/aviation/heading.h"
 
 using BlackMisc::PhysicalQuantities::CAngle;

src/blackmisc/aviation/informationmessage.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/aviation/informationmessage.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/aviation/informationmessage.h

@@ -14,7 +14,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QString>
 #include <QDateTime>
 

src/blackmisc/aviation/livery.cpp

@@ -9,7 +9,6 @@
 
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/datastoreutility.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"

src/blackmisc/aviation/modulator.cpp

@@ -12,7 +12,6 @@
 #include "blackmisc/aviation/navsystem.h"
 #include "blackmisc/aviation/adfsystem.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/variant.h"
 
 using BlackMisc::PhysicalQuantities::CFrequency;

src/blackmisc/aviation/modulator.h

@@ -14,7 +14,6 @@
 
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/math/mathutils.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/pq/constants.h"
 #include "blackmisc/pq/frequency.h"
 
@@ -22,7 +21,6 @@ namespace BlackMisc
 {
     namespace Aviation
     {
-
         //! Base class for COM, NAV, Squawk units.
         template <class AVIO> class CModulator : public CValueObject<CModulator<AVIO>>
         {

src/blackmisc/aviation/track.cpp

@@ -7,7 +7,6 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/aviation/track.h"
 
 using BlackMisc::PhysicalQuantities::CAngle;

src/blackmisc/aviation/transponder.cpp

@@ -9,14 +9,12 @@
 
 #include "blackmisc/aviation/transponder.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
     namespace Aviation
     {
-
         void CTransponder::registerMetadata()
         {
             CValueObject<CTransponder>::registerMetadata();

src/blackmisc/containerbase.h

@@ -13,7 +13,6 @@
 #define BLACKMISC_CONTAINERBASE_H
 
 #include "range.h"
-#include "blackmiscfreefunctions.h"
 #include "predicates.h"
 #include "json.h"
 #include "variant.h"

src/blackmisc/datacache.cpp

@@ -15,6 +15,7 @@
 #include "blackmisc/atomicfile.h"
 #include <QStandardPaths>
 #include <QTimer>
+#include <QDir>
 #include <utility>
 
 namespace BlackMisc

src/blackmisc/datastore.cpp

@@ -9,7 +9,6 @@
 
 #include "blackmisc/datastore.h"
 #include "blackmisc/datastoreutility.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/comparefunctions.h"
 
 namespace BlackMisc

src/blackmisc/datastoreutility.cpp

@@ -9,7 +9,6 @@
 
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/datastoreutility.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/stringutils.h"
 #include <QJsonObject>
 #include <QJsonDocument>

src/blackmisc/filelogger.cpp

@@ -11,6 +11,7 @@
 #include <QString>
 #include <QDateTime>
 #include <QCoreApplication>
+#include <QDir>
 
 namespace BlackMisc
 {

src/blackmisc/fileutils.h

@@ -15,6 +15,7 @@
 #include "blackmiscexport.h"
 #include <QObject>
 #include <QDebug>
+#include <QDir>
 
 namespace BlackMisc
 {

src/blackmisc/geo/coordinategeodetic.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/variant.h"

src/blackmisc/identifier.h

@@ -15,7 +15,6 @@
 #include "blackmiscexport.h"
 #include "valueobject.h"
 #include "timestampbased.h"
-#include "blackmiscfreefunctions.h"
 #include <QByteArray>
 #include <QString>
 #include <QUuid>

src/blackmisc/input/actionhotkey.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "actionhotkey.h"
-#include "blackmiscfreefunctions.h"
 #include "variant.h"
 
 namespace BlackMisc

src/blackmisc/input/actionhotkey.h

@@ -15,7 +15,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/input/hotkeycombination.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/identifier.h"
 #include <QStringList>
 

src/blackmisc/input/hotkeycombination.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/input/hotkeycombination.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 #include <QStringList>

src/blackmisc/input/hotkeycombination.h

@@ -15,7 +15,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/input/keyboardkeylist.h"
 #include "blackmisc/input/joystickbuttonlist.h"
 

src/blackmisc/input/joystickbutton.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/input/joystickbutton.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/variant.h"
 #include <QCoreApplication>
 

src/blackmisc/input/joystickbutton.h

@@ -15,7 +15,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/input/keyboardkey.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/input/keyboardkey.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 

src/blackmisc/input/keyboardkey.h

@@ -16,7 +16,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/json.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "json.h"
-#include "blackmiscfreefunctions.h"
 #include "stringutils.h"
 #include "imageutils.h"
 #include <QJsonDocument>

src/blackmisc/logmessage.cpp

@@ -10,7 +10,6 @@
 //! \cond PRIVATE
 
 #include "logmessage.h"
-#include "blackmiscfreefunctions.h"
 #include "indexsequence.h"
 
 namespace BlackMisc

src/blackmisc/namevariantpair.cpp

@@ -9,7 +9,6 @@
 
 #include "namevariantpair.h"
 #include "iconlist.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/network/authenticateduser.cpp

@@ -9,7 +9,6 @@
 
 #include "blackmisc/network/authenticateduser.h"
 #include "blackmisc/iconlist.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 #include <tuple>

src/blackmisc/network/server.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/network/server.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 #include <tuple>
@@ -17,7 +16,6 @@ namespace BlackMisc
 {
     namespace Network
     {
-
         QString CServer::convertToQString(bool i18n) const
         {
             QString s(this->m_name);

src/blackmisc/network/textmessage.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/network/textmessage.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/pq/constants.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/callsign.h"

src/blackmisc/network/url.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/network/url.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/propertyindex.h"
 

src/blackmisc/network/user.cpp

@@ -10,7 +10,6 @@
 #include "blackmisc/network/user.h"
 #include "blackmisc/aviation/airporticaocode.h"
 #include "blackmisc/icon.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 #include <tuple>

src/blackmisc/network/voicecapabilites.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "blackmisc/network/voicecapabilities.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/iconlist.h"
 #include <tuple>
 

src/blackmisc/network/voicecapabilities.h

@@ -14,7 +14,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/pq/measurementunit.h

@@ -15,7 +15,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/math/mathutils.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QCoreApplication>
 #include <QtDBus/QDBusArgument>
 #include <QString>

src/blackmisc/pq/physicalquantity.h

@@ -17,7 +17,6 @@
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/pq/pqstring.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QtDBus/QDBusMetaType>
 #include <QtGlobal>
 #include <QString>

src/blackmisc/pq/pqstring.h

@@ -14,7 +14,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/variant.h"
 
 namespace BlackMisc
@@ -23,7 +22,7 @@ namespace BlackMisc
     {
 
         /*!
-         * \brief Represents a physical quantity by a string
+         * Represents a physical quantity by a string
          * \details Used to parse strings into physical quantities, validate strings
          * \sa BlackMisc::PhysicalQuantity
          */

src/blackmisc/pq/units.h

@@ -17,7 +17,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/pq/measurementunit.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include <QtDBus/QDBusArgument>
 #include <QList>
 #include <QtCore/qmath.h>

src/blackmisc/propertyindex.cpp

@@ -9,7 +9,6 @@
 
 #include "propertyindex.h"
 #include "predicates.h"
-#include "blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/registermetadata.cpp

@@ -40,7 +40,7 @@ namespace BlackMisc
 {
     void registerMetadata()
     {
-        initBlackMiscResources();
+        initBlackMiscResourcesImpl();
 
         CCountry::registerMetadata();
         CCountryList::registerMetadata();

src/blackmisc/simulation/aircraftmodelloader.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "aircraftmodelloader.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
 #include "blackmisc/simulation/xplane/aircraftmodelloaderxplane.h"
 #include "blackmisc/simulation/xplane/xplaneutil.h"

src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp

@@ -8,8 +8,8 @@
  */
 
 #include "aircraftcfgentries.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/variant.h"
+#include <QDir>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp

@@ -8,7 +8,6 @@
  */
 
 #include "aircraftcfgparser.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 #include "blackmisc/simulation/fscommon/fscommonutil.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/logmessage.h"

src/blackmisc/simulation/simulatedaircraft.h

@@ -27,7 +27,6 @@
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/network/client.h"
 #include "blackmisc/network/user.h"
-#include "blackmisc/blackmiscfreefunctions.h"
 
 namespace BlackMisc
 {

src/blackmisc/statusmessage.cpp

@@ -9,7 +9,6 @@
 
 #include "statusmessage.h"
 #include "statusexception.h"
-#include "blackmiscfreefunctions.h"
 #include "propertyindex.h"
 #include "iconlist.h"
 #include "loghandler.h"

src/blackmisc/valuecache.cpp

@@ -17,6 +17,7 @@
 #include "blackmisc/atomicfile.h"
 #include <QThread>
 #include <QJsonDocument>
+#include <QDir>
 
 namespace BlackMisc
 {

src/blackmisc/variant.cpp

@@ -10,7 +10,6 @@
 //! \cond PRIVATE
 
 #include "variant.h"
-#include "blackmiscfreefunctions.h"
 #include "icon.h"
 #include "logmessage.h"
 #include <QDBusArgument>