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

7
src/core/hle/service/am/am.cpp
View File

@@ -30,8 +30,7 @@
#include "core/loader/loader.h"
#include "core/loader/smdh.h"
namespace Service {
namespace AM {
namespace Service::AM {
constexpr u16 PLATFORM_CTR = 0x0004;
constexpr u16 CATEGORY_SYSTEM = 0x0010;
@@ -1326,6 +1325,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<AM_U>(am)->InstallAsService(service_manager);
}
} // namespace AM
} // namespace Service
} // namespace Service::AM

10
src/core/hle/service/am/am.h
View File

@@ -14,14 +14,11 @@
#include "core/hle/result.h"
#include "core/hle/service/service.h"
namespace Service {
namespace FS {
namespace Service::FS {
enum class MediaType : u32;
}
} // namespace Service
namespace Service {
namespace AM {
namespace Service::AM {
namespace ErrCodes {
enum {
@@ -526,5 +523,4 @@ private:
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace AM
} // namespace Service
} // namespace Service::AM

6
src/core/hle/service/am/am_app.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/am/am_app.h"
namespace Service {
namespace AM {
namespace Service::AM {
AM_APP::AM_APP(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:app", 5) {
static const FunctionInfo functions[] = {
@@ -26,5 +25,4 @@ AM_APP::AM_APP(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
RegisterHandlers(functions);
}
} // namespace AM
} // namespace Service
} // namespace Service::AM

6
src/core/hle/service/am/am_app.h
View File

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

6
src/core/hle/service/am/am_net.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/am/am_net.h"
namespace Service {
namespace AM {
namespace Service::AM {
AM_NET::AM_NET(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:net", 5) {
static const FunctionInfo functions[] = {
@@ -123,5 +122,4 @@ AM_NET::AM_NET(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
RegisterHandlers(functions);
}
} // namespace AM
} // namespace Service
} // namespace Service::AM

6
src/core/hle/service/am/am_net.h
View File

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

6
src/core/hle/service/am/am_sys.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/am/am_sys.h"
namespace Service {
namespace AM {
namespace Service::AM {
AM_SYS::AM_SYS(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:sys", 5) {
static const FunctionInfo functions[] = {
@@ -71,5 +70,4 @@ AM_SYS::AM_SYS(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "a
RegisterHandlers(functions);
}
} // namespace AM
} // namespace Service
} // namespace Service::AM

6
src/core/hle/service/am/am_sys.h
View File

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

6
src/core/hle/service/am/am_u.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/am/am_u.h"
namespace Service {
namespace AM {
namespace Service::AM {
AM_U::AM_U(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:u", 5) {
static const FunctionInfo functions[] = {
@@ -83,5 +82,4 @@ AM_U::AM_U(std::shared_ptr<Module> am) : Module::Interface(std::move(am), "am:u"
RegisterHandlers(functions);
}
} // namespace AM
} // namespace Service
} // namespace Service::AM

6
src/core/hle/service/am/am_u.h
View File

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