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:
@@ -19,8 +19,7 @@
|
||||
#include "core/memory.h"
|
||||
#include "core/settings.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
static std::weak_ptr<Module> current_cam;
|
||||
|
||||
@@ -1065,6 +1064,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
|
||||
std::make_shared<CAM_Q>()->InstallAsService(service_manager);
|
||||
}
|
||||
|
||||
} // namespace CAM
|
||||
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -25,8 +25,7 @@ namespace Kernel {
|
||||
class Process;
|
||||
}
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
enum CameraIndex {
|
||||
OuterRightCamera = 0,
|
||||
@@ -785,5 +784,4 @@ void ReloadCameraDevices();
|
||||
|
||||
void InstallInterfaces(SM::ServiceManager& service_manager);
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -5,8 +5,7 @@
|
||||
#include "core/hle/service/cam/cam.h"
|
||||
#include "core/hle/service/cam/cam_c.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
CAM_C::CAM_C(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "cam:c", 1) {
|
||||
static const FunctionInfo functions[] = {
|
||||
@@ -79,5 +78,4 @@ CAM_C::CAM_C(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
|
||||
RegisterHandlers(functions);
|
||||
}
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -6,13 +6,11 @@
|
||||
|
||||
#include "core/hle/service/cam/cam.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
class CAM_C final : public Module::Interface {
|
||||
public:
|
||||
explicit CAM_C(std::shared_ptr<Module> cam);
|
||||
};
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -4,8 +4,7 @@
|
||||
|
||||
#include "core/hle/service/cam/cam_q.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
CAM_Q::CAM_Q() : ServiceFramework("cam:q", 1 /*TODO: find the true value*/) {
|
||||
// Empty arrays are illegal -- commented out until an entry is added.
|
||||
@@ -13,5 +12,4 @@ CAM_Q::CAM_Q() : ServiceFramework("cam:q", 1 /*TODO: find the true value*/) {
|
||||
// RegisterHandlers(functions);
|
||||
}
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -6,13 +6,11 @@
|
||||
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
class CAM_Q : public ServiceFramework<CAM_Q> {
|
||||
public:
|
||||
CAM_Q();
|
||||
};
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -5,8 +5,7 @@
|
||||
#include "core/hle/service/cam/cam.h"
|
||||
#include "core/hle/service/cam/cam_s.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
CAM_S::CAM_S(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "cam:s", 1) {
|
||||
static const FunctionInfo functions[] = {
|
||||
@@ -79,5 +78,4 @@ CAM_S::CAM_S(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
|
||||
RegisterHandlers(functions);
|
||||
}
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -6,13 +6,11 @@
|
||||
|
||||
#include "core/hle/service/cam/cam.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
class CAM_S final : public Module::Interface {
|
||||
public:
|
||||
explicit CAM_S(std::shared_ptr<Module> cam);
|
||||
};
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -5,8 +5,7 @@
|
||||
#include "core/hle/service/cam/cam.h"
|
||||
#include "core/hle/service/cam/cam_u.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
CAM_U::CAM_U(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "cam:u", 1) {
|
||||
static const FunctionInfo functions[] = {
|
||||
@@ -79,5 +78,4 @@ CAM_U::CAM_U(std::shared_ptr<Module> cam) : Module::Interface(std::move(cam), "c
|
||||
RegisterHandlers(functions);
|
||||
}
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
@@ -6,13 +6,11 @@
|
||||
|
||||
#include "core/hle/service/cam/cam.h"
|
||||
|
||||
namespace Service {
|
||||
namespace CAM {
|
||||
namespace Service::CAM {
|
||||
|
||||
class CAM_U final : public Module::Interface {
|
||||
public:
|
||||
explicit CAM_U(std::shared_ptr<Module> cam);
|
||||
};
|
||||
|
||||
} // namespace CAM
|
||||
} // namespace Service
|
||||
} // namespace Service::CAM
|
||||
|
Reference in New Issue
Block a user