summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-11-23 17:00:33 +0100
committerZach Hilman <zachhilman@gmail.com>2018-12-03 23:27:40 +0100
commite11e65b3d63fabd7c953cca07971364984021c3e (patch)
tree444a70e43814fa3f0d969a5cc293f3f928a871dd /src
parentqt: Implement GUI dialog frontend for ProfileSelector (diff)
downloadyuzu-e11e65b3d63fabd7c953cca07971364984021c3e.tar
yuzu-e11e65b3d63fabd7c953cca07971364984021c3e.tar.gz
yuzu-e11e65b3d63fabd7c953cca07971364984021c3e.tar.bz2
yuzu-e11e65b3d63fabd7c953cca07971364984021c3e.tar.lz
yuzu-e11e65b3d63fabd7c953cca07971364984021c3e.tar.xz
yuzu-e11e65b3d63fabd7c953cca07971364984021c3e.tar.zst
yuzu-e11e65b3d63fabd7c953cca07971364984021c3e.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/am/applets/applets.cpp6
-rw-r--r--src/core/hle/service/am/applets/profile_select.cpp1
-rw-r--r--src/core/hle/service/am/applets/profile_select.h4
-rw-r--r--src/core/hle/service/am/applets/software_keyboard.cpp7
-rw-r--r--src/yuzu/applets/profile_select.h2
5 files changed, 6 insertions, 14 deletions
diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp
index 47da35537..7698ca819 100644
--- a/src/core/hle/service/am/applets/applets.cpp
+++ b/src/core/hle/service/am/applets/applets.cpp
@@ -16,11 +16,11 @@ namespace Service::AM::Applets {
AppletDataBroker::AppletDataBroker() {
auto& kernel = Core::System::GetInstance().Kernel();
state_changed_event = Kernel::WritableEvent::CreateEventPair(
- kernel, Kernel::ResetType::OneShot, "ILibraryAppletAccessor:StateChangedEvent");
+ kernel, Kernel::ResetType::Sticky, "ILibraryAppletAccessor:StateChangedEvent");
pop_out_data_event = Kernel::WritableEvent::CreateEventPair(
- kernel, Kernel::ResetType::OneShot, "ILibraryAppletAccessor:PopDataOutEvent");
+ kernel, Kernel::ResetType::Sticky, "ILibraryAppletAccessor:PopDataOutEvent");
pop_interactive_out_data_event = Kernel::WritableEvent::CreateEventPair(
- kernel, Kernel::ResetType::OneShot, "ILibraryAppletAccessor:PopInteractiveDataOutEvent");
+ kernel, Kernel::ResetType::Sticky, "ILibraryAppletAccessor:PopInteractiveDataOutEvent");
}
AppletDataBroker::~AppletDataBroker() = default;
diff --git a/src/core/hle/service/am/applets/profile_select.cpp b/src/core/hle/service/am/applets/profile_select.cpp
index 750f0fdeb..4c7b45454 100644
--- a/src/core/hle/service/am/applets/profile_select.cpp
+++ b/src/core/hle/service/am/applets/profile_select.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <cstring>
+
#include "common/assert.h"
#include "common/string_util.h"
#include "core/core.h"
diff --git a/src/core/hle/service/am/applets/profile_select.h b/src/core/hle/service/am/applets/profile_select.h
index c383527f4..787485f22 100644
--- a/src/core/hle/service/am/applets/profile_select.h
+++ b/src/core/hle/service/am/applets/profile_select.h
@@ -4,14 +4,10 @@
#pragma once
-#include <array>
-#include <string>
#include <vector>
#include "common/common_funcs.h"
-#include "common/swap.h"
#include "core/hle/service/acc/profile_manager.h"
-#include "core/hle/service/am/am.h"
#include "core/hle/service/am/applets/applets.h"
namespace Service::AM::Applets {
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp
index 40984ffa9..981bdec51 100644
--- a/src/core/hle/service/am/applets/software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/software_keyboard.cpp
@@ -38,12 +38,7 @@ static Core::Frontend::SoftwareKeyboardParameters ConvertToFrontendParameters(
return params;
}
-SoftwareKeyboard::SoftwareKeyboard() {
- // Some applets require this to be signalled on applet creation, some do not. Internally, this
- // is done by a flag in the applet module, but for simplicity SoftwareKeyboard is one of the
- // applets with this flag.
- broker.SignalStateChanged();
-}
+SoftwareKeyboard::SoftwareKeyboard() = default;
SoftwareKeyboard::~SoftwareKeyboard() = default;
diff --git a/src/yuzu/applets/profile_select.h b/src/yuzu/applets/profile_select.h
index 9acb092f3..868573324 100644
--- a/src/yuzu/applets/profile_select.h
+++ b/src/yuzu/applets/profile_select.h
@@ -23,7 +23,7 @@ class QtProfileSelectionDialog final : public QDialog {
Q_OBJECT
public:
- QtProfileSelectionDialog(QWidget* parent);
+ explicit QtProfileSelectionDialog(QWidget* parent);
~QtProfileSelectionDialog() override;
void accept() override;