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.

src/core/hle/service/apt/applet_manager.cpp

@@ -9,8 +9,7 @@
 #include "core/hle/service/cfg/cfg.h"
 #include "core/hle/service/ns/ns.h"
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 enum class AppletPos { Application = 0, Library = 1, System = 2, SysLibrary = 3, Resident = 4 };
 
@@ -486,5 +485,4 @@ AppletManager::~AppletManager() {
     HLE::Applets::Shutdown();
 }
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/applet_manager.h

@@ -11,8 +11,7 @@
 #include "core/hle/result.h"
 #include "core/hle/service/fs/archive.h"
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 /// Signals used by APT functions
 enum class SignalType : u32 {
@@ -185,5 +184,4 @@ private:
     SignalType library_applet_closing_command;
 };
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/apt.cpp

@@ -24,8 +24,7 @@
 #include "core/hw/aes/ccm.h"
 #include "core/hw/aes/key.h"
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 void Module::Interface::Initialize(Kernel::HLERequestContext& ctx) {
     IPC::RequestParser rp(ctx, 0x2, 2, 0); // 0x20080
@@ -871,5 +870,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
     std::make_shared<APT_A>(apt)->InstallAsService(service_manager);
 }
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/apt.h

@@ -16,8 +16,7 @@ class Mutex;
 class SharedMemory;
 } // namespace Kernel
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 class AppletManager;
 
@@ -605,5 +604,4 @@ private:
 
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/apt_a.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/apt/apt_a.h"
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 APT_A::APT_A(std::shared_ptr<Module> apt)
     : Module::Interface(std::move(apt), "APT:A", MaxAPTSessions) {
@@ -105,5 +104,4 @@ APT_A::APT_A(std::shared_ptr<Module> apt)
     RegisterHandlers(functions);
 }
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/apt_a.h

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

src/core/hle/service/apt/apt_s.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/apt/apt_s.h"
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 APT_S::APT_S(std::shared_ptr<Module> apt)
     : Module::Interface(std::move(apt), "APT:S", MaxAPTSessions) {
@@ -105,5 +104,4 @@ APT_S::APT_S(std::shared_ptr<Module> apt)
     RegisterHandlers(functions);
 }
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/apt_s.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/apt/apt.h"
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 // Application and title launching service. These services handle signaling for home/power button as
 // well. Only one session for either APT service can be open at a time, normally processes close the
@@ -21,5 +20,4 @@ public:
     explicit APT_S(std::shared_ptr<Module> apt);
 };
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/apt_u.cpp

@@ -4,8 +4,7 @@
 
 #include "core/hle/service/apt/apt_u.h"
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 APT_U::APT_U(std::shared_ptr<Module> apt)
     : Module::Interface(std::move(apt), "APT:U", MaxAPTSessions) {
@@ -102,5 +101,4 @@ APT_U::APT_U(std::shared_ptr<Module> apt)
     RegisterHandlers(functions);
 }
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/apt_u.h

@@ -6,8 +6,7 @@
 
 #include "core/hle/service/apt/apt.h"
 
-namespace Service {
-namespace APT {
+namespace Service::APT {
 
 // Application and title launching service. These services handle signaling for home/power button as
 // well. Only one session for either APT service can be open at a time, normally processes close the
@@ -21,5 +20,4 @@ public:
     explicit APT_U(std::shared_ptr<Module> apt);
 };
 
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT

src/core/hle/service/apt/bcfnt/bcfnt.cpp

@@ -5,9 +5,7 @@
 #include "core/hle/service/apt/bcfnt/bcfnt.h"
 #include "core/hle/service/service.h"
 
-namespace Service {
-namespace APT {
-namespace BCFNT {
+namespace Service::APT::BCFNT {
 
 void RelocateSharedFont(Kernel::SharedPtr<Kernel::SharedMemory> shared_font, VAddr new_address) {
     static const u32 SharedFontStartOffset = 0x80;
@@ -105,6 +103,4 @@ void RelocateSharedFont(Kernel::SharedPtr<Kernel::SharedMemory> shared_font, VAd
     }
 }
 
-} // namespace BCFNT
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT::BCFNT

src/core/hle/service/apt/bcfnt/bcfnt.h

@@ -8,9 +8,7 @@
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/service/service.h"
 
-namespace Service {
-namespace APT {
-namespace BCFNT { ///< BCFNT Shared Font file structures
+namespace Service::APT::BCFNT { ///< BCFNT Shared Font file structures
 
 struct CFNT {
     u8 magic[4];
@@ -87,6 +85,4 @@ struct CWDH {
  */
 void RelocateSharedFont(Kernel::SharedPtr<Kernel::SharedMemory> shared_font, VAddr new_address);
 
-} // namespace BCFNT
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT::BCFNT

src/core/hle/service/apt/errors.h

@@ -4,13 +4,9 @@
 
 #pragma once
 
-namespace Service {
-namespace APT {
-namespace ErrCodes {
+namespace Service::APT::ErrCodes {
 enum {
     ParameterPresent = 2,
     InvalidAppletSlot = 4,
 };
-} // namespace ErrCodes
-} // namespace APT
-} // namespace Service
+} // namespace Service::APT::ErrCodes