Merge pull request #12760 from liamwhite/mp-am

am: rewrite for multiprocess support

1 files changed, 11 insertions, 11 deletions

diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h
index 8ed96da24..a32a98e4c 100644
--- a/src/core/frontend/applets/software_keyboard.h
+++ b/src/core/frontend/applets/software_keyboard.h
@@ -8,7 +8,7 @@
 #include "common/common_types.h"
 
 #include "core/frontend/applets/applet.h"
-#include "core/hle/service/am/applets/applet_software_keyboard_types.h"
+#include "core/hle/service/am/frontend/applet_software_keyboard_types.h"
 
 namespace Core::Frontend {
 
@@ -23,10 +23,10 @@ struct KeyboardInitializeParameters {
     u32 max_text_length;
     u32 min_text_length;
     s32 initial_cursor_position;
-    Service::AM::Applets::SwkbdType type;
-    Service::AM::Applets::SwkbdPasswordMode password_mode;
-    Service::AM::Applets::SwkbdTextDrawType text_draw_type;
-    Service::AM::Applets::SwkbdKeyDisableFlags key_disable_flags;
+    Service::AM::Frontend::SwkbdType type;
+    Service::AM::Frontend::SwkbdPasswordMode password_mode;
+    Service::AM::Frontend::SwkbdTextDrawType text_draw_type;
+    Service::AM::Frontend::SwkbdKeyDisableFlags key_disable_flags;
     bool use_blur_background;
     bool enable_backspace_button;
     bool enable_return_button;
@@ -40,8 +40,8 @@ struct InlineAppearParameters {
     f32 key_top_scale_y;
     f32 key_top_translate_x;
     f32 key_top_translate_y;
-    Service::AM::Applets::SwkbdType type;
-    Service::AM::Applets::SwkbdKeyDisableFlags key_disable_flags;
+    Service::AM::Frontend::SwkbdType type;
+    Service::AM::Frontend::SwkbdKeyDisableFlags key_disable_flags;
     bool key_top_as_floating;
     bool enable_backspace_button;
     bool enable_return_button;
@@ -56,9 +56,9 @@ struct InlineTextParameters {
 class SoftwareKeyboardApplet : public Applet {
 public:
     using SubmitInlineCallback =
-        std::function<void(Service::AM::Applets::SwkbdReplyType, std::u16string, s32)>;
+        std::function<void(Service::AM::Frontend::SwkbdReplyType, std::u16string, s32)>;
     using SubmitNormalCallback =
-        std::function<void(Service::AM::Applets::SwkbdResult, std::u16string, bool)>;
+        std::function<void(Service::AM::Frontend::SwkbdResult, std::u16string, bool)>;
 
     virtual ~SoftwareKeyboardApplet();
 
@@ -69,7 +69,7 @@ public:
 
     virtual void ShowNormalKeyboard() const = 0;
 
-    virtual void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
+    virtual void ShowTextCheckDialog(Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
                                      std::u16string text_check_message) const = 0;
 
     virtual void ShowInlineKeyboard(InlineAppearParameters appear_parameters) const = 0;
@@ -93,7 +93,7 @@ public:
 
     void ShowNormalKeyboard() const override;
 
-    void ShowTextCheckDialog(Service::AM::Applets::SwkbdTextCheckResult text_check_result,
+    void ShowTextCheckDialog(Service::AM::Frontend::SwkbdTextCheckResult text_check_result,
                              std::u16string text_check_message) const override;
 
     void ShowInlineKeyboard(InlineAppearParameters appear_parameters) const override;