CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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/nfc/nfc.cpp
View File

@@ -8,8 +8,7 @@
#include "core/hle/service/nfc/nfc_m.h"
#include "core/hle/service/nfc/nfc_u.h"
namespace Service {
namespace NFC {
namespace Service::NFC {
void Module::Interface::Initialize(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp(ctx, 0x01, 1, 0);
@@ -155,5 +154,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<NFC_U>(nfc)->InstallAsService(service_manager);
}
} // namespace NFC
} // namespace Service
} // namespace Service::NFC

6
src/core/hle/service/nfc/nfc.h
View File

@@ -13,8 +13,7 @@ namespace Kernel {
class Event;
} // namespace Kernel
namespace Service {
namespace NFC {
namespace Service::NFC {
namespace ErrCodes {
enum {
@@ -177,5 +176,4 @@ private:
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace NFC
} // namespace Service
} // namespace Service::NFC

6
src/core/hle/service/nfc/nfc_m.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/nfc/nfc_m.h"
namespace Service {
namespace NFC {
namespace Service::NFC {
NFC_M::NFC_M(std::shared_ptr<Module> nfc) : Module::Interface(std::move(nfc), "nfc:m", 1) {
static const FunctionInfo functions[] = {
@@ -41,5 +40,4 @@ NFC_M::NFC_M(std::shared_ptr<Module> nfc) : Module::Interface(std::move(nfc), "n
RegisterHandlers(functions);
}
} // namespace NFC
} // namespace Service
} // namespace Service::NFC

6
src/core/hle/service/nfc/nfc_m.h
View File

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

6
src/core/hle/service/nfc/nfc_u.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/nfc/nfc_u.h"
namespace Service {
namespace NFC {
namespace Service::NFC {
NFC_U::NFC_U(std::shared_ptr<Module> nfc) : Module::Interface(std::move(nfc), "nfc:u", 1) {
static const FunctionInfo functions[] = {
@@ -38,5 +37,4 @@ NFC_U::NFC_U(std::shared_ptr<Module> nfc) : Module::Interface(std::move(nfc), "n
RegisterHandlers(functions);
}
} // namespace NFC
} // namespace Service
} // namespace Service::NFC

6
src/core/hle/service/nfc/nfc_u.h
View File

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