From 3b34bf286493fff720adbf613fdef8be1f916f0f Mon Sep 17 00:00:00 2001 From: st4rk Date: Sun, 21 Jan 2018 18:39:37 -0800 Subject: [PATCH] fixing the changes requested (remove private, explicit) --- src/core/CMakeLists.txt | 12 ++++++------ src/core/hle/service/audio/audin_u.cpp | 2 -- src/core/hle/service/audio/audin_u.h | 4 +--- src/core/hle/service/audio/audout_u.cpp | 2 -- src/core/hle/service/audio/audrec_u.cpp | 2 -- src/core/hle/service/audio/audrec_u.h | 4 +--- src/core/hle/service/audio/audren_u.cpp | 2 -- src/core/hle/service/audio/audren_u.h | 4 +--- src/core/hle/service/audio/codecctl.h | 4 +--- 9 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index fd78e235cb..4e012dc4bf 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -95,14 +95,10 @@ add_library(core STATIC hle/service/apm/apm.h hle/service/audio/audio.cpp hle/service/audio/audio.h - hle/service/audio/audout_u.cpp - hle/service/audio/audout_u.h - hle/service/filesystem/filesystem.cpp - hle/service/filesystem/filesystem.h - hle/service/filesystem/fsp_srv.cpp - hle/service/filesystem/fsp_srv.h hle/service/audio/audin_u.cpp hle/service/audio/audin_u.h + hle/service/audio/audout_u.cpp + hle/service/audio/audout_u.h hle/service/audio/audrec_u.cpp hle/service/audio/audrec_u.h hle/service/audio/audren_u.cpp @@ -111,6 +107,10 @@ add_library(core STATIC hle/service/audio/audren_u.h hle/service/audio/codecctl.cpp hle/service/audio/codecctl.h + hle/service/filesystem/filesystem.cpp + hle/service/filesystem/filesystem.h + hle/service/filesystem/fsp_srv.cpp + hle/service/filesystem/fsp_srv.h hle/service/hid/hid.cpp hle/service/hid/hid.h hle/service/lm/lm.cpp diff --git a/src/core/hle/service/audio/audin_u.cpp b/src/core/hle/service/audio/audin_u.cpp index ce68e74505..ee749fddd5 100644 --- a/src/core/hle/service/audio/audin_u.cpp +++ b/src/core/hle/service/audio/audin_u.cpp @@ -27,8 +27,6 @@ public: RegisterHandlers(functions); } ~IAudioIn() = default; - -private: }; AudInU::AudInU() : ServiceFramework("audin:u") { diff --git a/src/core/hle/service/audio/audin_u.h b/src/core/hle/service/audio/audin_u.h index c40213db10..2b8576756f 100644 --- a/src/core/hle/service/audio/audin_u.h +++ b/src/core/hle/service/audio/audin_u.h @@ -15,10 +15,8 @@ namespace Audio { class AudInU final : public ServiceFramework { public: - AudInU(); + explicit AudInU(); ~AudInU() = default; - -private: }; } // namespace Audio diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp index e8965b6eda..8ecfef4130 100644 --- a/src/core/hle/service/audio/audout_u.cpp +++ b/src/core/hle/service/audio/audout_u.cpp @@ -27,8 +27,6 @@ public: RegisterHandlers(functions); } ~IAudioOut() = default; - -private: }; void AudOutU::ListAudioOuts(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/audio/audrec_u.cpp b/src/core/hle/service/audio/audrec_u.cpp index 222c899ffc..f2626ec70b 100644 --- a/src/core/hle/service/audio/audrec_u.cpp +++ b/src/core/hle/service/audio/audrec_u.cpp @@ -25,8 +25,6 @@ public: RegisterHandlers(functions); } ~IFinalOutputRecorder() = default; - -private: }; AudRecU::AudRecU() : ServiceFramework("audrec:u") { diff --git a/src/core/hle/service/audio/audrec_u.h b/src/core/hle/service/audio/audrec_u.h index 229f10a1f8..c31e412c14 100644 --- a/src/core/hle/service/audio/audrec_u.h +++ b/src/core/hle/service/audio/audrec_u.h @@ -15,10 +15,8 @@ namespace Audio { class AudRecU final : public ServiceFramework { public: - AudRecU(); + explicit AudRecU(); ~AudRecU() = default; - -private: }; } // namespace Audio diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 8a6087eee3..4bafdfac3a 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp @@ -28,8 +28,6 @@ public: RegisterHandlers(functions); } ~IAudioRenderer() = default; - -private: }; AudRenU::AudRenU() : ServiceFramework("audren:u") { diff --git a/src/core/hle/service/audio/audren_u.h b/src/core/hle/service/audio/audren_u.h index ecba38bc51..1d9264c727 100644 --- a/src/core/hle/service/audio/audren_u.h +++ b/src/core/hle/service/audio/audren_u.h @@ -15,10 +15,8 @@ namespace Audio { class AudRenU final : public ServiceFramework { public: - AudRenU(); + explicit AudRenU(); ~AudRenU() = default; - -private: }; } // namespace Audio diff --git a/src/core/hle/service/audio/codecctl.h b/src/core/hle/service/audio/codecctl.h index f7a2c87248..1121ab0b1f 100644 --- a/src/core/hle/service/audio/codecctl.h +++ b/src/core/hle/service/audio/codecctl.h @@ -15,10 +15,8 @@ namespace Audio { class CodecCtl final : public ServiceFramework { public: - CodecCtl(); + explicit CodecCtl(); ~CodecCtl() = default; - -private: }; } // namespace Audio