From 8fb74f945be48f73dd05878f87e13e03dd4e78fa Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 15 Oct 2019 12:53:54 +0200
Subject: [PATCH] [AFV] Ref T730, move voice settings into voice setup .h file

* same like we do for audio
* there was only one file in the settings subdir
---
 src/blackcore/context/contextaudio.h         |  6 +--
 src/blackmisc/audio/settings/voicesettings.h | 41 --------------------
 src/blackmisc/audio/voicesetup.h             | 15 +++++++
 src/blackmisc/blackmisc.pro                  |  2 +-
 4 files changed, 19 insertions(+), 45 deletions(-)
 delete mode 100644 src/blackmisc/audio/settings/voicesettings.h

diff --git a/src/blackcore/context/contextaudio.h b/src/blackcore/context/contextaudio.h
index 38d3b06d7..86ddb534c 100644
--- a/src/blackcore/context/contextaudio.h
+++ b/src/blackcore/context/contextaudio.h
@@ -21,10 +21,10 @@
 #include "blacksound/selcalplayer.h"
 #include "blacksound/notificationplayer.h"
 #include "blackmisc/macos/microphoneaccess.h"
-#include "blackmisc/audio/settings/voicesettings.h"
 #include "blackmisc/audio/audiodeviceinfolist.h"
 #include "blackmisc/audio/notificationsounds.h"
 #include "blackmisc/audio/audiosettings.h"
+#include "blackmisc/audio/voicesetup.h"
 #include "blackmisc/audio/ptt.h"
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/aviation/comsystem.h"
@@ -253,8 +253,8 @@ namespace BlackCore
             static constexpr int MinUnmuteVolume = 20; //!< minimum volume when unmuted
 
             // settings
-            BlackMisc::CSetting<BlackMisc::Audio::TSettings>             m_audioSettings { this, &IContextAudio::onChangedAudioSettings };
-            BlackMisc::CSetting<BlackMisc::Audio::Settings::TVoiceSetup> m_voiceSettings { this, &IContextAudio::onChangedVoiceSettings };
+            BlackMisc::CSetting<BlackMisc::Audio::TSettings>   m_audioSettings { this, &IContextAudio::onChangedAudioSettings };
+            BlackMisc::CSetting<BlackMisc::Audio::TVoiceSetup> m_voiceSettings { this, &IContextAudio::onChangedVoiceSettings };
 
             BlackMisc::CSetting<Audio::TInputDevice>  m_inputDeviceSetting  { this, &IContextAudio::changeDeviceSettings };
             BlackMisc::CSetting<Audio::TOutputDevice> m_outputDeviceSetting { this, &IContextAudio::changeDeviceSettings };
diff --git a/src/blackmisc/audio/settings/voicesettings.h b/src/blackmisc/audio/settings/voicesettings.h
deleted file mode 100644
index 4e4fb9a2a..000000000
--- a/src/blackmisc/audio/settings/voicesettings.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 2018
- * swift project Community / Contributors
- *
- * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
- * directory of this distribution. No part of swift project, including this file, may be copied, modified, propagated,
- * or distributed except according to the terms contained in the LICENSE file.
- */
-
-//! \file
-
-#ifndef BLACKMISC_AUDIO_SETTINGS_VOICESETTINGS_H
-#define BLACKMISC_AUDIO_SETTINGS_VOICESETTINGS_H
-
-#include "blackmisc/audio/voicesetup.h"
-#include "blackmisc/statusmessagelist.h"
-#include "blackmisc/settingscache.h"
-
-namespace BlackMisc
-{
-    namespace Audio
-    {
-        namespace Settings
-        {
-            //! Voice settings
-            //! \deprecated Voice VATLIB specifics
-            struct TVoiceSetup : public TSettingTrait<CVoiceSetup>
-            {
-                //! \copydoc BlackMisc::TSettingTrait::key
-                static const char *key() { return "audio/%Application%/currentvoicesetup"; }
-
-                //! \copydoc BlackMisc::TSettingTrait::humanReadable
-                static const QString &humanReadable() { static const QString name("Voice setup"); return name; }
-
-                //! \copydoc BlackMisc::TSettingTrait::isValid
-                static bool isValid(const CVoiceSetup &setup, QString &) { return setup.validate().isSuccess(); }
-            };
-        } // ns
-    } // ns
-} // ns
-
-#endif
diff --git a/src/blackmisc/audio/voicesetup.h b/src/blackmisc/audio/voicesetup.h
index 6dcdd9f45..f6c7a8713 100644
--- a/src/blackmisc/audio/voicesetup.h
+++ b/src/blackmisc/audio/voicesetup.h
@@ -12,6 +12,7 @@
 #define BLACKMISC_AUDIO_VOICESETUP_H
 
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/settingscache.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
@@ -82,6 +83,20 @@ namespace BlackMisc
                 BLACK_METAMEMBER(afvMapUrl)
             );
         };
+
+        //! Voice settings
+        //! \deprecated Voice VATLIB specifics
+        struct TVoiceSetup : public TSettingTrait<CVoiceSetup>
+        {
+            //! \copydoc BlackMisc::TSettingTrait::key
+            static const char *key() { return "audio/%Application%/currentvoicesetup"; }
+
+            //! \copydoc BlackMisc::TSettingTrait::humanReadable
+            static const QString &humanReadable() { static const QString name("Voice setup"); return name; }
+
+            //! \copydoc BlackMisc::TSettingTrait::isValid
+            static bool isValid(const CVoiceSetup &setup, QString &) { return setup.validate().isSuccess(); }
+        };
     } // namespace
 } // namespace
 
diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro
index c6f6884fc..fa6f084bc 100644
--- a/src/blackmisc/blackmisc.pro
+++ b/src/blackmisc/blackmisc.pro
@@ -27,7 +27,7 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
 
 HEADERS +=  *.h \
             $$PWD/audio/*.h \
-            $$PWD/audio/settings/*.h \
+#            $$PWD/audio/settings/*.h \
             $$PWD/aviation/*.h \
             $$PWD/db/*.h \
             $$PWD/geo/*.h \