From ead22d13ff3a3dfb52e76cce51c44c142785d988 Mon Sep 17 00:00:00 2001 From: yyc12345 Date: Sat, 28 Dec 2024 22:09:26 +0800 Subject: [PATCH] fix: remove useless void in function parameter list - according to c++ standard, single void in function parameter is equal to empty parameter list. for removing this syntax which may cause misunderstanding (becuase in C, they are different I guess), I replace all `(void)` to `()`. --- LibCmo/CK2/CKFile.hpp | 6 +++--- LibCmo/CK2/CKStateChunk.hpp | 6 +++--- LibCmo/CK2/CKStateChunkReader.cpp | 6 +++--- LibCmo/CK2/CKStateChunkWriter.cpp | 2 +- LibCmo/CK2/ObjImpls/CK3dEntity.hpp | 2 +- LibCmo/CK2/ObjImpls/CK3dObject.hpp | 2 +- LibCmo/CK2/ObjImpls/CKBeObject.hpp | 2 +- LibCmo/CK2/ObjImpls/CKCamera.hpp | 2 +- LibCmo/CK2/ObjImpls/CKGroup.hpp | 2 +- LibCmo/CK2/ObjImpls/CKLight.hpp | 2 +- LibCmo/CK2/ObjImpls/CKMaterial.hpp | 2 +- LibCmo/CK2/ObjImpls/CKMesh.hpp | 2 +- LibCmo/CK2/ObjImpls/CKObject.cpp | 6 +++--- LibCmo/CK2/ObjImpls/CKObject.hpp | 8 ++++---- LibCmo/CK2/ObjImpls/CKRenderObject.hpp | 2 +- LibCmo/CK2/ObjImpls/CKSceneObject.hpp | 2 +- LibCmo/CK2/ObjImpls/CKTargetCamera.hpp | 2 +- LibCmo/CK2/ObjImpls/CKTargetLight.hpp | 2 +- LibCmo/CK2/ObjImpls/CKTexture.hpp | 2 +- LibCmo/VxMath/VxMemoryMappedFile.cpp | 2 +- 20 files changed, 31 insertions(+), 31 deletions(-) diff --git a/LibCmo/CK2/CKFile.hpp b/LibCmo/CK2/CKFile.hpp index 489da8e..7d1b15e 100644 --- a/LibCmo/CK2/CKFile.hpp +++ b/LibCmo/CK2/CKFile.hpp @@ -44,9 +44,9 @@ namespace LibCmo::CK2 { const void* GetPtr(CKINT extraoff = 0) { return (this->m_MemBegin + m_MemPos + extraoff); } void* GetMutablePtr(CKINT extraoff = 0) { return (this->m_MemBegin + m_MemPos + extraoff); } - void* GetBase(void) { return this->m_MemBegin; } - CKDWORD GetSize(void) { return this->m_MemSize; } - CKDWORD GetCursor(void) { return this->m_MemPos; } + void* GetBase() { return this->m_MemBegin; } + CKDWORD GetSize() { return this->m_MemSize; } + CKDWORD GetCursor() { return this->m_MemPos; } void MoveCursor(CKINT off) { this->m_MemPos += off; } void SetCursor(CKDWORD off) { this->m_MemPos = off; } void Read(void* data, CKDWORD data_size) { diff --git a/LibCmo/CK2/CKStateChunk.hpp b/LibCmo/CK2/CKStateChunk.hpp index 8b037ac..fb397f8 100644 --- a/LibCmo/CK2/CKStateChunk.hpp +++ b/LibCmo/CK2/CKStateChunk.hpp @@ -265,8 +265,8 @@ namespace LibCmo::CK2 { #pragma region Read Function public: - void StartRead(void); - void StopRead(void); + void StartRead(); + void StopRead(); /* ========== Identifier Functions ==========*/ @@ -556,7 +556,7 @@ namespace LibCmo::CK2 { /* * Actually this function mix various functions, including CloseChunk(), UpdateSize() and etc. */ - void StopWrite(void); + void StopWrite(); /* ========== Identifier Functions ==========*/ diff --git a/LibCmo/CK2/CKStateChunkReader.cpp b/LibCmo/CK2/CKStateChunkReader.cpp index 6ef9fd8..323bcf3 100644 --- a/LibCmo/CK2/CKStateChunkReader.cpp +++ b/LibCmo/CK2/CKStateChunkReader.cpp @@ -4,7 +4,7 @@ namespace LibCmo::CK2 { - void CKStateChunk::StartRead(void) { + void CKStateChunk::StartRead() { if (this->m_Parser.m_Status != CKStateChunkStatus::IDLE) return; this->m_Parser.m_CurrentPos = 0u; @@ -13,7 +13,7 @@ namespace LibCmo::CK2 { this->m_Parser.m_Status = CKStateChunkStatus::READ; } - void CKStateChunk::StopRead(void) { + void CKStateChunk::StopRead() { if (this->m_Parser.m_Status != CKStateChunkStatus::READ) return; this->m_Parser.m_CurrentPos = 0u; @@ -220,7 +220,7 @@ namespace LibCmo::CK2 { return true; } - //CKStateChunk* CKStateChunk::ReadSubChunk(void) { + //CKStateChunk* CKStateChunk::ReadSubChunk() { // CKStateChunk* subchunk = nullptr; // // get size and do a enough space check diff --git a/LibCmo/CK2/CKStateChunkWriter.cpp b/LibCmo/CK2/CKStateChunkWriter.cpp index b4478e0..be9e85c 100644 --- a/LibCmo/CK2/CKStateChunkWriter.cpp +++ b/LibCmo/CK2/CKStateChunkWriter.cpp @@ -32,7 +32,7 @@ namespace LibCmo::CK2 { this->m_Parser.m_Status = CKStateChunkStatus::WRITE; } - void CKStateChunk::StopWrite(void) { + void CKStateChunk::StopWrite() { if (this->m_Parser.m_Status != CKStateChunkStatus::WRITE) return; // update buffer size diff --git a/LibCmo/CK2/ObjImpls/CK3dEntity.hpp b/LibCmo/CK2/ObjImpls/CK3dEntity.hpp index a15e17a..f356ca4 100644 --- a/LibCmo/CK2/ObjImpls/CK3dEntity.hpp +++ b/LibCmo/CK2/ObjImpls/CK3dEntity.hpp @@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CK3dEntity(); YYCC_DEL_CLS_COPY_MOVE(CK3dEntity); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_3DENTITY; } diff --git a/LibCmo/CK2/ObjImpls/CK3dObject.hpp b/LibCmo/CK2/ObjImpls/CK3dObject.hpp index 6446664..0a399bf 100644 --- a/LibCmo/CK2/ObjImpls/CK3dObject.hpp +++ b/LibCmo/CK2/ObjImpls/CK3dObject.hpp @@ -13,7 +13,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CK3dObject() {} YYCC_DEL_CLS_COPY_MOVE(CK3dObject); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_3DOBJECT; } // CK3dObject do not implement any load/save functions diff --git a/LibCmo/CK2/ObjImpls/CKBeObject.hpp b/LibCmo/CK2/ObjImpls/CKBeObject.hpp index 7cc91cb..cfefd57 100644 --- a/LibCmo/CK2/ObjImpls/CKBeObject.hpp +++ b/LibCmo/CK2/ObjImpls/CKBeObject.hpp @@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKBeObject(); YYCC_DEL_CLS_COPY_MOVE(CKBeObject); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_BEOBJECT; } diff --git a/LibCmo/CK2/ObjImpls/CKCamera.hpp b/LibCmo/CK2/ObjImpls/CKCamera.hpp index 747d368..8b555b0 100644 --- a/LibCmo/CK2/ObjImpls/CKCamera.hpp +++ b/LibCmo/CK2/ObjImpls/CKCamera.hpp @@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKCamera(); YYCC_DEL_CLS_COPY_MOVE(CKCamera); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_CAMERA; } diff --git a/LibCmo/CK2/ObjImpls/CKGroup.hpp b/LibCmo/CK2/ObjImpls/CKGroup.hpp index 62cbac4..f10848f 100644 --- a/LibCmo/CK2/ObjImpls/CKGroup.hpp +++ b/LibCmo/CK2/ObjImpls/CKGroup.hpp @@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKGroup(); YYCC_DEL_CLS_COPY_MOVE(CKGroup); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_GROUP; } diff --git a/LibCmo/CK2/ObjImpls/CKLight.hpp b/LibCmo/CK2/ObjImpls/CKLight.hpp index 7a887b3..3240841 100644 --- a/LibCmo/CK2/ObjImpls/CKLight.hpp +++ b/LibCmo/CK2/ObjImpls/CKLight.hpp @@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKLight(); YYCC_DEL_CLS_COPY_MOVE(CKLight); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_LIGHT; } diff --git a/LibCmo/CK2/ObjImpls/CKMaterial.hpp b/LibCmo/CK2/ObjImpls/CKMaterial.hpp index 9bb7528..b052a4c 100644 --- a/LibCmo/CK2/ObjImpls/CKMaterial.hpp +++ b/LibCmo/CK2/ObjImpls/CKMaterial.hpp @@ -12,7 +12,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKMaterial(); YYCC_DEL_CLS_COPY_MOVE(CKMaterial); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_MATERIAL; } diff --git a/LibCmo/CK2/ObjImpls/CKMesh.hpp b/LibCmo/CK2/ObjImpls/CKMesh.hpp index 0aa48dd..a85c3d5 100644 --- a/LibCmo/CK2/ObjImpls/CKMesh.hpp +++ b/LibCmo/CK2/ObjImpls/CKMesh.hpp @@ -21,7 +21,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKMesh(); YYCC_DEL_CLS_COPY_MOVE(CKMesh); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_MESH; } diff --git a/LibCmo/CK2/ObjImpls/CKObject.cpp b/LibCmo/CK2/ObjImpls/CKObject.cpp index 5373779..6a8a200 100644 --- a/LibCmo/CK2/ObjImpls/CKObject.cpp +++ b/LibCmo/CK2/ObjImpls/CKObject.cpp @@ -16,16 +16,16 @@ namespace LibCmo::CK2::ObjImpls { #pragma region Non-virtual Functions - CK_ID CKObject::GetID(void) const { + CK_ID CKObject::GetID() const { return m_ID; } - CKSTRING CKObject::GetName(void) const { + CKSTRING CKObject::GetName() const { return XContainer::NSXString::ToCKSTRING(m_Name); } void CKObject::SetName(CKSTRING u8_name) { XContainer::NSXString::FromCKSTRING(m_Name, u8_name); } - CK_OBJECT_FLAGS CKObject::GetObjectFlags(void) const { + CK_OBJECT_FLAGS CKObject::GetObjectFlags() const { return m_ObjectFlags; } void CKObject::SetObjectFlags(CK_OBJECT_FLAGS flags) { diff --git a/LibCmo/CK2/ObjImpls/CKObject.hpp b/LibCmo/CK2/ObjImpls/CKObject.hpp index d1454e0..6698d64 100644 --- a/LibCmo/CK2/ObjImpls/CKObject.hpp +++ b/LibCmo/CK2/ObjImpls/CKObject.hpp @@ -42,15 +42,15 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKObject(); YYCC_DEL_CLS_COPY_MOVE(CKObject); - CK_ID GetID(void) const; - CKSTRING GetName(void) const; + CK_ID GetID() const; + CKSTRING GetName() const; void SetName(CKSTRING u8_name); - CK_OBJECT_FLAGS GetObjectFlags(void) const; + CK_OBJECT_FLAGS GetObjectFlags() const; void SetObjectFlags(CK_OBJECT_FLAGS flags); bool IsToBeDeleted() const; CKContext* GetCKContext() const; - virtual CK_CLASSID GetClassID(void) { + virtual CK_CLASSID GetClassID() { return CK_CLASSID::CKCID_OBJECT; } diff --git a/LibCmo/CK2/ObjImpls/CKRenderObject.hpp b/LibCmo/CK2/ObjImpls/CKRenderObject.hpp index cf475e4..ab6919d 100644 --- a/LibCmo/CK2/ObjImpls/CKRenderObject.hpp +++ b/LibCmo/CK2/ObjImpls/CKRenderObject.hpp @@ -13,7 +13,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKRenderObject() {} YYCC_DEL_CLS_COPY_MOVE(CKRenderObject); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_RENDEROBJECT; } diff --git a/LibCmo/CK2/ObjImpls/CKSceneObject.hpp b/LibCmo/CK2/ObjImpls/CKSceneObject.hpp index 989ab0a..6d780fd 100644 --- a/LibCmo/CK2/ObjImpls/CKSceneObject.hpp +++ b/LibCmo/CK2/ObjImpls/CKSceneObject.hpp @@ -13,7 +13,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKSceneObject() {} YYCC_DEL_CLS_COPY_MOVE(CKSceneObject); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_SCENEOBJECT; } // CKSceneObject do not override any RW functions. diff --git a/LibCmo/CK2/ObjImpls/CKTargetCamera.hpp b/LibCmo/CK2/ObjImpls/CKTargetCamera.hpp index 6bdb72b..31dd0e8 100644 --- a/LibCmo/CK2/ObjImpls/CKTargetCamera.hpp +++ b/LibCmo/CK2/ObjImpls/CKTargetCamera.hpp @@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKTargetCamera(); YYCC_DEL_CLS_COPY_MOVE(CKTargetCamera); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_TARGETCAMERA; } diff --git a/LibCmo/CK2/ObjImpls/CKTargetLight.hpp b/LibCmo/CK2/ObjImpls/CKTargetLight.hpp index 72ef4ce..6f88f0a 100644 --- a/LibCmo/CK2/ObjImpls/CKTargetLight.hpp +++ b/LibCmo/CK2/ObjImpls/CKTargetLight.hpp @@ -11,7 +11,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKTargetLight(); YYCC_DEL_CLS_COPY_MOVE(CKTargetLight); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_TARGETLIGHT; } diff --git a/LibCmo/CK2/ObjImpls/CKTexture.hpp b/LibCmo/CK2/ObjImpls/CKTexture.hpp index c83dd50..5e58524 100644 --- a/LibCmo/CK2/ObjImpls/CKTexture.hpp +++ b/LibCmo/CK2/ObjImpls/CKTexture.hpp @@ -12,7 +12,7 @@ namespace LibCmo::CK2::ObjImpls { virtual ~CKTexture(); YYCC_DEL_CLS_COPY_MOVE(CKTexture); - virtual CK_CLASSID GetClassID(void) override { + virtual CK_CLASSID GetClassID() override { return CK_CLASSID::CKCID_TEXTURE; } diff --git a/LibCmo/VxMath/VxMemoryMappedFile.cpp b/LibCmo/VxMath/VxMemoryMappedFile.cpp index 8049efa..95ed02f 100644 --- a/LibCmo/VxMath/VxMemoryMappedFile.cpp +++ b/LibCmo/VxMath/VxMemoryMappedFile.cpp @@ -128,7 +128,7 @@ namespace LibCmo::VxMath { this->m_bIsValid = true; } - VxMemoryMappedFile::~VxMemoryMappedFile(void) { + VxMemoryMappedFile::~VxMemoryMappedFile() { if (this->m_bIsValid) { // only success mapping need free this->m_bIsValid = false;