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

@@ -21,8 +21,7 @@
#include "core/hle/service/cfg/cfg_u.h"
#include "core/settings.h"
namespace Service {
namespace CFG {
namespace Service::CFG {
/// The maximum number of block entries that can exist in the config file
static const u32 CONFIG_FILE_MAX_BLOCK_ENTRIES = 1479;
@@ -721,5 +720,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
current_cfg = cfg;
}
} // namespace CFG
} // namespace Service
} // namespace Service::CFG

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

@@ -10,8 +10,7 @@
#include "common/common_types.h"
#include "core/hle/service/fs/archive.h"
namespace Service {
namespace CFG {
namespace Service::CFG {
enum SystemModel {
NINTENDO_3DS = 0,
@@ -407,5 +406,4 @@ private:
void InstallInterfaces(SM::ServiceManager& service_manager);
std::shared_ptr<Module> GetCurrentModule();
} // namespace CFG
} // namespace Service
} // namespace Service::CFG

6
src/core/hle/service/cfg/cfg_i.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/cfg/cfg_i.h"
namespace Service {
namespace CFG {
namespace Service::CFG {
CFG_I::CFG_I(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:i", 23) {
static const FunctionInfo functions[] = {
@@ -60,5 +59,4 @@ CFG_I::CFG_I(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "c
RegisterHandlers(functions);
}
} // namespace CFG
} // namespace Service
} // namespace Service::CFG

6
src/core/hle/service/cfg/cfg_i.h
View File

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

6
src/core/hle/service/cfg/cfg_nor.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/cfg/cfg_nor.h"
namespace Service {
namespace CFG {
namespace Service::CFG {
CFG_NOR::CFG_NOR() : ServiceFramework("cfg:nor", 23) {
static const FunctionInfo functions[] = {
@@ -17,5 +16,4 @@ CFG_NOR::CFG_NOR() : ServiceFramework("cfg:nor", 23) {
RegisterHandlers(functions);
}
} // namespace CFG
} // namespace Service
} // namespace Service::CFG

6
src/core/hle/service/cfg/cfg_nor.h
View File

@@ -6,13 +6,11 @@
#include "core/hle/service/service.h"
namespace Service {
namespace CFG {
namespace Service::CFG {
class CFG_NOR final : public ServiceFramework<CFG_NOR> {
public:
CFG_NOR();
};
} // namespace CFG
} // namespace Service
} // namespace Service::CFG

6
src/core/hle/service/cfg/cfg_s.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/cfg/cfg_s.h"
namespace Service {
namespace CFG {
namespace Service::CFG {
CFG_S::CFG_S(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:s", 23) {
static const FunctionInfo functions[] = {
@@ -36,5 +35,4 @@ CFG_S::CFG_S(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "c
RegisterHandlers(functions);
}
} // namespace CFG
} // namespace Service
} // namespace Service::CFG

6
src/core/hle/service/cfg/cfg_s.h
View File

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

6
src/core/hle/service/cfg/cfg_u.cpp
View File

@@ -4,8 +4,7 @@
#include "core/hle/service/cfg/cfg_u.h"
namespace Service {
namespace CFG {
namespace Service::CFG {
CFG_U::CFG_U(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "cfg:u", 23) {
static const FunctionInfo functions[] = {
@@ -25,5 +24,4 @@ CFG_U::CFG_U(std::shared_ptr<Module> cfg) : Module::Interface(std::move(cfg), "c
RegisterHandlers(functions);
}
} // namespace CFG
} // namespace Service
} // namespace Service::CFG

6
src/core/hle/service/cfg/cfg_u.h
View File

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