moved some types from global root to global/types

src/appshell/iappshellconfiguration.h

@@ -23,7 +23,7 @@
 #define MU_APPSHELL_IAPPSHELLCONFIGURATION_H
 
 #include "modularity/imoduleexport.h"
-#include "retval.h"
+#include "types/retval.h"
 
 #include "io/path.h"
 #include "appshelltypes.h"

src/appshell/internal/istartupscenario.h

@@ -24,7 +24,7 @@
 
 #include "modularity/ioc.h"
 #include "io/path.h"
-#include "uri.h"
+#include "types/uri.h"
 
 namespace mu::appshell {
 class IStartupScenario : MODULE_EXPORT_INTERFACE

src/autobot/autobottypes.h

@@ -27,7 +27,7 @@
 #include <QJSValue>
 
 #include "io/path.h"
-#include "ret.h"
+#include "types/ret.h"
 
 namespace mu::autobot {
 struct File {

src/autobot/iautobot.h

@@ -26,7 +26,7 @@
 #include <QJSValue>
 
 #include "modularity/imoduleexport.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "io/path.h"
 #include "async/channel.h"
 #include "autobottypes.h"

src/autobot/iautobotscriptsrepository.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 #include "autobottypes.h"
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::autobot {
 class IAutobotScriptsRepository : MODULE_EXPORT_INTERFACE

src/autobot/internal/autobotactionscontroller.cpp

@@ -21,7 +21,7 @@
  */
 #include "autobotactionscontroller.h"
 
-#include "uri.h"
+#include "types/uri.h"
 
 using namespace mu::autobot;
 

src/autobot/internal/scriptengine.h

@@ -30,7 +30,7 @@
 
 #include "modularity/ioc.h"
 #include "io/ifilesystem.h"
-#include "ret.h"
+#include "types/ret.h"
 
 #include "api/iapiengine.h"
 #include "api/scriptapi.h"

src/autobot/internal/testcaserunner.h

@@ -30,7 +30,7 @@
 
 #include "async/channel.h"
 #include "async/asyncable.h"
-#include "ret.h"
+#include "types/ret.h"
 #include "io/path.h"
 
 #include "autobottypes.h"

src/autobot/itestcasecontext.h

@@ -28,7 +28,7 @@
 #include <QJSValue>
 #include <QString>
 
-#include "ret.h"
+#include "types/ret.h"
 
 namespace mu::autobot {
 class ITestCaseContext

src/cloud/iauthorizationservice.h

@@ -25,7 +25,7 @@
 #include "modularity/imoduleexport.h"
 #include "cloudtypes.h"
 
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::cloud {
 class IAuthorizationService : MODULE_EXPORT_INTERFACE

src/converter/convertercodes.h

@@ -22,7 +22,7 @@
 #ifndef MU_CONVERTER_CONVERTERCODES_H
 #define MU_CONVERTER_CONVERTERCODES_H
 
-#include "ret.h"
+#include "types/ret.h"
 
 namespace mu::converter {
 enum class Err {

src/converter/iconvertercontroller.h

@@ -23,7 +23,7 @@
 #define MU_CONVERTER_ICONVERTERCONTROLLER_H
 
 #include "modularity/imoduleexport.h"
-#include "ret.h"
+#include "types/ret.h"
 #include "io/path.h"
 
 namespace mu::converter {

src/converter/internal/compat/backendapi.h

@@ -22,7 +22,7 @@
 #ifndef MU_CONVERTER_BACKENDAPI_H
 #define MU_CONVERTER_BACKENDAPI_H
 
-#include "retval.h"
+#include "types/retval.h"
 
 #include "io/path.h"
 

src/converter/internal/convertercontroller.h

@@ -32,7 +32,7 @@
 #include "project/iprojectrwregister.h"
 #include "context/iglobalcontext.h"
 
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::converter {
 class ConverterController : public IConverterController

src/diagnostics/diagnosticutils.h

@@ -24,7 +24,7 @@
 
 #include <QObject>
 
-#include "uri.h"
+#include "types/uri.h"
 #include "log.h"
 
 namespace mu::diagnostics {

src/diagnostics/internal/diagnosticsactionscontroller.cpp

@@ -21,7 +21,7 @@
  */
 #include "diagnosticsactionscontroller.h"
 
-#include "uri.h"
+#include "types/uri.h"
 
 #include "view/diagnosticaccessiblemodel.h"
 

src/engraving/engravingerrors.h

@@ -25,7 +25,7 @@
 
 #include "libmscore/masterscore.h"
 
-#include "ret.h"
+#include "types/ret.h"
 #include "translation.h"
 
 namespace mu::engraving {

src/engraving/playback/mapping/setupresolverbase.h

@@ -23,6 +23,8 @@
 #ifndef MU_ENGRAVING_SETUPRESOLVERBASE_H
 #define MU_ENGRAVING_SETUPRESOLVERBASE_H
 
+#include <cassert>
+
 #include "mpe/events.h"
 
 #include "libmscore/instrument.h"
@@ -34,7 +36,8 @@ class SetupDataResolverBase
 public:
     static bool isAbleToResolve(const Instrument* instrument)
     {
-        IF_ASSERT_FAILED(instrument) {
+        assert(instrument);
+        if (!instrument) {
             return false;
         }
 
@@ -43,7 +46,8 @@ public:
 
     static void resolve(const Instrument* instrument, mpe::PlaybackSetupData& result)
     {
-        IF_ASSERT_FAILED(instrument) {
+        assert(instrument);
+        if (!instrument) {
             return;
         }
 

src/engraving/playback/playbackmodel.cpp

@@ -34,6 +34,8 @@
 
 #include "utils/pitchutils.h"
 
+#include "log.h"
+
 using namespace mu;
 using namespace mu::engraving;
 using namespace mu::mpe;

src/engraving/playback/playbackmodel.h

@@ -30,7 +30,7 @@
 #include "async/asyncable.h"
 #include "async/channel.h"
 #include "async/notification.h"
-#include "id.h"
+#include "types/id.h"
 #include "modularity/ioc.h"
 #include "mpe/events.h"
 #include "mpe/iarticulationprofilesrepository.h"

src/engraving/playback/playbacksetupdataresolver.cpp

@@ -28,6 +28,8 @@
 #include "mapping/percussionssetupdataresolver.h"
 #include "mapping/voicessetupdataresolver.h"
 
+#include "log.h"
+
 using namespace mu::engraving;
 using namespace mu::mpe;
 

src/engraving/types/types.h

@@ -26,7 +26,7 @@
 #include <map>
 
 #include "types/string.h"
-#include "id.h"
+#include "types/id.h"
 
 #include "draw/types/color.h"
 #include "draw/types/geometry.h"

src/framework/accessibility/iaccessible.h

@@ -30,7 +30,7 @@
 #include <QMap>
 
 #include "async/channel.h"
-#include "val.h"
+#include "types/val.h"
 
 class QWindow;
 

src/framework/audio/audioerrors.h

@@ -22,7 +22,7 @@
 #ifndef MU_AUDIO_AUDIOERRORS_H
 #define MU_AUDIO_AUDIOERRORS_H
 
-#include "ret.h"
+#include "types/ret.h"
 
 namespace mu::audio {
 enum class Err {

src/framework/audio/iaudioconfiguration.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 #include "io/path.h"
-#include "ret.h"
+#include "types/ret.h"
 #include "async/channel.h"
 #include "async/notification.h"
 

src/framework/audio/internal/worker/audioengine.h

@@ -26,7 +26,7 @@
 
 #include "modularity/ioc.h"
 #include "async/asyncable.h"
-#include "retval.h"
+#include "types/retval.h"
 
 #include "iaudiodriver.h"
 #include "internal/worker/mixer.h"

src/framework/audio/internal/worker/iclock.h

@@ -25,7 +25,7 @@
 
 #include <memory>
 
-#include "ret.h"
+#include "types/ret.h"
 #include "async/channel.h"
 #include "async/notification.h"
 

src/framework/audio/internal/worker/isequenceio.h

@@ -25,7 +25,7 @@
 
 #include <memory>
 
-#include "retval.h"
+#include "types/retval.h"
 
 #include "audiotypes.h"
 

src/framework/audio/internal/worker/isequenceplayer.h

@@ -23,7 +23,7 @@
 #ifndef MU_AUDIO_ISEQUENCEPLAYER_H
 #define MU_AUDIO_ISEQUENCEPLAYER_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "async/channel.h"
 
 #include "audiotypes.h"

src/framework/audio/internal/worker/itracksequence.h

@@ -24,7 +24,7 @@
 #define MU_AUDIO_ITRACKSEQUENCE_H
 
 #include "async/channel.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "mpe/events.h"
 
 #include "iaudiosource.h"

src/framework/audio/isoundfontrepository.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 
-#include "ret.h"
+#include "types/ret.h"
 #include "async/channel.h"
 #include "synthtypes.h"
 

src/framework/audio/synthtypes.h

@@ -26,7 +26,7 @@
 #include <map>
 
 #include "io/path.h"
-#include "uri.h"
+#include "types/uri.h"
 #include "midi/miditypes.h"
 
 namespace mu::audio::synth {

src/framework/draw/utils/drawjson.h

@@ -23,7 +23,7 @@
 #define MU_DRAW_DRAWJSON_H
 
 #include "../buffereddrawtypes.h"
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::draw {
 class DrawBufferJson

src/framework/global/CMakeLists.txt

@@ -40,10 +40,6 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/logremover.h
     ${CMAKE_CURRENT_LIST_DIR}/dataformatter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/dataformatter.h
-    ${CMAKE_CURRENT_LIST_DIR}/id.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/id.h
-    ${CMAKE_CURRENT_LIST_DIR}/val.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/val.h
     ${CMAKE_CURRENT_LIST_DIR}/version.cpp
     ${CMAKE_CURRENT_LIST_DIR}/version.h
     ${CMAKE_CURRENT_LIST_DIR}/stringutils.cpp
@@ -55,19 +51,12 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/translation.cpp
     ${CMAKE_CURRENT_LIST_DIR}/translation.h
     ${CMAKE_CURRENT_LIST_DIR}/timer.h
-    ${CMAKE_CURRENT_LIST_DIR}/ret.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/ret.h
-    ${CMAKE_CURRENT_LIST_DIR}/retval.h
-    ${CMAKE_CURRENT_LIST_DIR}/uri.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/uri.h
     ${CMAKE_CURRENT_LIST_DIR}/progress.h
     ${CMAKE_CURRENT_LIST_DIR}/smuflranges.cpp
     ${CMAKE_CURRENT_LIST_DIR}/smuflranges.h
     ${CMAKE_CURRENT_LIST_DIR}/utils.cpp
     ${CMAKE_CURRENT_LIST_DIR}/utils.h
     ${CMAKE_CURRENT_LIST_DIR}/defer.h
-    ${CMAKE_CURRENT_LIST_DIR}/sharedhashmap.h
-    ${CMAKE_CURRENT_LIST_DIR}/sharedmap.h
     ${CMAKE_CURRENT_LIST_DIR}/containers.h
     ${CMAKE_CURRENT_LIST_DIR}/icryptographichash.h
     ${CMAKE_CURRENT_LIST_DIR}/allocator.cpp
@@ -80,6 +69,17 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/types/datetime.cpp
     ${CMAKE_CURRENT_LIST_DIR}/types/datetime.h
     ${CMAKE_CURRENT_LIST_DIR}/types/flags.h
+    ${CMAKE_CURRENT_LIST_DIR}/types/id.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/types/id.h
+    ${CMAKE_CURRENT_LIST_DIR}/types/val.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/types/val.h
+    ${CMAKE_CURRENT_LIST_DIR}/types/ret.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/types/ret.h
+    ${CMAKE_CURRENT_LIST_DIR}/types/retval.h
+    ${CMAKE_CURRENT_LIST_DIR}/types/uri.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/types/uri.h
+    ${CMAKE_CURRENT_LIST_DIR}/types/sharedhashmap.h
+    ${CMAKE_CURRENT_LIST_DIR}/types/sharedmap.h
 
     ${CMAKE_CURRENT_LIST_DIR}/io/ioenums.h
     ${CMAKE_CURRENT_LIST_DIR}/io/path.cpp

src/framework/global/iinteractive.h

@@ -24,9 +24,9 @@
 
 #include "modularity/imoduleexport.h"
 #include "io/path.h"
-#include "val.h"
-#include "retval.h"
-#include "uri.h"
+#include "types/val.h"
+#include "types/retval.h"
+#include "types/uri.h"
 #include "types/flags.h"
 
 namespace mu::framework {

src/framework/global/io/dir.h

@@ -22,7 +22,7 @@
 #ifndef MU_IO_DIR_H
 #define MU_IO_DIR_H
 
-#include "retval.h"
+#include "types/retval.h"
 #include "path.h"
 #include "ioenums.h"
 #include "types/string.h"

src/framework/global/io/ifilesystem.h

@@ -25,7 +25,7 @@
 #include "modularity/imoduleexport.h"
 #include "types/bytearray.h"
 #include "types/datetime.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "path.h"
 #include "ioenums.h"
 

src/framework/global/io/ioretcodes.h

@@ -22,7 +22,7 @@
 #ifndef MU_IO_IORETCODES_H
 #define MU_IO_IORETCODES_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "translation.h"
 
 namespace mu::io {

src/framework/global/progress.h

@@ -25,7 +25,7 @@
 #include "async/channel.h"
 #include "async/notification.h"
 
-#include "ret.h"
+#include "types/ret.h"
 
 namespace mu::framework {
 struct Progress

src/framework/global/settings.h

@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#include "val.h"
+#include "types/val.h"
 #include "async/channel.h"
 #include "io/path.h"
 

src/framework/global/tests/uri_tests.cpp

@@ -21,7 +21,7 @@
  */
 #include <gtest/gtest.h>
 
-#include "uri.h"
+#include "types/uri.h"
 
 using namespace mu;
 

src/framework/global/tests/val_tests.cpp

@@ -21,7 +21,7 @@
  */
 #include <gtest/gtest.h>
 
-#include "val.h"
+#include "types/val.h"
 
 using namespace mu;
 

src/framework/global/types/id.cpp

@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "id.h"
+#include "types/id.h"
 
 using namespace mu;
 

src/framework/global/types/ret.cpp

@@ -20,7 +20,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ret.h"
+#include "types/ret.h"
 
 using namespace mu;
 

src/framework/global/types/retval.h

@@ -22,7 +22,7 @@
 #ifndef MU_FRAMEWORK_RETVAL_H
 #define MU_FRAMEWORK_RETVAL_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "async/channel.h"
 #include "async/notification.h"
 

src/framework/global/types/uri.cpp

@@ -19,7 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "uri.h"
+#include "types/uri.h"
 
 #include "log.h"
 #include "stringutils.h"

src/framework/global/types/uri.h

@@ -26,7 +26,7 @@
 #include <vector>
 #include <map>
 
-#include "val.h"
+#include "types/val.h"
 
 namespace mu {
 class Uri

src/framework/global/types/val.cpp

@@ -19,7 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "val.h"
+#include "types/val.h"
 
 #include <sstream>
 #include <iomanip>

src/framework/midi/imidiinport.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 
-#include "ret.h"
+#include "types/ret.h"
 #include "async/channel.h"
 #include "async/notification.h"
 #include "miditypes.h"

src/framework/midi/imidioutport.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 
-#include "ret.h"
+#include "types/ret.h"
 #include "async/notification.h"
 #include "miditypes.h"
 

src/framework/midi/midierrors.h

@@ -22,7 +22,7 @@
 #ifndef MU_MIDI_MIDIERRORS_H
 #define MU_MIDI_MIDIERRORS_H
 
-#include "ret.h"
+#include "types/ret.h"
 
 namespace mu::midi {
 enum class Err {

src/framework/midi/miditypes.h

@@ -32,7 +32,7 @@
 #include <set>
 #include <cassert>
 #include "async/channel.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "midievent.h"
 
 namespace mu::midi {

src/framework/mpe/mpetypes.h

@@ -32,9 +32,8 @@
 #include <set>
 #include <vector>
 
-#include "log.h"
-#include "sharedhashmap.h"
-#include "sharedmap.h"
+#include "types/sharedhashmap.h"
+#include "types/sharedmap.h"
 
 #include "soundid.h"
 

src/framework/network/inetworkmanager.h

@@ -22,7 +22,7 @@
 #ifndef MU_NETWORK_INETWORKMANAGER_H
 #define MU_NETWORK_INETWORKMANAGER_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "async/channel.h"
 #include "global/progress.h"
 #include "networktypes.h"

src/framework/network/networkerrors.h

@@ -22,7 +22,7 @@
 #ifndef MU_NETWORK_NETWORKERRORS_H
 #define MU_NETWORK_NETWORKERRORS_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "translation.h"
 
 namespace mu::network {

src/framework/shortcuts/imidiremote.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 #include "midi/miditypes.h"
-#include "ret.h"
+#include "types/ret.h"
 #include "shortcutstypes.h"
 
 namespace mu::shortcuts {

src/framework/shortcuts/ishortcutsconfiguration.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 #include "io/path.h"
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::shortcuts {
 class IShortcutsConfiguration : MODULE_EXPORT_INTERFACE

src/framework/shortcuts/ishortcutsregister.h

@@ -27,7 +27,7 @@
 #include "modularity/imoduleexport.h"
 #include "shortcutstypes.h"
 #include "async/notification.h"
-#include "ret.h"
+#include "types/ret.h"
 #include "io/path.h"
 
 namespace mu::shortcuts {

src/framework/ui/iinteractiveprovider.h

@@ -23,8 +23,8 @@
 #define MU_UI_IINTERACTIVEPROVIDER_H
 
 #include "modularity/imoduleexport.h"
-#include "uri.h"
-#include "retval.h"
+#include "types/uri.h"
+#include "types/retval.h"
 
 #include "iinteractive.h"
 

src/framework/ui/iinteractiveuriregister.h

@@ -23,7 +23,7 @@
 #define MU_UI_IINTERACTIVEURIREGISTER_H
 
 #include "modularity/imoduleexport.h"
-#include "global/uri.h"
+#include "types/uri.h"
 #include "uitypes.h"
 
 namespace mu::ui {

src/framework/ui/internal/platform/windows/windowsplatformtheme.h

@@ -25,7 +25,7 @@
 
 #include "internal/iplatformtheme.h"
 
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::ui {
 class WindowsPlatformTheme : public IPlatformTheme

src/framework/ui/internal/uiconfiguration.h

@@ -29,7 +29,7 @@
 #include "imainwindow.h"
 #include "internal/iplatformtheme.h"
 
-#include "val.h"
+#include "types/val.h"
 #include "uiarrangement.h"
 #include "async/asyncable.h"
 

src/framework/ui/iuiconfiguration.h

@@ -25,7 +25,7 @@
 
 #include <optional>
 
-#include "retval.h"
+#include "types/retval.h"
 #include "async/notification.h"
 
 #include "modularity/imoduleexport.h"

src/framework/ui/uierrors.h

@@ -22,7 +22,7 @@
 #ifndef MU_UI_UIERRORS_H
 #define MU_UI_UIERRORS_H
 
-#include "ret.h"
+#include "types/ret.h"
 
 namespace mu::ui {
 enum class Err {

src/framework/ui/uitypes.h

@@ -28,8 +28,8 @@
 #include <QString>
 #include <QMetaType>
 
-#include "ret.h"
-#include "val.h"
+#include "types/ret.h"
+#include "types/val.h"
 #include "actions/actiontypes.h"
 #include "view/iconcodes.h"
 #include "shortcuts/shortcutstypes.h"

src/framework/ui/view/interactiveprovider.h

@@ -31,7 +31,7 @@
 #include "../iinteractiveprovider.h"
 #include "../iinteractiveuriregister.h"
 #include "../imainwindow.h"
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::ui {
 class QmlLaunchData : public QObject

src/framework/uicomponents/view/popupview.h

@@ -26,7 +26,7 @@
 #include <QQuickItem>
 #include <QQmlParserStatus>
 
-#include "ret.h"
+#include "types/ret.h"
 #include "async/asyncable.h"
 
 #include "modularity/ioc.h"

src/framework/uicomponents/view/sortfilterproxymodel.cpp

@@ -21,7 +21,7 @@
  */
 #include "sortfilterproxymodel.h"
 
-#include "val.h"
+#include "types/val.h"
 
 using namespace mu::uicomponents;
 

src/framework/vst/vsterrors.h

@@ -23,7 +23,7 @@
 #ifndef MU_VST_VSTERRORS_H
 #define MU_VST_VSTERRORS_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "translation.h"
 
 namespace mu::vst {

src/languages/ilanguagesconfiguration.h

@@ -23,7 +23,7 @@
 #define MU_LANGUAGES_ILANGUAGESCONFIGURATION_H
 
 #include "modularity/imoduleexport.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "io/path.h"
 #include "languagestypes.h"
 

src/languages/ilanguagesservice.h

@@ -23,7 +23,7 @@
 #define MU_LANGUAGES_ILANGUAGESSERVICE_H
 
 #include "modularity/imoduleexport.h"
-#include "retval.h"
+#include "types/retval.h"
 
 #include "languagestypes.h"
 

src/languages/ilanguageunpacker.h

@@ -25,7 +25,7 @@
 #include <QString>
 
 #include "modularity/imoduleexport.h"
-#include "ret.h"
+#include "types/ret.h"
 #include "io/path.h"
 
 namespace mu::languages {

src/languages/internal/languageunpacker.h

@@ -22,7 +22,7 @@
 #ifndef MU_LANGUAGES_LANGUAGEUNPACKER_H
 #define MU_LANGUAGES_LANGUAGEUNPACKER_H
 
-#include "retval.h"
+#include "types/retval.h"
 
 #include "../ilanguageunpacker.h"
 

src/languages/languageserrors.h

@@ -22,7 +22,7 @@
 #ifndef MU_LANGUAGES_LANGUAGESERRORS_H
 #define MU_LANGUAGES_LANGUAGESERRORS_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "translation.h"
 
 namespace mu::languages {

src/learn/learnerrors.h

@@ -22,7 +22,7 @@
 #ifndef MU_LEARN_LEARNERRORS_H
 #define MU_LEARN_LEARNERRORS_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "translation.h"
 
 namespace mu::learn {

src/multiinstances/imultiinstancesprovider.h

@@ -30,7 +30,7 @@
 #include "mitypes.h"
 #include "async/notification.h"
 #include "async/channel.h"
-#include "val.h"
+#include "types/val.h"
 
 namespace mu::mi {
 class IMultiInstancesProvider : MODULE_EXPORT_INTERFACE

src/multiinstances/internal/ipc/ipcchannel.h

@@ -33,7 +33,7 @@
 #include "async/channel.h"
 #include "async/notification.h"
 
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::ipc {
 //! NOTE Inter-Process Communication Channel

src/multiinstances/internal/multiinstancesprovider.cpp

@@ -26,7 +26,7 @@
 #include <QTimer>
 #include <QEventLoop>
 
-#include "uri.h"
+#include "types/uri.h"
 #include "settings.h"
 #include "log.h"
 

src/notation/iinstrumentsrepository.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 
-#include "retval.h"
+#include "types/retval.h"
 #include "notationtypes.h"
 
 namespace mu::notation {

src/notation/imasternotation.h

@@ -23,7 +23,7 @@
 #define MU_NOTATION_IMASTERNOTATION_H
 
 #include "modularity/imoduleexport.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "io/path.h"
 
 #include "inotation.h"

src/notation/inotationaccessibility.h

@@ -23,7 +23,7 @@
 #ifndef MU_NOTATION_INOTATIONACCESSIBILITY_H
 #define MU_NOTATION_INOTATIONACCESSIBILITY_H
 
-#include "retval.h"
+#include "types/retval.h"
 #include "notationtypes.h"
 
 #include "engraving/accessibility/accessibleroot.h"

src/notation/inotationconfiguration.h

@@ -26,7 +26,7 @@
 
 #include "modularity/imoduleexport.h"
 #include "async/channel.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "io/path.h"
 #include "notationtypes.h"
 #include "global/globaltypes.h"

src/notation/inotationnoteinput.h

@@ -24,7 +24,7 @@
 
 #include "async/notification.h"
 #include "notationtypes.h"
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::notation {
 class INotationNoteInput

src/notation/inotationparts.h

@@ -26,7 +26,7 @@
 #include "async/notification.h"
 #include "async/channel.h"
 #include "async/notifylist.h"
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::notation {
 class INotationParts

src/notation/inotationplayback.h

@@ -22,7 +22,7 @@
 #ifndef MU_NOTATION_INOTATIONPLAYBACK_H
 #define MU_NOTATION_INOTATIONPLAYBACK_H
 
-#include "retval.h"
+#include "types/retval.h"
 #include "midi/miditypes.h"
 #include "audio/audiotypes.h"
 #include "async/channel.h"

src/notation/inotationselection.h

@@ -26,7 +26,7 @@
 
 #include "notationtypes.h"
 #include "internal/inotationselectionrange.h"
-#include "ret.h"
+#include "types/ret.h"
 
 class QMimeData;
 

src/notation/inotationviewstate.h

@@ -25,7 +25,7 @@
 #include <memory>
 
 #include "async/channel.h"
-#include "retval.h"
+#include "types/retval.h"
 
 #include "draw/types/transform.h"
 

src/notation/internal/masternotation.h

@@ -25,7 +25,7 @@
 #include <memory>
 
 #include "modularity/ioc.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "project/projecttypes.h"
 
 #include "notation.h"

src/notation/iselectinstrumentscenario.h

@@ -24,7 +24,7 @@
 
 #include "modularity/imoduleexport.h"
 #include "notation/notationtypes.h"
-#include "retval.h"
+#include "types/retval.h"
 
 namespace mu::notation {
 class ISelectInstrumentsScenario : MODULE_EXPORT_INTERFACE

src/notation/notationerrors.h

@@ -22,7 +22,7 @@
 #ifndef MU_NOTATION_NOTATIONERRORS_H
 #define MU_NOTATION_NOTATIONERRORS_H
 
-#include "ret.h"
+#include "types/ret.h"
 #include "translation.h"
 
 namespace mu::notation {

src/notation/notationtypes.h

@@ -28,7 +28,7 @@
 
 #include "io/path.h"
 #include "translation.h"
-#include "id.h"
+#include "types/id.h"
 #include "midi/midievent.h"
 
 #include "libmscore/engravingitem.h"

src/palette/internal/paletteprovider.cpp

@@ -40,7 +40,7 @@
 #include "commonscene/commonscenetypes.h"
 
 #include "translation.h"
-#include "uri.h"
+#include "types/uri.h"
 
 using namespace mu::palette;
 using namespace mu::framework;

src/palette/ipaletteconfiguration.h

@@ -27,7 +27,7 @@
 
 #include "modularity/imoduleexport.h"
 
-#include "retval.h"
+#include "types/retval.h"
 #include "io/path.h"
 
 namespace mu::palette {

src/playback/internal/playbackcontroller.h

@@ -25,7 +25,7 @@
 #include <unordered_map>
 
 #include "modularity/ioc.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "async/asyncable.h"
 #include "actions/iactionsdispatcher.h"
 #include "actions/actionable.h"

src/playback/iplaybackconfiguration.h

@@ -23,7 +23,7 @@
 #define MU_PLAYBACK_IPLAYBACKCONFIGURATION_H
 
 #include "modularity/imoduleexport.h"
-#include "retval.h"
+#include "types/retval.h"
 #include "playbacktypes.h"
 
 namespace mu::playback {