Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

service: Use nested namespace specifiers where applicable

Browse source 
There were a few places where nested namespace specifiers weren't being
used where they could be within the service code. This amends that to
make the namespacing a tiny bit more compact.
This commit is contained in:
Lioncash 2018-09-22 14:23:08 +02:00 • committed by fearlessTobi
parent 80cdfe1c45
commit 46da908a00
221 changed files with 443 additions and 902 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/hle/service/frd/frd.cpp
View file

@ -13,8 +13,7 @@
#include "core/hle/service/frd/frd_a.h"
#include "core/hle/service/frd/frd_u.h"
namespace Service {
namespace FRD {
namespace Service::FRD {
Module::Interface::Interface(std::shared_ptr<Module> frd, const char* name, u32 max_session)
: ServiceFramework(name, max_session), frd(std::move(frd)) {}
@ -156,6 +155,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<FRD_A>(frd)->InstallAsService(service_manager);
}
} // namespace FRD
} // namespace Service
} // namespace Service::FRD

7
src/core/hle/service/frd/frd.h
View file

@ -8,9 +8,7 @@
#include "common/common_types.h"
#include "core/hle/service/service.h"
namespace Service {
namespace FRD {
namespace Service::FRD {
struct FriendKey {
u32 friend_id;
@ -139,5 +137,4 @@ private:
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace FRD
} // namespace Service
} // namespace Service::FRD

6
src/core/hle/service/frd/frd_a.cpp
View file

@ -4,8 +4,7 @@
#include "core/hle/service/frd/frd_a.h"
namespace Service {
namespace FRD {
namespace Service::FRD {
FRD_A::FRD_A(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "frd:a", 8) {
static const FunctionInfo functions[] = {
@ -66,5 +65,4 @@ FRD_A::FRD_A(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "f
RegisterHandlers(functions);
}
} // namespace FRD
} // namespace Service
} // namespace Service::FRD

6
src/core/hle/service/frd/frd_a.h
View file

@ -6,13 +6,11 @@
#include "core/hle/service/frd/frd.h"
namespace Service {
namespace FRD {
namespace Service::FRD {
class FRD_A final : public Module::Interface {
public:
explicit FRD_A(std::shared_ptr<Module> frd);
};
} // namespace FRD
} // namespace Service
} // namespace Service::FRD

6
src/core/hle/service/frd/frd_u.cpp
View file

@ -4,8 +4,7 @@
#include "core/hle/service/frd/frd_u.h"
namespace Service {
namespace FRD {
namespace Service::FRD {
FRD_U::FRD_U(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "frd:u", 8) {
static const FunctionInfo functions[] = {
@ -66,5 +65,4 @@ FRD_U::FRD_U(std::shared_ptr<Module> frd) : Module::Interface(std::move(frd), "f
RegisterHandlers(functions);
}
} // namespace FRD
} // namespace Service
} // namespace Service::FRD

6
src/core/hle/service/frd/frd_u.h
View file

@ -6,13 +6,11 @@
#include "core/hle/service/frd/frd.h"
namespace Service {
namespace FRD {
namespace Service::FRD {
class FRD_U final : public Module::Interface {
public:
explicit FRD_U(std::shared_ptr<Module> frd);
};
} // namespace FRD
} // namespace Service
} // namespace Service::FRD