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

6
src/core/hle/service/ns/ns.cpp
View file

@ -8,8 +8,7 @@
#include "core/hle/service/ns/ns_s.h"
#include "core/loader/loader.h"
namespace Service {
namespace NS {
namespace Service::NS {
Kernel::SharedPtr<Kernel::Process> LaunchTitle(FS::MediaType media_type, u64 title_id) {
std::string path = AM::GetTitleContentPath(media_type, title_id);
@ -35,5 +34,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<NS_S>()->InstallAsService(service_manager);
}
} // namespace NS
} // namespace Service
} // namespace Service::NS

6
src/core/hle/service/ns/ns.h
View file

@ -8,8 +8,7 @@
#include "core/hle/service/fs/archive.h"
#include "core/hle/service/service.h"
namespace Service {
namespace NS {
namespace Service::NS {
/// Loads and launches the title identified by title_id in the specified media type.
Kernel::SharedPtr<Kernel::Process> LaunchTitle(FS::MediaType media_type, u64 title_id);
@ -17,5 +16,4 @@ Kernel::SharedPtr<Kernel::Process> LaunchTitle(FS::MediaType media_type, u64 tit
/// Registers all NS services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace NS
} // namespace Service
} // namespace Service::NS

6
src/core/hle/service/ns/ns_s.cpp
View file

@ -4,8 +4,7 @@
#include "core/hle/service/ns/ns_s.h"
namespace Service {
namespace NS {
namespace Service::NS {
NS_S::NS_S() : ServiceFramework("ns:s", 2) {
static const FunctionInfo functions[] = {
@ -30,5 +29,4 @@ NS_S::NS_S() : ServiceFramework("ns:s", 2) {
NS_S::~NS_S() = default;
} // namespace NS
} // namespace Service
} // namespace Service::NS

6
src/core/hle/service/ns/ns_s.h
View file

@ -7,8 +7,7 @@
#include "core/hle/kernel/kernel.h"
#include "core/hle/service/service.h"
namespace Service {
namespace NS {
namespace Service::NS {
/// Interface to "ns:s" service
class NS_S final : public ServiceFramework<NS_S> {
@ -17,5 +16,4 @@ public:
~NS_S();
};
} // namespace NS
} // namespace Service
} // namespace Service::NS