clang-format fixes

This commit is contained in:
Hamish Milne 2019-12-27 21:07:29 +00:00 committed by zhupengfei
parent d482fb359c
commit 7b846ffa98
117 changed files with 797 additions and 925 deletions

View file

@ -10,10 +10,10 @@
#include <vector>
#include <boost/serialization/array.hpp>
#include "common/serialization/optional.h"
#include "core/global.h"
#include "core/hle/kernel/event.h"
#include "core/hle/result.h"
#include "core/hle/service/fs/archive.h"
#include "core/global.h"
namespace Core {
class System;
@ -90,13 +90,12 @@ struct MessageParameter {
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & sender_id;
ar & destination_id;
ar & signal;
ar & object;
ar & buffer;
void serialize(Archive& ar, const unsigned int) {
ar& sender_id;
ar& destination_id;
ar& signal;
ar& object;
ar& buffer;
}
friend class boost::serialization::access;
};
@ -179,12 +178,11 @@ public:
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & next_title_id;
ar & next_media_type;
ar & current_title_id;
ar & current_media_type;
void serialize(Archive& ar, const unsigned int) {
ar& next_title_id;
ar& next_media_type;
ar& current_title_id;
ar& current_media_type;
}
friend class boost::serialization::access;
};
@ -228,16 +226,15 @@ private:
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & applet_id;
ar & slot;
ar & title_id;
ar & registered;
ar & loaded;
ar & attributes.raw;
ar & notification_event;
ar & parameter_event;
void serialize(Archive& ar, const unsigned int) {
ar& applet_id;
ar& slot;
ar& title_id;
ar& registered;
ar& loaded;
ar& attributes.raw;
ar& notification_event;
ar& parameter_event;
}
friend class boost::serialization::access;
};
@ -260,12 +257,11 @@ private:
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & next_parameter;
ar & app_jump_parameters;
ar & applet_slots;
ar & library_applet_closing_command;
void serialize(Archive& ar, const unsigned int) {
ar& next_parameter;
ar& app_jump_parameters;
ar& applet_slots;
ar& library_applet_closing_command;
}
friend class boost::serialization::access;
};
@ -273,9 +269,8 @@ private:
} // namespace Service::APT
namespace boost::serialization {
template <class Archive>
inline void load_construct_data(Archive& ar, Service::APT::AppletManager* t, const unsigned int)
{
::new(t)Service::APT::AppletManager(Core::Global<Core::System>());
}
template <class Archive>
inline void load_construct_data(Archive& ar, Service::APT::AppletManager* t, const unsigned int) {
::new (t) Service::APT::AppletManager(Core::Global<Core::System>());
}
} // namespace boost::serialization

View file

@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/archives.h"
#include "common/common_paths.h"
#include "common/file_util.h"
#include "common/logging/log.h"
#include "common/archives.h"
#include "core/core.h"
#include "core/file_sys/archive_ncch.h"
#include "core/file_sys/file_backend.h"
@ -32,17 +32,16 @@ SERVICE_CONSTRUCT_IMPL(Service::APT::Module)
namespace Service::APT {
template <class Archive>
void Module::serialize(Archive& ar, const unsigned int)
{
ar & shared_font_mem;
ar & shared_font_loaded;
ar & shared_font_relocated;
ar & lock;
ar & cpu_percent;
ar & unknown_ns_state_field;
ar & screen_capture_buffer;
ar & screen_capture_post_permission;
ar & applet_manager;
void Module::serialize(Archive& ar, const unsigned int) {
ar& shared_font_mem;
ar& shared_font_loaded;
ar& shared_font_relocated;
ar& lock;
ar& cpu_percent;
ar& unknown_ns_state_field;
ar& screen_capture_buffer;
ar& screen_capture_post_permission;
ar& applet_manager;
}
SERIALIZE_IMPL(Module)

View file

@ -12,10 +12,9 @@
#include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/service/apt/applet_manager.h"
#include "core/hle/service/service.h"
#include "core/global.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/service/service.h"
namespace Core {
class System;
@ -612,9 +611,8 @@ public:
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & application_reset_prepared;
void serialize(Archive& ar, const unsigned int) {
ar& application_reset_prepared;
}
friend class boost::serialization::access;
};
@ -654,6 +652,6 @@ void InstallInterfaces(Core::System& system);
} // namespace Service::APT
namespace boost::serialization {
template <class Archive>
void load_construct_data(Archive& ar, Service::APT::Module* t, const unsigned int);
template <class Archive>
void load_construct_data(Archive& ar, Service::APT::Module* t, const unsigned int);
}

View file

@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "core/hle/service/apt/apt_a.h"
#include "common/archives.h"
#include "core/hle/service/apt/apt_a.h"
namespace Service::APT {

View file

@ -11,6 +11,7 @@ namespace Service::APT {
class APT_A final : public Module::APTInterface {
public:
explicit APT_A(std::shared_ptr<Module> apt);
private:
SERVICE_SERIALIZATION(APT_A, apt, Module)
};

View file

@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "core/hle/service/apt/apt_s.h"
#include "common/archives.h"
#include "core/hle/service/apt/apt_s.h"
namespace Service::APT {

View file

@ -18,6 +18,7 @@ namespace Service::APT {
class APT_S final : public Module::APTInterface {
public:
explicit APT_S(std::shared_ptr<Module> apt);
private:
SERVICE_SERIALIZATION(APT_S, apt, Module)
};

View file

@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "core/hle/service/apt/apt_u.h"
#include "common/archives.h"
#include "core/hle/service/apt/apt_u.h"
namespace Service::APT {

View file

@ -18,6 +18,7 @@ namespace Service::APT {
class APT_U final : public Module::APTInterface {
public:
explicit APT_U(std::shared_ptr<Module> apt);
private:
SERVICE_SERIALIZATION(APT_U, apt, Module)
};

View file

@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "core/hle/service/apt/ns_s.h"
#include "common/archives.h"
#include "core/hle/service/apt/ns_s.h"
namespace Service::NS {

View file

@ -14,6 +14,7 @@ namespace Service::NS {
class NS_S final : public Service::APT::Module::NSInterface {
public:
explicit NS_S(std::shared_ptr<Service::APT::Module> apt);
private:
SERVICE_SERIALIZATION(NS_S, apt, Service::APT::Module)
};