mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2026-04-02 19:08:03 -06:00
i love clang (#4098)
* clang emulator_settings.h * Update np_manager.cpp * Update userservice.cpp * Update user_manager.h
This commit is contained in:
parent
1ad9276e8a
commit
a595661d98
@ -262,8 +262,7 @@ struct InputSettings {
|
||||
&InputSettings::motion_controls_enabled),
|
||||
make_override<InputSettings>("background_controller_input",
|
||||
&InputSettings::background_controller_input),
|
||||
make_override<InputSettings>("camera_id",
|
||||
&InputSettings::camera_id)};
|
||||
make_override<InputSettings>("camera_id", &InputSettings::camera_id)};
|
||||
}
|
||||
};
|
||||
NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(InputSettings, cursor_state, cursor_hide_timeout,
|
||||
@ -611,4 +610,4 @@ public:
|
||||
#undef SETTING_FORWARD
|
||||
#undef SETTING_FORWARD_BOOL
|
||||
#undef SETTING_FORWARD_BOOL_READONLY
|
||||
};
|
||||
};
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
#include <mutex>
|
||||
#include <variant>
|
||||
|
||||
#include <core/user_settings.h>
|
||||
#include "common/logging/log.h"
|
||||
#include "core/emulator_settings.h"
|
||||
#include "core/libraries/error_codes.h"
|
||||
@ -12,7 +13,6 @@
|
||||
#include "core/libraries/np/np_error.h"
|
||||
#include "core/libraries/np/np_manager.h"
|
||||
#include "core/tls.h"
|
||||
#include <core/user_settings.h>
|
||||
|
||||
namespace Libraries::Np::NpManager {
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
#include "common/logging/log.h"
|
||||
|
||||
#include <core/user_settings.h>
|
||||
#include "common/singleton.h"
|
||||
#include "core/emulator_settings.h"
|
||||
#include "core/libraries/libs.h"
|
||||
@ -12,7 +13,6 @@
|
||||
#include "core/libraries/system/userservice_error.h"
|
||||
#include "core/tls.h"
|
||||
#include "input/controller.h"
|
||||
#include <core/user_settings.h>
|
||||
|
||||
namespace Libraries::UserService {
|
||||
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
#include <filesystem>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "common/types.h"
|
||||
#include <nlohmann/json.hpp>
|
||||
#include "common/types.h"
|
||||
|
||||
struct User {
|
||||
s32 user_id;
|
||||
@ -48,4 +48,4 @@ public:
|
||||
|
||||
private:
|
||||
Users m_users;
|
||||
};
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user