service: Use nested namespace specifiers where applicable

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

View file

@ -15,8 +15,7 @@
#include "core/hle/service/ptm/ptm_u.h"
#include "core/settings.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
/// Values for the default gamecoin.dat file
static const GameCoin default_game_coin = {0x4F00, 42, 0, 0, 0, 2014, 12, 29};
@ -181,5 +180,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<PTM_U>(ptm)->InstallAsService(service_manager);
}
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -9,8 +9,7 @@
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/service.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
/// Charge levels used by PTM functions
enum class ChargeLevels : u32 {
@ -141,5 +140,4 @@ private:
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -4,8 +4,7 @@
#include "core/hle/service/ptm/ptm_gets.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
PTM_Gets::PTM_Gets(std::shared_ptr<Module> ptm)
: Module::Interface(std::move(ptm), "ptm:gets", 26) {
@ -32,5 +31,4 @@ PTM_Gets::PTM_Gets(std::shared_ptr<Module> ptm)
RegisterHandlers(functions);
}
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -7,13 +7,11 @@
#include <memory>
#include "core/hle/service/ptm/ptm.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
class PTM_Gets final : public Module::Interface {
public:
explicit PTM_Gets(std::shared_ptr<Module> ptm);
};
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -4,8 +4,7 @@
#include "core/hle/service/ptm/ptm_play.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
PTM_Play::PTM_Play(std::shared_ptr<Module> ptm)
: Module::Interface(std::move(ptm), "ptm:play", 26) {
@ -35,5 +34,4 @@ PTM_Play::PTM_Play(std::shared_ptr<Module> ptm)
RegisterHandlers(functions);
}
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -7,13 +7,11 @@
#include <memory>
#include "core/hle/service/ptm/ptm.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
class PTM_Play final : public Module::Interface {
public:
explicit PTM_Play(std::shared_ptr<Module> ptm);
};
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -4,8 +4,7 @@
#include "core/hle/service/ptm/ptm_sets.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
PTM_Sets::PTM_Sets(std::shared_ptr<Module> ptm) : Module::Interface(std::move(ptm), "ptm:sets", 1) {
static const FunctionInfo functions[] = {
@ -15,5 +14,4 @@ PTM_Sets::PTM_Sets(std::shared_ptr<Module> ptm) : Module::Interface(std::move(pt
RegisterHandlers(functions);
}
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -7,13 +7,11 @@
#include <memory>
#include "core/hle/service/ptm/ptm.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
class PTM_Sets final : public Module::Interface {
public:
explicit PTM_Sets(std::shared_ptr<Module> ptm);
};
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -4,8 +4,7 @@
#include "core/hle/service/ptm/ptm_sysm.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
PTM_S_Common::PTM_S_Common(std::shared_ptr<Module> ptm, const char* name)
: Module::Interface(std::move(ptm), name, 26) {
@ -66,5 +65,4 @@ PTM_S::PTM_S(std::shared_ptr<Module> ptm) : PTM_S_Common(std::move(ptm), "ptm:s"
PTM_Sysm::PTM_Sysm(std::shared_ptr<Module> ptm) : PTM_S_Common(std::move(ptm), "ptm:sysm") {}
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -7,8 +7,7 @@
#include <memory>
#include "core/hle/service/ptm/ptm.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
class PTM_S_Common : public Module::Interface {
public:
@ -25,5 +24,4 @@ public:
explicit PTM_Sysm(std::shared_ptr<Module> ptm);
};
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -4,8 +4,7 @@
#include "core/hle/service/ptm/ptm_u.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
PTM_U::PTM_U(std::shared_ptr<Module> ptm) : Module::Interface(std::move(ptm), "ptm:u", 26) {
static const FunctionInfo functions[] = {
@ -28,5 +27,4 @@ PTM_U::PTM_U(std::shared_ptr<Module> ptm) : Module::Interface(std::move(ptm), "p
RegisterHandlers(functions);
}
} // namespace PTM
} // namespace Service
} // namespace Service::PTM

View file

@ -7,13 +7,11 @@
#include <memory>
#include "core/hle/service/ptm/ptm.h"
namespace Service {
namespace PTM {
namespace Service::PTM {
class PTM_U final : public Module::Interface {
public:
explicit PTM_U(std::shared_ptr<Module> ptm);
};
} // namespace PTM
} // namespace Service
} // namespace Service::PTM