diff options
| author | 2018-04-19 21:41:44 -0400 | |
|---|---|---|
| committer | 2018-04-19 22:20:28 -0400 | |
| commit | ccca5e7c2872d477cc7bef73ed141dc093b106ef (patch) | |
| tree | 17f5db413993ed4a6f1fec0ac27fb20b44328459 /src/core/hle/service/pctl | |
| parent | Merge pull request #356 from lioncash/shader (diff) | |
| download | yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.gz yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.tar.xz yuzu-ccca5e7c2872d477cc7bef73ed141dc093b106ef.zip | |
service: Use nested namespace specifiers where applicable
Tidies up namespace declarations
Diffstat (limited to 'src/core/hle/service/pctl')
| -rw-r--r-- | src/core/hle/service/pctl/pctl.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/pctl/pctl.h | 6 | ||||
| -rw-r--r-- | src/core/hle/service/pctl/pctl_a.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/pctl/pctl_a.h | 6 |
4 files changed, 8 insertions, 16 deletions
diff --git a/src/core/hle/service/pctl/pctl.cpp b/src/core/hle/service/pctl/pctl.cpp index 692b27a71..6ee81866d 100644 --- a/src/core/hle/service/pctl/pctl.cpp +++ b/src/core/hle/service/pctl/pctl.cpp | |||
| @@ -5,12 +5,10 @@ | |||
| 5 | #include "core/hle/service/pctl/pctl.h" | 5 | #include "core/hle/service/pctl/pctl.h" |
| 6 | #include "core/hle/service/pctl/pctl_a.h" | 6 | #include "core/hle/service/pctl/pctl_a.h" |
| 7 | 7 | ||
| 8 | namespace Service { | 8 | namespace Service::PCTL { |
| 9 | namespace PCTL { | ||
| 10 | 9 | ||
| 11 | void InstallInterfaces(SM::ServiceManager& service_manager) { | 10 | void InstallInterfaces(SM::ServiceManager& service_manager) { |
| 12 | std::make_shared<PCTL_A>()->InstallAsService(service_manager); | 11 | std::make_shared<PCTL_A>()->InstallAsService(service_manager); |
| 13 | } | 12 | } |
| 14 | 13 | ||
| 15 | } // namespace PCTL | 14 | } // namespace Service::PCTL |
| 16 | } // namespace Service | ||
diff --git a/src/core/hle/service/pctl/pctl.h b/src/core/hle/service/pctl/pctl.h index 5fa67dd1b..f0a84b115 100644 --- a/src/core/hle/service/pctl/pctl.h +++ b/src/core/hle/service/pctl/pctl.h | |||
| @@ -6,11 +6,9 @@ | |||
| 6 | 6 | ||
| 7 | #include "core/hle/service/service.h" | 7 | #include "core/hle/service/service.h" |
| 8 | 8 | ||
| 9 | namespace Service { | 9 | namespace Service::PCTL { |
| 10 | namespace PCTL { | ||
| 11 | 10 | ||
| 12 | /// Registers all PCTL services with the specified service manager. | 11 | /// Registers all PCTL services with the specified service manager. |
| 13 | void InstallInterfaces(SM::ServiceManager& service_manager); | 12 | void InstallInterfaces(SM::ServiceManager& service_manager); |
| 14 | 13 | ||
| 15 | } // namespace PCTL | 14 | } // namespace Service::PCTL |
| 16 | } // namespace Service | ||
diff --git a/src/core/hle/service/pctl/pctl_a.cpp b/src/core/hle/service/pctl/pctl_a.cpp index 4e644be64..9fb4628ad 100644 --- a/src/core/hle/service/pctl/pctl_a.cpp +++ b/src/core/hle/service/pctl/pctl_a.cpp | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | #include "core/hle/ipc_helpers.h" | 6 | #include "core/hle/ipc_helpers.h" |
| 7 | #include "core/hle/service/pctl/pctl_a.h" | 7 | #include "core/hle/service/pctl/pctl_a.h" |
| 8 | 8 | ||
| 9 | namespace Service { | 9 | namespace Service::PCTL { |
| 10 | namespace PCTL { | ||
| 11 | 10 | ||
| 12 | class IParentalControlService final : public ServiceFramework<IParentalControlService> { | 11 | class IParentalControlService final : public ServiceFramework<IParentalControlService> { |
| 13 | public: | 12 | public: |
| @@ -125,5 +124,4 @@ PCTL_A::PCTL_A() : ServiceFramework("pctl:a") { | |||
| 125 | RegisterHandlers(functions); | 124 | RegisterHandlers(functions); |
| 126 | } | 125 | } |
| 127 | 126 | ||
| 128 | } // namespace PCTL | 127 | } // namespace Service::PCTL |
| 129 | } // namespace Service | ||
diff --git a/src/core/hle/service/pctl/pctl_a.h b/src/core/hle/service/pctl/pctl_a.h index 3aa8873a9..09ed82e1b 100644 --- a/src/core/hle/service/pctl/pctl_a.h +++ b/src/core/hle/service/pctl/pctl_a.h | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include "core/hle/service/service.h" | 7 | #include "core/hle/service/service.h" |
| 8 | 8 | ||
| 9 | namespace Service { | 9 | namespace Service::PCTL { |
| 10 | namespace PCTL { | ||
| 11 | 10 | ||
| 12 | class PCTL_A final : public ServiceFramework<PCTL_A> { | 11 | class PCTL_A final : public ServiceFramework<PCTL_A> { |
| 13 | public: | 12 | public: |
| @@ -18,5 +17,4 @@ private: | |||
| 18 | void CreateService(Kernel::HLERequestContext& ctx); | 17 | void CreateService(Kernel::HLERequestContext& ctx); |
| 19 | }; | 18 | }; |
| 20 | 19 | ||
| 21 | } // namespace PCTL | 20 | } // namespace Service::PCTL |
| 22 | } // namespace Service | ||