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/am | |
| 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/am')
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/am/applet_ae.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/am/applet_oe.cpp | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index bfc431e88..f41a59afe 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | #include "core/hle/service/nvflinger/nvflinger.h" | 14 | #include "core/hle/service/nvflinger/nvflinger.h" |
| 15 | #include "core/settings.h" | 15 | #include "core/settings.h" |
| 16 | 16 | ||
| 17 | namespace Service { | 17 | namespace Service::AM { |
| 18 | namespace AM { | ||
| 19 | 18 | ||
| 20 | IWindowController::IWindowController() : ServiceFramework("IWindowController") { | 19 | IWindowController::IWindowController() : ServiceFramework("IWindowController") { |
| 21 | static const FunctionInfo functions[] = { | 20 | static const FunctionInfo functions[] = { |
| @@ -571,5 +570,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager, | |||
| 571 | std::make_shared<AppletOE>(nvflinger)->InstallAsService(service_manager); | 570 | std::make_shared<AppletOE>(nvflinger)->InstallAsService(service_manager); |
| 572 | } | 571 | } |
| 573 | 572 | ||
| 574 | } // namespace AM | 573 | } // namespace Service::AM |
| 575 | } // namespace Service | ||
diff --git a/src/core/hle/service/am/applet_ae.cpp b/src/core/hle/service/am/applet_ae.cpp index 154d346d5..4f0698a8a 100644 --- a/src/core/hle/service/am/applet_ae.cpp +++ b/src/core/hle/service/am/applet_ae.cpp | |||
| @@ -8,8 +8,7 @@ | |||
| 8 | #include "core/hle/service/am/applet_ae.h" | 8 | #include "core/hle/service/am/applet_ae.h" |
| 9 | #include "core/hle/service/nvflinger/nvflinger.h" | 9 | #include "core/hle/service/nvflinger/nvflinger.h" |
| 10 | 10 | ||
| 11 | namespace Service { | 11 | namespace Service::AM { |
| 12 | namespace AM { | ||
| 13 | 12 | ||
| 14 | class ILibraryAppletProxy final : public ServiceFramework<ILibraryAppletProxy> { | 13 | class ILibraryAppletProxy final : public ServiceFramework<ILibraryAppletProxy> { |
| 15 | public: | 14 | public: |
| @@ -109,5 +108,4 @@ AppletAE::AppletAE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger) | |||
| 109 | RegisterHandlers(functions); | 108 | RegisterHandlers(functions); |
| 110 | } | 109 | } |
| 111 | 110 | ||
| 112 | } // namespace AM | 111 | } // namespace Service::AM |
| 113 | } // namespace Service | ||
diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp index 334c38392..674b4d753 100644 --- a/src/core/hle/service/am/applet_oe.cpp +++ b/src/core/hle/service/am/applet_oe.cpp | |||
| @@ -8,8 +8,7 @@ | |||
| 8 | #include "core/hle/service/am/applet_oe.h" | 8 | #include "core/hle/service/am/applet_oe.h" |
| 9 | #include "core/hle/service/nvflinger/nvflinger.h" | 9 | #include "core/hle/service/nvflinger/nvflinger.h" |
| 10 | 10 | ||
| 11 | namespace Service { | 11 | namespace Service::AM { |
| 12 | namespace AM { | ||
| 13 | 12 | ||
| 14 | class IApplicationProxy final : public ServiceFramework<IApplicationProxy> { | 13 | class IApplicationProxy final : public ServiceFramework<IApplicationProxy> { |
| 15 | public: | 14 | public: |
| @@ -104,5 +103,4 @@ AppletOE::AppletOE(std::shared_ptr<NVFlinger::NVFlinger> nvflinger) | |||
| 104 | RegisterHandlers(functions); | 103 | RegisterHandlers(functions); |
| 105 | } | 104 | } |
| 106 | 105 | ||
| 107 | } // namespace AM | 106 | } // namespace Service::AM |
| 108 | } // namespace Service | ||