From edf7a3be81930d699d7afc1f764f0c51bcbe653d Mon Sep 17 00:00:00 2001 From: JuanCStar Date: Thu, 7 Mar 2024 09:36:29 +0000 Subject: [PATCH] Rebrand SUYU_NON_COPYABLE and SUYU_NON_MOVEABLE --- src/common/common_funcs.h | 6 ++-- src/common/intrusive_list.h | 8 ++--- src/common/intrusive_red_black_tree.h | 8 ++--- src/common/scope_exit.h | 4 +-- src/common/telemetry.h | 8 ++--- src/core/arm/arm_interface.h | 6 ++-- src/core/file_sys/fs_path.h | 8 ++--- ...ssystem_aes_ctr_counter_extended_storage.h | 6 ++-- .../fssystem/fssystem_aes_ctr_storage.h | 6 ++-- .../fssystem/fssystem_aes_xts_storage.h | 6 ++-- .../fssystem_alignment_matching_storage.h | 10 +++---- .../file_sys/fssystem/fssystem_bucket_tree.h | 12 ++++---- .../fssystem/fssystem_compressed_storage.h | 14 ++++----- ...rarchical_integrity_verification_storage.h | 6 ++-- .../fssystem_hierarchical_sha256_storage.h | 6 ++-- .../fssystem/fssystem_indirect_storage.h | 6 ++-- .../fssystem_integrity_verification_storage.h | 6 ++-- ...stem_memory_resource_buffer_hold_storage.h | 6 ++-- .../fssystem_nca_file_system_driver.cpp | 6 ++-- .../fssystem_nca_file_system_driver.h | 14 ++++----- .../fssystem/fssystem_pooled_buffer.h | 4 +-- .../fssystem/fssystem_sparse_storage.h | 6 ++-- .../fssystem/fssystem_switch_storage.h | 6 ++-- src/core/file_sys/vfs/vfs.h | 14 ++++----- src/core/hle/kernel/k_auto_object.h | 8 ++--- src/core/hle/kernel/k_auto_object_container.h | 6 ++-- .../hle/kernel/k_dynamic_resource_manager.h | 6 ++-- src/core/hle/kernel/k_dynamic_slab_heap.h | 6 ++-- src/core/hle/kernel/k_handle_table.h | 6 ++-- src/core/hle/kernel/k_memory_region.h | 14 ++++----- src/core/hle/kernel/k_page_table_base.cpp | 6 ++-- src/core/hle/kernel/k_page_table_base.h | 6 ++-- src/core/hle/kernel/k_scheduler.h | 6 ++-- src/core/hle/kernel/k_slab_heap.h | 10 +++---- src/core/hle/kernel/k_spin_lock.h | 6 ++-- src/core/hle/kernel/physical_core.h | 6 ++-- src/core/hle/result.h | 6 ++-- src/core/hle/service/jit/jit_code_memory.h | 4 +-- .../ssl/ssl_backend_securetransport.cpp | 4 +-- src/core/internal_network/sockets.h | 4 +-- src/core/loader/loader.h | 6 ++-- src/hid_core/frontend/emulated_console.h | 6 ++-- src/hid_core/frontend/emulated_controller.h | 6 ++-- src/hid_core/frontend/emulated_devices.h | 6 ++-- src/hid_core/hid_core.h | 6 ++-- src/video_core/host1x/ffmpeg/ffmpeg.h | 30 +++++++++---------- src/video_core/renderer_base.h | 6 ++-- .../renderer_opengl/gl_resource_manager.h | 28 ++++++++--------- src/yuzu/loading_screen.cpp | 8 ++--- src/yuzu/loading_screen.h | 6 ++-- src/yuzu/play_time_manager.h | 6 ++-- 51 files changed, 200 insertions(+), 200 deletions(-) diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index ba3081efb4..4eb8a12382 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -109,11 +109,11 @@ __declspec(dllimport) void __stdcall DebugBreak(void); return static_cast(key) == 0; \ } -#define YUZU_NON_COPYABLE(cls) \ +#define SUYU_NON_COPYABLE(cls) \ cls(const cls&) = delete; \ cls& operator=(const cls&) = delete -#define YUZU_NON_MOVEABLE(cls) \ +#define SUYU_NON_MOVEABLE(cls) \ cls(cls&&) = delete; \ cls& operator=(cls&&) = delete diff --git a/src/common/intrusive_list.h b/src/common/intrusive_list.h index d330dc1c22..0867849a23 100644 --- a/src/common/intrusive_list.h +++ b/src/common/intrusive_list.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -16,7 +16,7 @@ class IntrusiveListImpl; } class IntrusiveListNode { - YUZU_NON_COPYABLE(IntrusiveListNode); + SUYU_NON_COPYABLE(IntrusiveListNode); private: friend class impl::IntrusiveListImpl; @@ -96,7 +96,7 @@ private: namespace impl { class IntrusiveListImpl { - YUZU_NON_COPYABLE(IntrusiveListImpl); + SUYU_NON_COPYABLE(IntrusiveListImpl); private: IntrusiveListNode m_root_node; @@ -302,7 +302,7 @@ private: template class IntrusiveList { - YUZU_NON_COPYABLE(IntrusiveList); + SUYU_NON_COPYABLE(IntrusiveList); private: impl::IntrusiveListImpl m_impl; diff --git a/src/common/intrusive_red_black_tree.h b/src/common/intrusive_red_black_tree.h index bc2940fa0a..6809acb47d 100644 --- a/src/common/intrusive_red_black_tree.h +++ b/src/common/intrusive_red_black_tree.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -17,7 +17,7 @@ class IntrusiveRedBlackTreeImpl; #pragma pack(push, 4) struct IntrusiveRedBlackTreeNode { - YUZU_NON_COPYABLE(IntrusiveRedBlackTreeNode); + SUYU_NON_COPYABLE(IntrusiveRedBlackTreeNode); public: using RBEntry = freebsd::RBEntry; @@ -49,7 +49,7 @@ class IntrusiveRedBlackTree; namespace impl { class IntrusiveRedBlackTreeImpl { - YUZU_NON_COPYABLE(IntrusiveRedBlackTreeImpl); + SUYU_NON_COPYABLE(IntrusiveRedBlackTreeImpl); private: template @@ -261,7 +261,7 @@ using RedBlackKeyType = std::remove_pointer_t class IntrusiveRedBlackTree { - YUZU_NON_COPYABLE(IntrusiveRedBlackTree); + SUYU_NON_COPYABLE(IntrusiveRedBlackTree); public: using ImplType = impl::IntrusiveRedBlackTreeImpl; diff --git a/src/common/scope_exit.h b/src/common/scope_exit.h index f3e88cde95..3d6bef8f57 100644 --- a/src/common/scope_exit.h +++ b/src/common/scope_exit.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project +// SPDX-FileCopyrightText: 2014 Citra Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -9,7 +9,7 @@ namespace detail { template class ScopeGuard { - YUZU_NON_COPYABLE(ScopeGuard); + SUYU_NON_COPYABLE(ScopeGuard); private: F f; diff --git a/src/common/telemetry.h b/src/common/telemetry.h index ba633d5a5e..f6489bda95 100644 --- a/src/common/telemetry.h +++ b/src/common/telemetry.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Citra Emulator Project +// SPDX-FileCopyrightText: 2017 Citra Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -52,7 +52,7 @@ public: template class Field : public FieldInterface { public: - YUZU_NON_COPYABLE(Field); + SUYU_NON_COPYABLE(Field); Field(FieldType type_, std::string_view name_, T value_) : name(name_), type(type_), value(std::move(value_)) {} @@ -101,7 +101,7 @@ private: */ class FieldCollection final { public: - YUZU_NON_COPYABLE(FieldCollection); + SUYU_NON_COPYABLE(FieldCollection); FieldCollection() = default; ~FieldCollection() = default; @@ -168,7 +168,7 @@ struct VisitorInterface { * backend implementation is not available. */ struct NullVisitor final : public VisitorInterface { - YUZU_NON_COPYABLE(NullVisitor); + SUYU_NON_COPYABLE(NullVisitor); NullVisitor() = default; ~NullVisitor() override = default; diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index 495963eefd..741113bf8e 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project +// SPDX-FileCopyrightText: 2014 Citra Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -47,8 +47,8 @@ enum class Architecture { /// Generic ARMv8 CPU interface class ArmInterface { public: - YUZU_NON_COPYABLE(ArmInterface); - YUZU_NON_MOVEABLE(ArmInterface); + SUYU_NON_COPYABLE(ArmInterface); + SUYU_NON_MOVEABLE(ArmInterface); explicit ArmInterface(bool uses_wall_clock) : m_uses_wall_clock{uses_wall_clock} {} virtual ~ArmInterface() = default; diff --git a/src/core/file_sys/fs_path.h b/src/core/file_sys/fs_path.h index 1566e82b9d..a4004c2161 100644 --- a/src/core/file_sys/fs_path.h +++ b/src/core/file_sys/fs_path.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -15,8 +15,8 @@ namespace FileSys { class DirectoryPathParser; class Path { - YUZU_NON_COPYABLE(Path); - YUZU_NON_MOVEABLE(Path); + SUYU_NON_COPYABLE(Path); + SUYU_NON_MOVEABLE(Path); private: static constexpr const char* EmptyPath = ""; @@ -27,7 +27,7 @@ private: public: class WriteBuffer { - YUZU_NON_COPYABLE(WriteBuffer); + SUYU_NON_COPYABLE(WriteBuffer); private: char* m_buffer; diff --git a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h b/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h index d0e9ceed05..0f53e3f669 100644 --- a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h +++ b/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -14,8 +14,8 @@ namespace FileSys { using namespace Common::Literals; class AesCtrCounterExtendedStorage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(AesCtrCounterExtendedStorage); - YUZU_NON_MOVEABLE(AesCtrCounterExtendedStorage); + SUYU_NON_COPYABLE(AesCtrCounterExtendedStorage); + SUYU_NON_MOVEABLE(AesCtrCounterExtendedStorage); public: static constexpr size_t BlockSize = 0x10; diff --git a/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h b/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h index 5abd93d33c..7838f982c6 100644 --- a/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h +++ b/src/core/file_sys/fssystem/fssystem_aes_ctr_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -14,8 +14,8 @@ namespace FileSys { class AesCtrStorage : public IStorage { - YUZU_NON_COPYABLE(AesCtrStorage); - YUZU_NON_MOVEABLE(AesCtrStorage); + SUYU_NON_COPYABLE(AesCtrStorage); + SUYU_NON_MOVEABLE(AesCtrStorage); public: static constexpr size_t BlockSize = 0x10; diff --git a/src/core/file_sys/fssystem/fssystem_aes_xts_storage.h b/src/core/file_sys/fssystem/fssystem_aes_xts_storage.h index 0e83ca1b95..c03f5d8b43 100644 --- a/src/core/file_sys/fssystem/fssystem_aes_xts_storage.h +++ b/src/core/file_sys/fssystem/fssystem_aes_xts_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -13,8 +13,8 @@ namespace FileSys { class AesXtsStorage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(AesXtsStorage); - YUZU_NON_MOVEABLE(AesXtsStorage); + SUYU_NON_COPYABLE(AesXtsStorage); + SUYU_NON_MOVEABLE(AesXtsStorage); public: static constexpr size_t AesBlockSize = 0x10; diff --git a/src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h b/src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h index f96691d03d..f5faee0ca1 100644 --- a/src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h +++ b/src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -13,8 +13,8 @@ namespace FileSys { template class AlignmentMatchingStorage : public IStorage { - YUZU_NON_COPYABLE(AlignmentMatchingStorage); - YUZU_NON_MOVEABLE(AlignmentMatchingStorage); + SUYU_NON_COPYABLE(AlignmentMatchingStorage); + SUYU_NON_MOVEABLE(AlignmentMatchingStorage); public: static constexpr size_t DataAlign = DataAlign_; @@ -77,8 +77,8 @@ public: template class AlignmentMatchingStoragePooledBuffer : public IStorage { - YUZU_NON_COPYABLE(AlignmentMatchingStoragePooledBuffer); - YUZU_NON_MOVEABLE(AlignmentMatchingStoragePooledBuffer); + SUYU_NON_COPYABLE(AlignmentMatchingStoragePooledBuffer); + SUYU_NON_MOVEABLE(AlignmentMatchingStoragePooledBuffer); public: static constexpr size_t BufferAlign = BufferAlign_; diff --git a/src/core/file_sys/fssystem/fssystem_bucket_tree.h b/src/core/file_sys/fssystem/fssystem_bucket_tree.h index 3a5e21d1a4..89996f64b4 100644 --- a/src/core/file_sys/fssystem/fssystem_bucket_tree.h +++ b/src/core/file_sys/fssystem/fssystem_bucket_tree.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -18,8 +18,8 @@ namespace FileSys { using namespace Common::Literals; class BucketTree { - YUZU_NON_COPYABLE(BucketTree); - YUZU_NON_MOVEABLE(BucketTree); + SUYU_NON_COPYABLE(BucketTree); + SUYU_NON_MOVEABLE(BucketTree); public: static constexpr u32 Magic = Common::MakeMagic('B', 'K', 'T', 'R'); @@ -123,7 +123,7 @@ public: private: class NodeBuffer { - YUZU_NON_COPYABLE(NodeBuffer); + SUYU_NON_COPYABLE(NodeBuffer); public: NodeBuffer() : m_header() {} @@ -330,8 +330,8 @@ private: }; class BucketTree::Visitor { - YUZU_NON_COPYABLE(Visitor); - YUZU_NON_MOVEABLE(Visitor); + SUYU_NON_COPYABLE(Visitor); + SUYU_NON_MOVEABLE(Visitor); public: constexpr Visitor() diff --git a/src/core/file_sys/fssystem/fssystem_compressed_storage.h b/src/core/file_sys/fssystem/fssystem_compressed_storage.h index 74c98630ec..93a4b94972 100644 --- a/src/core/file_sys/fssystem/fssystem_compressed_storage.h +++ b/src/core/file_sys/fssystem/fssystem_compressed_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -17,8 +17,8 @@ namespace FileSys { using namespace Common::Literals; class CompressedStorage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(CompressedStorage); - YUZU_NON_MOVEABLE(CompressedStorage); + SUYU_NON_COPYABLE(CompressedStorage); + SUYU_NON_MOVEABLE(CompressedStorage); public: static constexpr size_t NodeSize = 16_KiB; @@ -47,8 +47,8 @@ public: private: class CompressedStorageCore { - YUZU_NON_COPYABLE(CompressedStorageCore); - YUZU_NON_MOVEABLE(CompressedStorageCore); + SUYU_NON_COPYABLE(CompressedStorageCore); + SUYU_NON_MOVEABLE(CompressedStorageCore); public: CompressedStorageCore() : m_table(), m_data_storage() {} @@ -674,8 +674,8 @@ private: }; class CacheManager { - YUZU_NON_COPYABLE(CacheManager); - YUZU_NON_MOVEABLE(CacheManager); + SUYU_NON_COPYABLE(CacheManager); + SUYU_NON_MOVEABLE(CacheManager); private: struct AccessRange { diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h index bd129db47a..4ce5603706 100644 --- a/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h +++ b/src/core/file_sys/fssystem/fssystem_hierarchical_integrity_verification_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -57,8 +57,8 @@ struct HierarchicalIntegrityVerificationSizeSet { static_assert(std::is_trivial_v); class HierarchicalIntegrityVerificationStorage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(HierarchicalIntegrityVerificationStorage); - YUZU_NON_MOVEABLE(HierarchicalIntegrityVerificationStorage); + SUYU_NON_COPYABLE(HierarchicalIntegrityVerificationStorage); + SUYU_NON_MOVEABLE(HierarchicalIntegrityVerificationStorage); public: using GenerateRandomFunction = void (*)(void* dst, size_t size); diff --git a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h index 41d3960b8b..31b26f164e 100644 --- a/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h +++ b/src/core/file_sys/fssystem/fssystem_hierarchical_sha256_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -12,8 +12,8 @@ namespace FileSys { class HierarchicalSha256Storage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(HierarchicalSha256Storage); - YUZU_NON_MOVEABLE(HierarchicalSha256Storage); + SUYU_NON_COPYABLE(HierarchicalSha256Storage); + SUYU_NON_MOVEABLE(HierarchicalSha256Storage); public: static constexpr s32 LayerCount = 3; diff --git a/src/core/file_sys/fssystem/fssystem_indirect_storage.h b/src/core/file_sys/fssystem/fssystem_indirect_storage.h index d4b95fd273..7b1a6bd54e 100644 --- a/src/core/file_sys/fssystem/fssystem_indirect_storage.h +++ b/src/core/file_sys/fssystem/fssystem_indirect_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -13,8 +13,8 @@ namespace FileSys { class IndirectStorage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(IndirectStorage); - YUZU_NON_MOVEABLE(IndirectStorage); + SUYU_NON_COPYABLE(IndirectStorage); + SUYU_NON_MOVEABLE(IndirectStorage); public: static constexpr s32 StorageCount = 2; diff --git a/src/core/file_sys/fssystem/fssystem_integrity_verification_storage.h b/src/core/file_sys/fssystem/fssystem_integrity_verification_storage.h index 09f76799db..9328901bc5 100644 --- a/src/core/file_sys/fssystem/fssystem_integrity_verification_storage.h +++ b/src/core/file_sys/fssystem/fssystem_integrity_verification_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -11,8 +11,8 @@ namespace FileSys { class IntegrityVerificationStorage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(IntegrityVerificationStorage); - YUZU_NON_MOVEABLE(IntegrityVerificationStorage); + SUYU_NON_COPYABLE(IntegrityVerificationStorage); + SUYU_NON_MOVEABLE(IntegrityVerificationStorage); public: static constexpr s64 HashSize = 256 / 8; diff --git a/src/core/file_sys/fssystem/fssystem_memory_resource_buffer_hold_storage.h b/src/core/file_sys/fssystem/fssystem_memory_resource_buffer_hold_storage.h index c07a127fb3..9f1e4cc1e8 100644 --- a/src/core/file_sys/fssystem/fssystem_memory_resource_buffer_hold_storage.h +++ b/src/core/file_sys/fssystem/fssystem_memory_resource_buffer_hold_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -8,8 +8,8 @@ namespace FileSys { class MemoryResourceBufferHoldStorage : public IStorage { - YUZU_NON_COPYABLE(MemoryResourceBufferHoldStorage); - YUZU_NON_MOVEABLE(MemoryResourceBufferHoldStorage); + SUYU_NON_COPYABLE(MemoryResourceBufferHoldStorage); + SUYU_NON_MOVEABLE(MemoryResourceBufferHoldStorage); public: MemoryResourceBufferHoldStorage(VirtualFile storage, size_t buffer_size) diff --git a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp index ab5a7984e3..a2b9d27de5 100644 --- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp +++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include "core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h" @@ -28,8 +28,8 @@ constexpr inline s32 IntegrityDataCacheCountForMeta = 16; constexpr inline s32 IntegrityHashCacheCountForMeta = 2; class SharedNcaBodyStorage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(SharedNcaBodyStorage); - YUZU_NON_MOVEABLE(SharedNcaBodyStorage); + SUYU_NON_COPYABLE(SharedNcaBodyStorage); + SUYU_NON_MOVEABLE(SharedNcaBodyStorage); private: VirtualFile m_storage; diff --git a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h index 5bc838de64..34a04bffe1 100644 --- a/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h +++ b/src/core/file_sys/fssystem/fssystem_nca_file_system_driver.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -88,8 +88,8 @@ constexpr inline s32 GetKeyTypeValue(u8 key_index, u8 key_generation) { } class NcaReader { - YUZU_NON_COPYABLE(NcaReader); - YUZU_NON_MOVEABLE(NcaReader); + SUYU_NON_COPYABLE(NcaReader); + SUYU_NON_MOVEABLE(NcaReader); public: NcaReader(); @@ -154,8 +154,8 @@ private: }; class NcaFsHeaderReader { - YUZU_NON_COPYABLE(NcaFsHeaderReader); - YUZU_NON_MOVEABLE(NcaFsHeaderReader); + SUYU_NON_COPYABLE(NcaFsHeaderReader); + SUYU_NON_MOVEABLE(NcaFsHeaderReader); public: NcaFsHeaderReader() : m_fs_index(-1) { @@ -207,8 +207,8 @@ private: }; class NcaFileSystemDriver { - YUZU_NON_COPYABLE(NcaFileSystemDriver); - YUZU_NON_MOVEABLE(NcaFileSystemDriver); + SUYU_NON_COPYABLE(NcaFileSystemDriver); + SUYU_NON_MOVEABLE(NcaFileSystemDriver); public: struct StorageContext { diff --git a/src/core/file_sys/fssystem/fssystem_pooled_buffer.h b/src/core/file_sys/fssystem/fssystem_pooled_buffer.h index 9a6adbcb5a..2a084ec45f 100644 --- a/src/core/file_sys/fssystem/fssystem_pooled_buffer.h +++ b/src/core/file_sys/fssystem/fssystem_pooled_buffer.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -16,7 +16,7 @@ constexpr inline size_t BufferPoolAlignment = 4_KiB; constexpr inline size_t BufferPoolWorkSize = 320; class PooledBuffer { - YUZU_NON_COPYABLE(PooledBuffer); + SUYU_NON_COPYABLE(PooledBuffer); public: // Constructor/Destructor. diff --git a/src/core/file_sys/fssystem/fssystem_sparse_storage.h b/src/core/file_sys/fssystem/fssystem_sparse_storage.h index 6c196ec611..d0761cd385 100644 --- a/src/core/file_sys/fssystem/fssystem_sparse_storage.h +++ b/src/core/file_sys/fssystem/fssystem_sparse_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -8,8 +8,8 @@ namespace FileSys { class SparseStorage : public IndirectStorage { - YUZU_NON_COPYABLE(SparseStorage); - YUZU_NON_MOVEABLE(SparseStorage); + SUYU_NON_COPYABLE(SparseStorage); + SUYU_NON_MOVEABLE(SparseStorage); private: class ZeroStorage : public IReadOnlyStorage { diff --git a/src/core/file_sys/fssystem/fssystem_switch_storage.h b/src/core/file_sys/fssystem/fssystem_switch_storage.h index 2b43927cb5..9de6fbe936 100644 --- a/src/core/file_sys/fssystem/fssystem_switch_storage.h +++ b/src/core/file_sys/fssystem/fssystem_switch_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -8,8 +8,8 @@ namespace FileSys { class RegionSwitchStorage : public IReadOnlyStorage { - YUZU_NON_COPYABLE(RegionSwitchStorage); - YUZU_NON_MOVEABLE(RegionSwitchStorage); + SUYU_NON_COPYABLE(RegionSwitchStorage); + SUYU_NON_MOVEABLE(RegionSwitchStorage); public: struct Region { diff --git a/src/core/file_sys/vfs/vfs.h b/src/core/file_sys/vfs/vfs.h index f846a9669c..ec04cd8069 100644 --- a/src/core/file_sys/vfs/vfs.h +++ b/src/core/file_sys/vfs/vfs.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -30,8 +30,8 @@ enum class VfsEntryType { // functionality, they will need to override. class VfsFilesystem { public: - YUZU_NON_COPYABLE(VfsFilesystem); - YUZU_NON_MOVEABLE(VfsFilesystem); + SUYU_NON_COPYABLE(VfsFilesystem); + SUYU_NON_MOVEABLE(VfsFilesystem); explicit VfsFilesystem(VirtualDir root); virtual ~VfsFilesystem(); @@ -81,8 +81,8 @@ protected: // A class representing a file in an abstract filesystem. class VfsFile { public: - YUZU_NON_COPYABLE(VfsFile); - YUZU_NON_MOVEABLE(VfsFile); + SUYU_NON_COPYABLE(VfsFile); + SUYU_NON_MOVEABLE(VfsFile); VfsFile() = default; virtual ~VfsFile(); @@ -184,8 +184,8 @@ public: // A class representing a directory in an abstract filesystem. class VfsDirectory { public: - YUZU_NON_COPYABLE(VfsDirectory); - YUZU_NON_MOVEABLE(VfsDirectory); + SUYU_NON_COPYABLE(VfsDirectory); + SUYU_NON_MOVEABLE(VfsDirectory); VfsDirectory() = default; virtual ~VfsDirectory(); diff --git a/src/core/hle/kernel/k_auto_object.h b/src/core/hle/kernel/k_auto_object.h index 8d4e0df44f..3ec056119b 100644 --- a/src/core/hle/kernel/k_auto_object.h +++ b/src/core/hle/kernel/k_auto_object.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -27,8 +27,8 @@ private: static constexpr inline ClassTokenType ClassToken() { return ::Kernel::ClassToken; } \ \ public: \ - YUZU_NON_COPYABLE(CLASS); \ - YUZU_NON_MOVEABLE(CLASS); \ + SUYU_NON_COPYABLE(CLASS); \ + SUYU_NON_MOVEABLE(CLASS); \ \ using BaseClass = BASE_CLASS; \ static constexpr TypeObj GetStaticTypeObj() { \ @@ -211,7 +211,7 @@ private: template class KScopedAutoObject { public: - YUZU_NON_COPYABLE(KScopedAutoObject); + SUYU_NON_COPYABLE(KScopedAutoObject); constexpr KScopedAutoObject() = default; diff --git a/src/core/hle/kernel/k_auto_object_container.h b/src/core/hle/kernel/k_auto_object_container.h index 770743d21b..bee5a5f304 100644 --- a/src/core/hle/kernel/k_auto_object_container.h +++ b/src/core/hle/kernel/k_auto_object_container.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -16,8 +16,8 @@ class KProcess; class KAutoObjectWithListContainer { public: - YUZU_NON_COPYABLE(KAutoObjectWithListContainer); - YUZU_NON_MOVEABLE(KAutoObjectWithListContainer); + SUYU_NON_COPYABLE(KAutoObjectWithListContainer); + SUYU_NON_MOVEABLE(KAutoObjectWithListContainer); using ListType = boost::intrusive::rbtree; diff --git a/src/core/hle/kernel/k_dynamic_resource_manager.h b/src/core/hle/kernel/k_dynamic_resource_manager.h index b6a27d648f..55347979b2 100644 --- a/src/core/hle/kernel/k_dynamic_resource_manager.h +++ b/src/core/hle/kernel/k_dynamic_resource_manager.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -12,8 +12,8 @@ namespace Kernel { template class KDynamicResourceManager { - YUZU_NON_COPYABLE(KDynamicResourceManager); - YUZU_NON_MOVEABLE(KDynamicResourceManager); + SUYU_NON_COPYABLE(KDynamicResourceManager); + SUYU_NON_MOVEABLE(KDynamicResourceManager); public: using DynamicSlabType = KDynamicSlabHeap; diff --git a/src/core/hle/kernel/k_dynamic_slab_heap.h b/src/core/hle/kernel/k_dynamic_slab_heap.h index 76ed4cac1f..4f3de7046d 100644 --- a/src/core/hle/kernel/k_dynamic_slab_heap.h +++ b/src/core/hle/kernel/k_dynamic_slab_heap.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -13,8 +13,8 @@ namespace Kernel { template class KDynamicSlabHeap : protected impl::KSlabHeapImpl { - YUZU_NON_COPYABLE(KDynamicSlabHeap); - YUZU_NON_MOVEABLE(KDynamicSlabHeap); + SUYU_NON_COPYABLE(KDynamicSlabHeap); + SUYU_NON_MOVEABLE(KDynamicSlabHeap); public: constexpr KDynamicSlabHeap() = default; diff --git a/src/core/hle/kernel/k_handle_table.h b/src/core/hle/kernel/k_handle_table.h index 1bf68e6b04..91d5b71009 100644 --- a/src/core/hle/kernel/k_handle_table.h +++ b/src/core/hle/kernel/k_handle_table.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -21,8 +21,8 @@ namespace Kernel { class KernelCore; class KHandleTable { - YUZU_NON_COPYABLE(KHandleTable); - YUZU_NON_MOVEABLE(KHandleTable); + SUYU_NON_COPYABLE(KHandleTable); + SUYU_NON_MOVEABLE(KHandleTable); public: static constexpr size_t MaxTableSize = 1024; diff --git a/src/core/hle/kernel/k_memory_region.h b/src/core/hle/kernel/k_memory_region.h index e3044f0227..44c7343156 100644 --- a/src/core/hle/kernel/k_memory_region.h +++ b/src/core/hle/kernel/k_memory_region.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -17,8 +17,8 @@ class KMemoryRegion final : public Common::IntrusiveRedBlackTreeBaseNode::TreeType; public: - YUZU_NON_COPYABLE(KMemoryRegionTree); - YUZU_NON_MOVEABLE(KMemoryRegionTree); + SUYU_NON_COPYABLE(KMemoryRegionTree); + SUYU_NON_MOVEABLE(KMemoryRegionTree); using value_type = TreeType::value_type; using size_type = TreeType::size_type; @@ -327,8 +327,8 @@ private: class KMemoryRegionAllocator final { public: - YUZU_NON_COPYABLE(KMemoryRegionAllocator); - YUZU_NON_MOVEABLE(KMemoryRegionAllocator); + SUYU_NON_COPYABLE(KMemoryRegionAllocator); + SUYU_NON_MOVEABLE(KMemoryRegionAllocator); static constexpr size_t MaxMemoryRegions = 200; diff --git a/src/core/hle/kernel/k_page_table_base.cpp b/src/core/hle/kernel/k_page_table_base.cpp index 19cdf4f3ac..25af39c856 100644 --- a/src/core/hle/kernel/k_page_table_base.cpp +++ b/src/core/hle/kernel/k_page_table_base.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include "common/scope_exit.h" @@ -14,8 +14,8 @@ namespace Kernel { namespace { class KScopedLightLockPair { - YUZU_NON_COPYABLE(KScopedLightLockPair); - YUZU_NON_MOVEABLE(KScopedLightLockPair); + SUYU_NON_COPYABLE(KScopedLightLockPair); + SUYU_NON_MOVEABLE(KScopedLightLockPair); private: KLightLock* m_lower; diff --git a/src/core/hle/kernel/k_page_table_base.h b/src/core/hle/kernel/k_page_table_base.h index 748419f862..819502d0a0 100644 --- a/src/core/hle/kernel/k_page_table_base.h +++ b/src/core/hle/kernel/k_page_table_base.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -49,8 +49,8 @@ class KResourceLimit; class KSystemResource; class KPageTableBase { - YUZU_NON_COPYABLE(KPageTableBase); - YUZU_NON_MOVEABLE(KPageTableBase); + SUYU_NON_COPYABLE(KPageTableBase); + SUYU_NON_MOVEABLE(KPageTableBase); public: using TraversalEntry = Common::PageTable::TraversalEntry; diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h index d85a0c0408..20347124f8 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/core/hle/kernel/k_scheduler.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -33,8 +33,8 @@ class KScopedSchedulerLockAndSleep; class KScheduler final { public: - YUZU_NON_COPYABLE(KScheduler); - YUZU_NON_MOVEABLE(KScheduler); + SUYU_NON_COPYABLE(KScheduler); + SUYU_NON_MOVEABLE(KScheduler); using LockType = KAbstractSchedulerLock; diff --git a/src/core/hle/kernel/k_slab_heap.h b/src/core/hle/kernel/k_slab_heap.h index 334afebb71..e1b82597f5 100644 --- a/src/core/hle/kernel/k_slab_heap.h +++ b/src/core/hle/kernel/k_slab_heap.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -18,8 +18,8 @@ class KernelCore; namespace impl { class KSlabHeapImpl { - YUZU_NON_COPYABLE(KSlabHeapImpl); - YUZU_NON_MOVEABLE(KSlabHeapImpl); + SUYU_NON_COPYABLE(KSlabHeapImpl); + SUYU_NON_MOVEABLE(KSlabHeapImpl); public: struct Node { @@ -72,8 +72,8 @@ private: template class KSlabHeapBase : protected impl::KSlabHeapImpl { - YUZU_NON_COPYABLE(KSlabHeapBase); - YUZU_NON_MOVEABLE(KSlabHeapBase); + SUYU_NON_COPYABLE(KSlabHeapBase); + SUYU_NON_MOVEABLE(KSlabHeapBase); private: size_t m_obj_size{}; diff --git a/src/core/hle/kernel/k_spin_lock.h b/src/core/hle/kernel/k_spin_lock.h index 094a1e6be0..fde6e250d0 100644 --- a/src/core/hle/kernel/k_spin_lock.h +++ b/src/core/hle/kernel/k_spin_lock.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -14,8 +14,8 @@ class KSpinLock { public: explicit KSpinLock() = default; - YUZU_NON_COPYABLE(KSpinLock); - YUZU_NON_MOVEABLE(KSpinLock); + SUYU_NON_COPYABLE(KSpinLock); + SUYU_NON_MOVEABLE(KSpinLock); void Lock(); void Unlock(); diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h index bae4fe5b88..d3bb4765a1 100644 --- a/src/core/hle/kernel/physical_core.h +++ b/src/core/hle/kernel/physical_core.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -26,8 +26,8 @@ public: PhysicalCore(KernelCore& kernel, std::size_t core_index); ~PhysicalCore(); - YUZU_NON_COPYABLE(PhysicalCore); - YUZU_NON_MOVEABLE(PhysicalCore); + SUYU_NON_COPYABLE(PhysicalCore); + SUYU_NON_MOVEABLE(PhysicalCore); // Execute guest code running on the given thread. void RunThread(KThread* thread); diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 316370266d..9a7c10efae 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project +// SPDX-FileCopyrightText: 2014 Citra Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -298,8 +298,8 @@ private: namespace ResultImpl { template class ScopedResultGuard { - YUZU_NON_COPYABLE(ScopedResultGuard); - YUZU_NON_MOVEABLE(ScopedResultGuard); + SUYU_NON_COPYABLE(ScopedResultGuard); + SUYU_NON_MOVEABLE(ScopedResultGuard); private: Result& m_ref; diff --git a/src/core/hle/service/jit/jit_code_memory.h b/src/core/hle/service/jit/jit_code_memory.h index 6376d4c4eb..c7e961deb7 100644 --- a/src/core/hle/service/jit/jit_code_memory.h +++ b/src/core/hle/service/jit/jit_code_memory.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -11,7 +11,7 @@ namespace Service::JIT { class CodeMemory { public: - YUZU_NON_COPYABLE(CodeMemory); + SUYU_NON_COPYABLE(CodeMemory); explicit CodeMemory() = default; diff --git a/src/core/hle/service/ssl/ssl_backend_securetransport.cpp b/src/core/hle/service/ssl/ssl_backend_securetransport.cpp index c48914f640..dc25304062 100644 --- a/src/core/hle/service/ssl/ssl_backend_securetransport.cpp +++ b/src/core/hle/service/ssl/ssl_backend_securetransport.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include @@ -23,7 +23,7 @@ template struct CFReleaser { T ptr; - YUZU_NON_COPYABLE(CFReleaser); + SUYU_NON_COPYABLE(CFReleaser); constexpr CFReleaser() : ptr(nullptr) {} constexpr CFReleaser(T ptr) : ptr(ptr) {} constexpr operator T() { diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index a63455c939..7f026c6054 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -39,8 +39,8 @@ public: explicit SocketBase(SOCKET fd_) : fd{fd_} {} virtual ~SocketBase() = default; - YUZU_NON_COPYABLE(SocketBase); - YUZU_NON_MOVEABLE(SocketBase); + SUYU_NON_COPYABLE(SocketBase); + SUYU_NON_MOVEABLE(SocketBase); virtual Errno Initialize(Domain domain, Type type, Protocol protocol) = 0; diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index f4e932cec9..3460a5bf9d 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -143,8 +143,8 @@ std::ostream& operator<<(std::ostream& os, ResultStatus status); /// Interface for loading an application class AppLoader { public: - YUZU_NON_COPYABLE(AppLoader); - YUZU_NON_MOVEABLE(AppLoader); + SUYU_NON_COPYABLE(AppLoader); + SUYU_NON_MOVEABLE(AppLoader); struct LoadParameters { s32 main_thread_priority; diff --git a/src/hid_core/frontend/emulated_console.h b/src/hid_core/frontend/emulated_console.h index 847551395c..5ea2093949 100644 --- a/src/hid_core/frontend/emulated_console.h +++ b/src/hid_core/frontend/emulated_console.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -80,8 +80,8 @@ public: explicit EmulatedConsole(); ~EmulatedConsole(); - YUZU_NON_COPYABLE(EmulatedConsole); - YUZU_NON_MOVEABLE(EmulatedConsole); + SUYU_NON_COPYABLE(EmulatedConsole); + SUYU_NON_MOVEABLE(EmulatedConsole); /// Removes all callbacks created from input devices void UnloadInput(); diff --git a/src/hid_core/frontend/emulated_controller.h b/src/hid_core/frontend/emulated_controller.h index 17ad6069e0..fbe83dd48e 100644 --- a/src/hid_core/frontend/emulated_controller.h +++ b/src/hid_core/frontend/emulated_controller.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -178,8 +178,8 @@ public: explicit EmulatedController(NpadIdType npad_id_type_); ~EmulatedController(); - YUZU_NON_COPYABLE(EmulatedController); - YUZU_NON_MOVEABLE(EmulatedController); + SUYU_NON_COPYABLE(EmulatedController); + SUYU_NON_MOVEABLE(EmulatedController); /// Converts the controller type from settings to npad type static NpadStyleIndex MapSettingsTypeToNPad(Settings::ControllerType type); diff --git a/src/hid_core/frontend/emulated_devices.h b/src/hid_core/frontend/emulated_devices.h index b2e57318cc..8ec58c1603 100644 --- a/src/hid_core/frontend/emulated_devices.h +++ b/src/hid_core/frontend/emulated_devices.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -81,8 +81,8 @@ public: explicit EmulatedDevices(); ~EmulatedDevices(); - YUZU_NON_COPYABLE(EmulatedDevices); - YUZU_NON_MOVEABLE(EmulatedDevices); + SUYU_NON_COPYABLE(EmulatedDevices); + SUYU_NON_MOVEABLE(EmulatedDevices); /// Removes all callbacks created from input devices void UnloadInput(); diff --git a/src/hid_core/hid_core.h b/src/hid_core/hid_core.h index dae29c5062..aa9ff5d7a0 100644 --- a/src/hid_core/hid_core.h +++ b/src/hid_core/hid_core.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -21,8 +21,8 @@ public: explicit HIDCore(); ~HIDCore(); - YUZU_NON_COPYABLE(HIDCore); - YUZU_NON_MOVEABLE(HIDCore); + SUYU_NON_COPYABLE(HIDCore); + SUYU_NON_MOVEABLE(HIDCore); EmulatedController* GetEmulatedController(NpadIdType npad_id_type); const EmulatedController* GetEmulatedController(NpadIdType npad_id_type) const; diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.h b/src/video_core/host1x/ffmpeg/ffmpeg.h index 1de0bbd839..00ba8f0906 100644 --- a/src/video_core/host1x/ffmpeg/ffmpeg.h +++ b/src/video_core/host1x/ffmpeg/ffmpeg.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -43,8 +43,8 @@ class DeinterlaceFilter; // Wraps an AVPacket, a container for compressed bitstream data. class Packet { public: - YUZU_NON_COPYABLE(Packet); - YUZU_NON_MOVEABLE(Packet); + SUYU_NON_COPYABLE(Packet); + SUYU_NON_MOVEABLE(Packet); explicit Packet(std::span data); ~Packet(); @@ -60,8 +60,8 @@ private: // Wraps an AVFrame, a container for audio and video stream data. class Frame { public: - YUZU_NON_COPYABLE(Frame); - YUZU_NON_MOVEABLE(Frame); + SUYU_NON_COPYABLE(Frame); + SUYU_NON_MOVEABLE(Frame); explicit Frame(); ~Frame(); @@ -109,8 +109,8 @@ private: // Wraps an AVCodec, a type containing information about a codec. class Decoder { public: - YUZU_NON_COPYABLE(Decoder); - YUZU_NON_MOVEABLE(Decoder); + SUYU_NON_COPYABLE(Decoder); + SUYU_NON_MOVEABLE(Decoder); explicit Decoder(Tegra::Host1x::NvdecCommon::VideoCodec codec); ~Decoder() = default; @@ -128,8 +128,8 @@ private: // Wraps AVBufferRef for an accelerated decoder. class HardwareContext { public: - YUZU_NON_COPYABLE(HardwareContext); - YUZU_NON_MOVEABLE(HardwareContext); + SUYU_NON_COPYABLE(HardwareContext); + SUYU_NON_MOVEABLE(HardwareContext); static std::vector GetSupportedDeviceTypes(); @@ -151,8 +151,8 @@ private: // Wraps an AVCodecContext. class DecoderContext { public: - YUZU_NON_COPYABLE(DecoderContext); - YUZU_NON_MOVEABLE(DecoderContext); + SUYU_NON_COPYABLE(DecoderContext); + SUYU_NON_MOVEABLE(DecoderContext); explicit DecoderContext(const Decoder& decoder); ~DecoderContext(); @@ -173,8 +173,8 @@ private: // Wraps an AVFilterGraph. class DeinterlaceFilter { public: - YUZU_NON_COPYABLE(DeinterlaceFilter); - YUZU_NON_MOVEABLE(DeinterlaceFilter); + SUYU_NON_COPYABLE(DeinterlaceFilter); + SUYU_NON_MOVEABLE(DeinterlaceFilter); explicit DeinterlaceFilter(const Frame& frame); ~DeinterlaceFilter(); @@ -191,8 +191,8 @@ private: class DecodeApi { public: - YUZU_NON_COPYABLE(DecodeApi); - YUZU_NON_MOVEABLE(DecodeApi); + SUYU_NON_COPYABLE(DecodeApi); + SUYU_NON_MOVEABLE(DecodeApi); DecodeApi() = default; ~DecodeApi() = default; diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index 67427f9372..c180bef73e 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2014 Citra Emulator Project +// SPDX-FileCopyrightText: 2014 Citra Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -30,8 +30,8 @@ struct RendererSettings { class RendererBase { public: - YUZU_NON_COPYABLE(RendererBase); - YUZU_NON_MOVEABLE(RendererBase); + SUYU_NON_COPYABLE(RendererBase); + SUYU_NON_MOVEABLE(RendererBase); explicit RendererBase(Core::Frontend::EmuWindow& window, std::unique_ptr context); diff --git a/src/video_core/renderer_opengl/gl_resource_manager.h b/src/video_core/renderer_opengl/gl_resource_manager.h index 6ca8227bdb..b8831ac00a 100644 --- a/src/video_core/renderer_opengl/gl_resource_manager.h +++ b/src/video_core/renderer_opengl/gl_resource_manager.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2015 Citra Emulator Project +// SPDX-FileCopyrightText: 2015 Citra Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -12,7 +12,7 @@ namespace OpenGL { class OGLRenderbuffer final { public: - YUZU_NON_COPYABLE(OGLRenderbuffer); + SUYU_NON_COPYABLE(OGLRenderbuffer); OGLRenderbuffer() = default; @@ -39,7 +39,7 @@ public: class OGLTexture final { public: - YUZU_NON_COPYABLE(OGLTexture); + SUYU_NON_COPYABLE(OGLTexture); OGLTexture() = default; @@ -66,7 +66,7 @@ public: class OGLTextureView final { public: - YUZU_NON_COPYABLE(OGLTextureView); + SUYU_NON_COPYABLE(OGLTextureView); OGLTextureView() = default; @@ -93,7 +93,7 @@ public: class OGLSampler final { public: - YUZU_NON_COPYABLE(OGLSampler); + SUYU_NON_COPYABLE(OGLSampler); OGLSampler() = default; @@ -120,7 +120,7 @@ public: class OGLShader final { public: - YUZU_NON_COPYABLE(OGLShader); + SUYU_NON_COPYABLE(OGLShader); OGLShader() = default; @@ -143,7 +143,7 @@ public: class OGLProgram final { public: - YUZU_NON_COPYABLE(OGLProgram); + SUYU_NON_COPYABLE(OGLProgram); OGLProgram() = default; @@ -167,7 +167,7 @@ public: class OGLAssemblyProgram final { public: - YUZU_NON_COPYABLE(OGLAssemblyProgram); + SUYU_NON_COPYABLE(OGLAssemblyProgram); OGLAssemblyProgram() = default; @@ -191,7 +191,7 @@ public: class OGLPipeline final { public: - YUZU_NON_COPYABLE(OGLPipeline); + SUYU_NON_COPYABLE(OGLPipeline); OGLPipeline() = default; OGLPipeline(OGLPipeline&& o) noexcept : handle{std::exchange(o.handle, 0)} {} @@ -215,7 +215,7 @@ public: class OGLBuffer final { public: - YUZU_NON_COPYABLE(OGLBuffer); + SUYU_NON_COPYABLE(OGLBuffer); OGLBuffer() = default; @@ -242,7 +242,7 @@ public: class OGLSync final { public: - YUZU_NON_COPYABLE(OGLSync); + SUYU_NON_COPYABLE(OGLSync); OGLSync() = default; @@ -271,7 +271,7 @@ public: class OGLFramebuffer final { public: - YUZU_NON_COPYABLE(OGLFramebuffer); + SUYU_NON_COPYABLE(OGLFramebuffer); OGLFramebuffer() = default; @@ -298,7 +298,7 @@ public: class OGLQuery final { public: - YUZU_NON_COPYABLE(OGLQuery); + SUYU_NON_COPYABLE(OGLQuery); OGLQuery() = default; @@ -325,7 +325,7 @@ public: class OGLTransformFeedback final { public: - YUZU_NON_COPYABLE(OGLTransformFeedback); + SUYU_NON_COPYABLE(OGLTransformFeedback); OGLTransformFeedback() = default; diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp index b081fff6b6..a9dc70f9ce 100644 --- a/src/yuzu/loading_screen.cpp +++ b/src/yuzu/loading_screen.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #include @@ -19,7 +19,7 @@ // Mingw seems to not have QMovie at all. If QMovie is missing then use a single frame instead of an // showing the full animation -#if !YUZU_QT_MOVIE_MISSING +#if !SUYU_QT_MOVIE_MISSING #include #endif @@ -96,7 +96,7 @@ LoadingScreen::~LoadingScreen() = default; void LoadingScreen::Prepare(Loader::AppLoader& loader) { std::vector buffer; if (loader.ReadBanner(buffer) == Loader::ResultStatus::Success) { -#ifdef YUZU_QT_MOVIE_MISSING +#ifdef SUYU_QT_MOVIE_MISSING QPixmap map; map.loadFromData(buffer.data(), buffer.size()); ui->banner->setPixmap(map); @@ -194,7 +194,7 @@ void LoadingScreen::paintEvent(QPaintEvent* event) { } void LoadingScreen::Clear() { -#ifndef YUZU_QT_MOVIE_MISSING +#ifndef SUYU_QT_MOVIE_MISSING animation.reset(); backing_buf.reset(); backing_mem.reset(); diff --git a/src/yuzu/loading_screen.h b/src/yuzu/loading_screen.h index 17045595d3..ef12b59c39 100644 --- a/src/yuzu/loading_screen.h +++ b/src/yuzu/loading_screen.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project +// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -10,7 +10,7 @@ #include #if !QT_CONFIG(movie) -#define YUZU_QT_MOVIE_MISSING 1 +#define SUYU_QT_MOVIE_MISSING 1 #endif namespace Loader { @@ -64,7 +64,7 @@ signals: void Hidden(); private: -#ifndef YUZU_QT_MOVIE_MISSING +#ifndef SUYU_QT_MOVIE_MISSING std::unique_ptr animation; std::unique_ptr backing_buf; std::unique_ptr backing_mem; diff --git a/src/yuzu/play_time_manager.h b/src/yuzu/play_time_manager.h index 1714b91313..8a45386810 100644 --- a/src/yuzu/play_time_manager.h +++ b/src/yuzu/play_time_manager.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2023 yuzu Emulator Project +// SPDX-FileCopyrightText: 2023 yuzu Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -26,8 +26,8 @@ public: explicit PlayTimeManager(Service::Account::ProfileManager& profile_manager); ~PlayTimeManager(); - YUZU_NON_COPYABLE(PlayTimeManager); - YUZU_NON_MOVEABLE(PlayTimeManager); + SUYU_NON_COPYABLE(PlayTimeManager); + SUYU_NON_MOVEABLE(PlayTimeManager); u64 GetPlayTime(u64 program_id) const; void ResetProgramPlayTime(u64 program_id);