From 5ce6b972a074798e6a7fa3b9399d617bebdfdd45 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 18 Jun 2020 05:34:56 -0400 Subject: [PATCH] CGameProject: Make use of size_t where applicable Plays nicely with standard containers. --- src/Core/GameProject/AssetNameGeneration.cpp | 4 ++-- src/Core/GameProject/CGameExporter.cpp | 4 ++-- src/Core/GameProject/CGameProject.h | 4 ++-- src/Core/GameProject/CResourceEntry.cpp | 2 +- src/Editor/CEditorApplication.cpp | 4 ++-- src/Editor/CProjectSettingsDialog.cpp | 17 +++++++++-------- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/Core/GameProject/AssetNameGeneration.cpp b/src/Core/GameProject/AssetNameGeneration.cpp index 897a469e..9d6a7229 100644 --- a/src/Core/GameProject/AssetNameGeneration.cpp +++ b/src/Core/GameProject/AssetNameGeneration.cpp @@ -109,11 +109,11 @@ void GenerateAssetNames(CGameProject *pProj) // Generate names for package named resources debugf("Processing packages"); - for (uint32 iPkg = 0; iPkg < pProj->NumPackages(); iPkg++) + for (size_t iPkg = 0; iPkg < pProj->NumPackages(); iPkg++) { CPackage *pPkg = pProj->PackageByIndex(iPkg); - for (uint32 iRes = 0; iRes < pPkg->NumNamedResources(); iRes++) + for (size_t iRes = 0; iRes < pPkg->NumNamedResources(); iRes++) { const SNamedResource& rkRes = pPkg->NamedResourceByIndex(iRes); if (rkRes.Name.EndsWith("NODEPEND")) continue; diff --git a/src/Core/GameProject/CGameExporter.cpp b/src/Core/GameProject/CGameExporter.cpp index 4fc7db54..1fc84327 100644 --- a/src/Core/GameProject/CGameExporter.cpp +++ b/src/Core/GameProject/CGameExporter.cpp @@ -669,11 +669,11 @@ TString CGameExporter::MakeWorldName(CAssetID WorldID) // Find the original world name in the package resource names TString WorldName; - for (uint32 iPkg = 0; iPkg < mpProject->NumPackages(); iPkg++) + for (size_t iPkg = 0; iPkg < mpProject->NumPackages(); iPkg++) { CPackage *pPkg = mpProject->PackageByIndex(iPkg); - for (uint32 iRes = 0; iRes < pPkg->NumNamedResources(); iRes++) + for (size_t iRes = 0; iRes < pPkg->NumNamedResources(); iRes++) { const SNamedResource& rkRes = pPkg->NamedResourceByIndex(iRes); diff --git a/src/Core/GameProject/CGameProject.h b/src/Core/GameProject/CGameProject.h index 97605333..97b7eefc 100644 --- a/src/Core/GameProject/CGameProject.h +++ b/src/Core/GameProject/CGameProject.h @@ -87,8 +87,8 @@ public: void SetProjectName(TString name) { mProjectName = std::move(name); } TString Name() const { return mProjectName; } - uint32 NumPackages() const { return mPackages.size(); } - CPackage* PackageByIndex(uint32 Index) const { return mPackages[Index].get(); } + size_t NumPackages() const { return mPackages.size(); } + CPackage* PackageByIndex(size_t Index) const { return mPackages[Index].get(); } void AddPackage(std::unique_ptr&& package) { mPackages.push_back(std::move(package)); } CResourceStore* ResourceStore() const { return mpResourceStore.get(); } CGameInfo* GameInfo() const { return mpGameInfo.get(); } diff --git a/src/Core/GameProject/CResourceEntry.cpp b/src/Core/GameProject/CResourceEntry.cpp index fceb69d4..f06c5eae 100644 --- a/src/Core/GameProject/CResourceEntry.cpp +++ b/src/Core/GameProject/CResourceEntry.cpp @@ -330,7 +330,7 @@ bool CResourceEntry::Save(bool SkipCacheSave /*= false*/, bool FlagForRecook /*= // Flag dirty any packages that contain this resource. if (FlagForRecook) { - for (uint32 iPkg = 0; iPkg < mpStore->Project()->NumPackages(); iPkg++) + for (size_t iPkg = 0; iPkg < mpStore->Project()->NumPackages(); iPkg++) { CPackage *pPkg = mpStore->Project()->PackageByIndex(iPkg); diff --git a/src/Editor/CEditorApplication.cpp b/src/Editor/CEditorApplication.cpp index bb84cca0..b8bcee32 100644 --- a/src/Editor/CEditorApplication.cpp +++ b/src/Editor/CEditorApplication.cpp @@ -216,7 +216,7 @@ bool CEditorApplication::CookAllDirtyPackages() ASSERT(mpActiveProject != nullptr); QList PackageList; - for (uint32 iPkg = 0; iPkg < mpActiveProject->NumPackages(); iPkg++) + for (size_t iPkg = 0; iPkg < mpActiveProject->NumPackages(); iPkg++) { CPackage *pPackage = mpActiveProject->PackageByIndex(iPkg); @@ -258,7 +258,7 @@ bool CEditorApplication::HasAnyDirtyPackages() if (!mpActiveProject) return false; - for (uint32 PkgIdx = 0; PkgIdx < mpActiveProject->NumPackages(); PkgIdx++) + for (size_t PkgIdx = 0; PkgIdx < mpActiveProject->NumPackages(); PkgIdx++) { CPackage *pPackage = mpActiveProject->PackageByIndex(PkgIdx); diff --git a/src/Editor/CProjectSettingsDialog.cpp b/src/Editor/CProjectSettingsDialog.cpp index beea5da8..8b3d52fa 100644 --- a/src/Editor/CProjectSettingsDialog.cpp +++ b/src/Editor/CProjectSettingsDialog.cpp @@ -102,26 +102,27 @@ void CProjectSettingsDialog::SetupPackagesList() mpUI->PackagesList->clear(); if (!mpProject) return; - for (uint32 iPkg = 0; iPkg < mpProject->NumPackages(); iPkg++) + for (size_t iPkg = 0; iPkg < mpProject->NumPackages(); iPkg++) { CPackage *pPackage = mpProject->PackageByIndex(iPkg); ASSERT(pPackage != nullptr); QString PackageName = TO_QSTRING(pPackage->Name()); - if (pPackage->NeedsRecook()) PackageName += '*'; + if (pPackage->NeedsRecook()) + PackageName += '*'; mpUI->PackagesList->addItem(PackageName); } } void CProjectSettingsDialog::CookPackage() { - uint32 PackageIdx = mpUI->PackagesList->currentRow(); + const auto PackageIdx = static_cast(mpUI->PackagesList->currentRow()); - if (PackageIdx != -1) - { - CPackage *pPackage = mpProject->PackageByIndex(PackageIdx); - gpEdApp->CookPackage(pPackage); - } + if (PackageIdx == UINT32_MAX) + return; + + CPackage *pPackage = mpProject->PackageByIndex(PackageIdx); + gpEdApp->CookPackage(pPackage); } void CProjectSettingsDialog::CookAllDirtyPackages()