Refactor qmake SUBDIRS structure

The big swift.pro is refactored by the correct usage of SUBDIRS
template. The following additional changes are made:
- Removed '_' from all targets and folder names
- Aligned parent folder and target name

refs #461

samples/blackmisc/blackmisc.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus network
 
-TARGET = sample_blackmisc
+TARGET = sampleblackmisc
 TEMPLATE = app
 
 CONFIG   += console

samples/blackmiscdbus/blackmiscdbus.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus network
 
-TARGET = sample_blackmisc_dbus
+TARGET = sampleblackmiscdbus
 TEMPLATE = app
 
 CONFIG   += console

samples/blackmiscdbus/servicetool.cpp

@@ -9,7 +9,7 @@
 
 #include "servicetool.h"
 #include "testservice.h"
-#include "testservice_interface.h"
+#include "testserviceinterface.h"
 #include "blackcore/dbusserver.h"
 
 #include <QTextStream>

samples/blackmiscdbus/testserviceinterface.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "testservice_interface.h"
+#include "testserviceinterface.h"
 
 namespace BlackMiscTest
 {

samples/blackmiscquantities/blackmiscquantities.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus network
 
-TARGET = sample_quantities_aviation
+TARGET = sampleblackmiscquantities
 TEMPLATE = app
 
 CONFIG   += console

samples/blackmiscsim/blackmiscsim.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus network xml
 
-TARGET = sample_blacksim
+TARGET = sampleblackmiscsim
 TEMPLATE = app
 
 CONFIG   += console

samples/cliclient/cliclient.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus network
 
-TARGET = sample_cli_client
+TARGET = samplecliclient
 TEMPLATE = app
 
 CONFIG   += console

samples/hotkey/hotkey.pro

@@ -4,7 +4,7 @@ QT       += core gui dbus network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = sample_hotkey
+TARGET = samplehotkey
 TEMPLATE = app
 
 CONFIG   -= app_bundle

samples/samples.pro

@@ -0,0 +1,11 @@
+load(common_pre)
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += cliclient
+SUBDIRS += blackmiscquantities
+SUBDIRS += blackmiscdbus
+SUBDIRS += blackmisc
+SUBDIRS += blackmiscsim
+SUBDIRS += hotkey

src/plugins/plugins.pro

@@ -0,0 +1,6 @@
+load(common_pre)
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += simulator

src/plugins/simulator/fs9/fs9.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus gui network concurrent xml
 
-TARGET = simulator_fs9
+TARGET = simulatorfs9
 TEMPLATE = lib
 
 CONFIG += plugin shared

src/plugins/simulator/fscommon/fscommon.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus concurrent xml
 
-TARGET = simulator_fscommon
+TARGET = simulatorfscommon
 TEMPLATE = lib
 
 CONFIG += staticlib

src/plugins/simulator/fsx/fsx.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus gui network concurrent xml
 
-TARGET = simulator_fsx
+TARGET = simulatorfsx
 TEMPLATE = lib
 
 CONFIG += plugin shared

src/plugins/simulator/fsxconfig/fsxconfig.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core widgets dbus network
 
-TARGET = simulator_fsx_config
+TARGET = simulatorfsxconfig
 TEMPLATE = lib
 CONFIG += plugin shared
 CONFIG += blackmisc blackcore blackgui

src/plugins/simulator/simulator.pro

@@ -0,0 +1,23 @@
+load(common_pre)
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+win32 {
+    if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) {
+        SUBDIRS += fscommon
+    }
+
+    contains(BLACK_CONFIG, FSX) {
+        SUBDIRS += fsx
+        SUBDIRS += fsxconfig
+    }
+    contains(BLACK_CONFIG, FS9) {
+        SUBDIRS += fs9
+    }
+}
+
+contains(BLACK_CONFIG, XPlane) {
+    SUBDIRS += xplane
+    SUBDIRS += xplaneconfig
+}

src/plugins/simulator/xplane/simulatorxplane.h

@@ -17,7 +17,7 @@
 #include "blackmisc/simulation/ownaircraftprovider.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/pixmap.h"
-#include "plugins/simulator/xplane_config/simulatorxplaneconfig.h"
+#include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h"
 #include <QDBusConnection>
 
 class QDBusServiceWatcher;

src/plugins/simulator/xplane/xplane.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core dbus network
 
-TARGET = simulator_xplane
+TARGET = simulatorxplane
 TEMPLATE = lib
 
 CONFIG += plugin shared

src/plugins/simulator/xplaneconfig/xplaneconfig.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core widgets dbus
 
-TARGET = simulator_xplane_config
+TARGET = simulatorxplaneconfig
 TEMPLATE = lib
 
 CONFIG += plugin shared

src/src.pro

@@ -0,0 +1,39 @@
+load(common_pre)
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += blackmisc
+
+contains(BLACK_CONFIG, BlackSound) {
+    SUBDIRS += blacksound
+}
+
+contains(BLACK_CONFIG, BlackInput) {
+    SUBDIRS += blackinput
+}
+
+contains(BLACK_CONFIG, BlackCore) {
+    SUBDIRS += blackcore
+    contains(BLACK_CONFIG, BlackGui) {
+        SUBDIRS += blackgui
+        contains(BLACK_CONFIG, SwiftGui) {
+            SUBDIRS += swiftguistandard
+        }
+        contains(BLACK_CONFIG, SwiftCore) {
+            SUBDIRS += swiftcore
+        }
+        contains(BLACK_CONFIG, SwiftData) {
+            SUBDIRS += swiftdata
+        }
+        contains(BLACK_CONFIG, SwiftLauncher) {
+            SUBDIRS += swiftlauncher
+        }
+    }
+}
+
+contains(BLACK_CONFIG, XPlane) {
+    SUBDIRS += xbus/xbus.pro
+}
+
+SUBDIRS += plugins

swift.pro

@@ -3,75 +3,22 @@ load(common_pre)
 TEMPLATE = subdirs
 CONFIG += ordered
 
-SUBDIRS += src/blackmisc
-SUBDIRS += resources/swiftresources.pro
 OTHER_FILES += mkspecs/features/*.prf
 OTHER_FILES += mkspecs/features/*.pri
 
-contains(BLACK_CONFIG, BlackSound) {
-    SUBDIRS += src/blacksound
+contains(BLACK_CONFIG, Doxygen) {
+SUBDIRS += docs
 }
 
-contains(BLACK_CONFIG, BlackInput) {
-    SUBDIRS += src/blackinput
-}
-
-contains(BLACK_CONFIG, BlackCore) {
-    SUBDIRS += src/blackcore
-    contains(BLACK_CONFIG, BlackGui) {
-        SUBDIRS += src/blackgui
-        contains(BLACK_CONFIG, SwiftGui) {
-            SUBDIRS += src/swiftguistandard/swiftguistandard.pro
-        }
-        contains(BLACK_CONFIG, SwiftCore) {
-            SUBDIRS += src/swiftcore/swiftcore.pro
-        }
-        contains(BLACK_CONFIG, SwiftData) {
-            SUBDIRS += src/swiftdata/swiftdata.pro
-        }
-        contains(BLACK_CONFIG, SwiftLauncher) {
-            SUBDIRS += src/swiftlauncher/swiftlauncher.pro
-        }
-    }
-}
-
-win32 {
-    if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) {
-        SUBDIRS += src/plugins/simulator/fscommon/plugin_fscommon.pro
-    }
-
-    contains(BLACK_CONFIG, FSX) {
-        SUBDIRS += src/plugins/simulator/fsx/plugin_fsx.pro
-        SUBDIRS += src/plugins/simulator/fsx_config/plugin_fsx_config.pro
-    }
-    contains(BLACK_CONFIG, FS9) {
-        SUBDIRS += src/plugins/simulator/fs9/plugin_fs9.pro
-    }
-}
-
-contains(BLACK_CONFIG, XPlane) {
-    SUBDIRS += src/xbus/xbus.pro
-    SUBDIRS += src/plugins/simulator/xplane/plugin_xplane.pro
-    SUBDIRS += src/plugins/simulator/xplane_config/plugin_xplane_config.pro
-}
+SUBDIRS += resources
+SUBDIRS += src
 
 contains(BLACK_CONFIG, Samples) {
-    SUBDIRS += samples/cli_client/sample_cli_client.pro
-    SUBDIRS += samples/blackmiscquantities/sample_quantities_aviation.pro
-    SUBDIRS += samples/blackmiscdbus/sample_blackmisc_dbus.pro
-    SUBDIRS += samples/blackmisc/sample_blackmisc.pro
-    SUBDIRS += samples/blackmiscsim/sample_blackmisc_sim.pro
-    SUBDIRS += samples/hotkey/sample_hotkey.pro
+    SUBDIRS += samples
 }
 
 contains(BLACK_CONFIG, Unittests) {
-    SUBDIRS += tests/blackmisc/test_blackmisc.pro
-    SUBDIRS += tests/blackcore/test_blackcore.pro
-    SUBDIRS += tests/blackgui/test_blackgui.pro
-}
-
-contains(BLACK_CONFIG, Doxygen) {
-    SUBDIRS += docs/doxygen.pro
+    SUBDIRS += tests
 }
 
 include(install.pri)

tests/blackcore/blackcore.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core testlib dbus network
 
-TARGET = test_blackcore
+TARGET = testblackcore
 TEMPLATE = app
 
 CONFIG   += console

tests/blackgui/blackgui.pro

@@ -3,7 +3,7 @@ load(common_pre)
 QT       += core testlib dbus network gui svg
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = test_blackgui
+TARGET = testblackgui
 TEMPLATE = app
 
 CONFIG   -= app_bundle

tests/blackmisc/blackmisc.pro

@@ -2,7 +2,7 @@ load(common_pre)
 
 QT       += core testlib dbus network
 
-TARGET = test_blackmisc
+TARGET = testblackmisc
 TEMPLATE = app
 
 CONFIG   += console

tests/tests.pro

@@ -0,0 +1,8 @@
+load(common_pre)
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += blackmisc
+SUBDIRS += blackcore
+SUBDIRS += blackgui