From ccca5e7c2872d477cc7bef73ed141dc093b106ef Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 19 Apr 2018 21:41:44 -0400
Subject: service: Use nested namespace specifiers where applicable

Tidies up namespace declarations
---
 src/core/hle/service/time/time.cpp   | 6 ++----
 src/core/hle/service/time/time.h     | 6 ++----
 src/core/hle/service/time/time_s.cpp | 6 ++----
 src/core/hle/service/time/time_s.h   | 6 ++----
 src/core/hle/service/time/time_u.cpp | 6 ++----
 src/core/hle/service/time/time_u.h   | 6 ++----
 6 files changed, 12 insertions(+), 24 deletions(-)

(limited to 'src/core/hle/service/time')

diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp
index 382188a62..2604ecc1c 100644
--- a/src/core/hle/service/time/time.cpp
+++ b/src/core/hle/service/time/time.cpp
@@ -12,8 +12,7 @@
 #include "core/hle/service/time/time_s.h"
 #include "core/hle/service/time/time_u.h"
 
-namespace Service {
-namespace Time {
+namespace Service::Time {
 
 class ISystemClock final : public ServiceFramework<ISystemClock> {
 public:
@@ -166,5 +165,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
     std::make_shared<TIME_U>(time)->InstallAsService(service_manager);
 }
 
-} // namespace Time
-} // namespace Service
+} // namespace Service::Time
diff --git a/src/core/hle/service/time/time.h b/src/core/hle/service/time/time.h
index 197029e7a..12fe1995a 100644
--- a/src/core/hle/service/time/time.h
+++ b/src/core/hle/service/time/time.h
@@ -6,8 +6,7 @@
 
 #include "core/hle/service/service.h"
 
-namespace Service {
-namespace Time {
+namespace Service::Time {
 
 // TODO(Rozelette) RE this structure
 struct LocationName {
@@ -66,5 +65,4 @@ public:
 /// Registers all Time services with the specified service manager.
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace Time
-} // namespace Service
+} // namespace Service::Time
diff --git a/src/core/hle/service/time/time_s.cpp b/src/core/hle/service/time/time_s.cpp
index cb58efcb3..0b599ea00 100644
--- a/src/core/hle/service/time/time_s.cpp
+++ b/src/core/hle/service/time/time_s.cpp
@@ -4,8 +4,7 @@
 
 #include "core/hle/service/time/time_s.h"
 
-namespace Service {
-namespace Time {
+namespace Service::Time {
 
 TIME_S::TIME_S(std::shared_ptr<Module> time) : Module::Interface(std::move(time), "time:s") {
     static const FunctionInfo functions[] = {
@@ -29,5 +28,4 @@ TIME_S::TIME_S(std::shared_ptr<Module> time) : Module::Interface(std::move(time)
     RegisterHandlers(functions);
 }
 
-} // namespace Time
-} // namespace Service
+} // namespace Service::Time
diff --git a/src/core/hle/service/time/time_s.h b/src/core/hle/service/time/time_s.h
index abc2a8c5a..4a2daa513 100644
--- a/src/core/hle/service/time/time_s.h
+++ b/src/core/hle/service/time/time_s.h
@@ -6,13 +6,11 @@
 
 #include "core/hle/service/time/time.h"
 
-namespace Service {
-namespace Time {
+namespace Service::Time {
 
 class TIME_S final : public Module::Interface {
 public:
     explicit TIME_S(std::shared_ptr<Module> time);
 };
 
-} // namespace Time
-} // namespace Service
+} // namespace Service::Time
diff --git a/src/core/hle/service/time/time_u.cpp b/src/core/hle/service/time/time_u.cpp
index bbd1ecab3..1ed42c419 100644
--- a/src/core/hle/service/time/time_u.cpp
+++ b/src/core/hle/service/time/time_u.cpp
@@ -4,8 +4,7 @@
 
 #include "core/hle/service/time/time_u.h"
 
-namespace Service {
-namespace Time {
+namespace Service::Time {
 
 TIME_U::TIME_U(std::shared_ptr<Module> time) : Module::Interface(std::move(time), "time:u") {
     static const FunctionInfo functions[] = {
@@ -29,5 +28,4 @@ TIME_U::TIME_U(std::shared_ptr<Module> time) : Module::Interface(std::move(time)
     RegisterHandlers(functions);
 }
 
-} // namespace Time
-} // namespace Service
+} // namespace Service::Time
diff --git a/src/core/hle/service/time/time_u.h b/src/core/hle/service/time/time_u.h
index f99d25057..3724bcdc7 100644
--- a/src/core/hle/service/time/time_u.h
+++ b/src/core/hle/service/time/time_u.h
@@ -6,13 +6,11 @@
 
 #include "core/hle/service/time/time.h"
 
-namespace Service {
-namespace Time {
+namespace Service::Time {
 
 class TIME_U final : public Module::Interface {
 public:
     explicit TIME_U(std::shared_ptr<Module> time);
 };
 
-} // namespace Time
-} // namespace Service
+} // namespace Service::Time
-- 
cgit v1.2.3