Merge pull request #360 from lioncash/namespaces

service: Use nested namespace specifiers where applicable
This commit is contained in:
bunnei 2018-04-20 09:44:40 -04:00 committed by GitHub
commit b11f6f90e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
136 changed files with 273 additions and 570 deletions

View file

@ -21,8 +21,7 @@
#include "video_core/renderer_base.h"
#include "video_core/video_core.h"
namespace Service {
namespace VI {
namespace Service::VI {
struct DisplayInfo {
char display_name[0x40]{"Default"};
@ -963,5 +962,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager,
std::make_shared<VI_U>(module, nv_flinger)->InstallAsService(service_manager);
}
} // namespace VI
} // namespace Service
} // namespace Service::VI

View file

@ -11,8 +11,7 @@ namespace CoreTiming {
struct EventType;
}
namespace Service {
namespace VI {
namespace Service::VI {
enum class DisplayResolution : u32 {
DockedWidth = 1920,
@ -40,5 +39,4 @@ public:
void InstallInterfaces(SM::ServiceManager& service_manager,
std::shared_ptr<NVFlinger::NVFlinger> nv_flinger);
} // namespace VI
} // namespace Service
} // namespace Service::VI

View file

@ -4,8 +4,7 @@
#include "core/hle/service/vi/vi_m.h"
namespace Service {
namespace VI {
namespace Service::VI {
VI_M::VI_M(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger> nv_flinger)
: Module::Interface(std::move(module), "vi:m", std::move(nv_flinger)) {
@ -16,5 +15,4 @@ VI_M::VI_M(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger>
RegisterHandlers(functions);
}
} // namespace VI
} // namespace Service
} // namespace Service::VI

View file

@ -6,13 +6,11 @@
#include "core/hle/service/vi/vi.h"
namespace Service {
namespace VI {
namespace Service::VI {
class VI_M final : public Module::Interface {
public:
explicit VI_M(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger> nv_flinger);
};
} // namespace VI
} // namespace Service
} // namespace Service::VI

View file

@ -4,8 +4,7 @@
#include "core/hle/service/vi/vi_s.h"
namespace Service {
namespace VI {
namespace Service::VI {
VI_S::VI_S(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger> nv_flinger)
: Module::Interface(std::move(module), "vi:s", std::move(nv_flinger)) {
@ -16,5 +15,4 @@ VI_S::VI_S(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger>
RegisterHandlers(functions);
}
} // namespace VI
} // namespace Service
} // namespace Service::VI

View file

@ -6,13 +6,11 @@
#include "core/hle/service/vi/vi.h"
namespace Service {
namespace VI {
namespace Service::VI {
class VI_S final : public Module::Interface {
public:
explicit VI_S(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger> nv_flinger);
};
} // namespace VI
} // namespace Service
} // namespace Service::VI

View file

@ -4,8 +4,7 @@
#include "core/hle/service/vi/vi_u.h"
namespace Service {
namespace VI {
namespace Service::VI {
VI_U::VI_U(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger> nv_flinger)
: Module::Interface(std::move(module), "vi:u", std::move(nv_flinger)) {
@ -15,5 +14,4 @@ VI_U::VI_U(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger>
RegisterHandlers(functions);
}
} // namespace VI
} // namespace Service
} // namespace Service::VI

View file

@ -6,13 +6,11 @@
#include "core/hle/service/vi/vi.h"
namespace Service {
namespace VI {
namespace Service::VI {
class VI_U final : public Module::Interface {
public:
explicit VI_U(std::shared_ptr<Module> module, std::shared_ptr<NVFlinger::NVFlinger> nv_flinger);
};
} // namespace VI
} // namespace Service
} // namespace Service::VI