AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-15 09:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

CVirtualDirectory: Make use of size_t where applicable

Browse Source
This commit is contained in:
Lioncash 2020-07-05 10:31:43 -04:00
parent a8e51f86d7
commit 05df1fcf89
5 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/GameProject/CResourceStore.cpp
View File

@ -49,7 +49,7 @@ void RecursiveGetListOfEmptyDirectories(CVirtualDirectory *pDir, TStringList& rO
} }
else else
{ {
for (uint32 SubIdx = 0; SubIdx < pDir->NumSubdirectories(); SubIdx++) for (size_t SubIdx = 0; SubIdx < pDir->NumSubdirectories(); SubIdx++)
RecursiveGetListOfEmptyDirectories(pDir->SubdirectoryByIndex(SubIdx), rOutList); RecursiveGetListOfEmptyDirectories(pDir->SubdirectoryByIndex(SubIdx), rOutList);
} }
} }

12
src/Core/GameProject/CVirtualDirectory.h
View File

@ -52,12 +52,12 @@ public:
bool IsRoot() const { return !mpParent; } bool IsRoot() const { return !mpParent; }
TString Name() const { return mName; } TString Name() const { return mName; }
uint32 NumSubdirectories() const { return mSubdirectories.size(); } size_t NumSubdirectories() const { return mSubdirectories.size(); }
CVirtualDirectory* SubdirectoryByIndex(uint32 Index) { return mSubdirectories[Index]; } CVirtualDirectory* SubdirectoryByIndex(size_t Index) { return mSubdirectories[Index]; }
const CVirtualDirectory* SubdirectoryByIndex(uint32 Index) const { return mSubdirectories[Index]; } const CVirtualDirectory* SubdirectoryByIndex(size_t Index) const { return mSubdirectories[Index]; }
uint32 NumResources() const { return mResources.size(); } size_t NumResources() const { return mResources.size(); }
CResourceEntry* ResourceByIndex(uint32 Index) { return mResources[Index]; } CResourceEntry* ResourceByIndex(size_t Index) { return mResources[Index]; }
const CResourceEntry* ResourceByIndex(uint32 Index) const { return mResources[Index]; } const CResourceEntry* ResourceByIndex(size_t Index) const { return mResources[Index]; }
}; };
#endif // CVIRTUALDIRECTORY #endif // CVIRTUALDIRECTORY

12
src/Editor/ResourceBrowser/CResourceBrowser.cpp
View File

@ -700,14 +700,14 @@ bool CResourceBrowser::Delete(QVector<CResourceEntry*> Resources, QVector<CVirtu
for (int DirIdx = 0; DirIdx < Directories.size(); DirIdx++) for (int DirIdx = 0; DirIdx < Directories.size(); DirIdx++)
{ {
CVirtualDirectory* pDir = Directories[DirIdx]; CVirtualDirectory* pDir = Directories[DirIdx];
Resources.reserve( Resources.size() + pDir->NumResources() ); Resources.reserve(Resources.size() + static_cast<int>(pDir->NumResources()));
Directories.reserve( Directories.size() + pDir->NumSubdirectories() ); Directories.reserve(Directories.size() + static_cast<int>(pDir->NumSubdirectories()));
for (uint ResourceIdx = 0; ResourceIdx < pDir->NumResources(); ResourceIdx++) for (size_t ResourceIdx = 0; ResourceIdx < pDir->NumResources(); ResourceIdx++)
Resources << pDir->ResourceByIndex(ResourceIdx); Resources.push_back(pDir->ResourceByIndex(ResourceIdx));
for (uint SubdirIdx = 0; SubdirIdx < pDir->NumSubdirectories(); SubdirIdx++) for (size_t SubdirIdx = 0; SubdirIdx < pDir->NumSubdirectories(); SubdirIdx++)
Directories << pDir->SubdirectoryByIndex(SubdirIdx); Directories.push_back(pDir->SubdirectoryByIndex(SubdirIdx));
} }
// Exit if we have nothing to do. // Exit if we have nothing to do.

15
src/Editor/ResourceBrowser/CResourceTableModel.cpp
View File

@ -219,12 +219,12 @@ void CResourceTableModel::FillEntryList(CVirtualDirectory *pDir, bool AssetListM
if (!mIsAssetListMode) if (!mIsAssetListMode)
{ {
if (!pDir->IsRoot()) if (!pDir->IsRoot())
mDirectories << pDir->Parent(); mDirectories.push_back(pDir->Parent());
for (uint32 iDir = 0; iDir < pDir->NumSubdirectories(); iDir++) for (size_t iDir = 0; iDir < pDir->NumSubdirectories(); iDir++)
mDirectories << pDir->SubdirectoryByIndex(iDir); mDirectories.push_back(pDir->SubdirectoryByIndex(iDir));
for (uint32 iRes = 0; iRes < pDir->NumResources(); iRes++) for (size_t iRes = 0; iRes < pDir->NumResources(); iRes++)
{ {
CResourceEntry *pEntry = pDir->ResourceByIndex(iRes); CResourceEntry *pEntry = pDir->ResourceByIndex(iRes);
@ -235,10 +235,11 @@ void CResourceTableModel::FillEntryList(CVirtualDirectory *pDir, bool AssetListM
} }
} }
} }
// In asset list mode, do not show subdirectories and show all assets in current directory + all subdirectories. // In asset list mode, do not show subdirectories and show all assets in current directory + all subdirectories.
else else
{
RecursiveAddDirectoryContents(pDir); RecursiveAddDirectoryContents(pDir);
}
} }
if (pDir) if (pDir)
@ -262,7 +263,7 @@ void CResourceTableModel::DisplayEntryList(QList<CResourceEntry*>& rkEntries, co
void CResourceTableModel::RecursiveAddDirectoryContents(CVirtualDirectory *pDir) void CResourceTableModel::RecursiveAddDirectoryContents(CVirtualDirectory *pDir)
{ {
for (uint32 iRes = 0; iRes < pDir->NumResources(); iRes++) for (size_t iRes = 0; iRes < pDir->NumResources(); iRes++)
{ {
CResourceEntry *pEntry = pDir->ResourceByIndex(iRes); CResourceEntry *pEntry = pDir->ResourceByIndex(iRes);
@ -273,7 +274,7 @@ void CResourceTableModel::RecursiveAddDirectoryContents(CVirtualDirectory *pDir)
} }
} }
for (uint32 iDir = 0; iDir < pDir->NumSubdirectories(); iDir++) for (size_t iDir = 0; iDir < pDir->NumSubdirectories(); iDir++)
RecursiveAddDirectoryContents(pDir->SubdirectoryByIndex(iDir)); RecursiveAddDirectoryContents(pDir->SubdirectoryByIndex(iDir));
} }

25
src/Editor/ResourceBrowser/CVirtualDirectoryModel.cpp
View File

@ -22,10 +22,10 @@ QModelIndex CVirtualDirectoryModel::index(int Row, int Column, const QModelIndex
CVirtualDirectory *pDir = IndexDirectory(rkParent); CVirtualDirectory *pDir = IndexDirectory(rkParent);
if (pDir && pDir->NumSubdirectories() > (uint32) Row) if (pDir != nullptr && pDir->NumSubdirectories() > static_cast<uint32>(Row))
return createIndex(Row, Column, pDir->SubdirectoryByIndex(Row)); return createIndex(Row, Column, pDir->SubdirectoryByIndex(Row));
else if (!pDir) if (pDir == nullptr)
return createIndex(Row, Column, mpRoot); return createIndex(Row, Column, mpRoot);
return QModelIndex(); return QModelIndex();
@ -42,14 +42,16 @@ QModelIndex CVirtualDirectoryModel::parent(const QModelIndex& rkChild) const
if (pGrandparent) if (pGrandparent)
{ {
for (uint32 iSub = 0; iSub < pGrandparent->NumSubdirectories(); iSub++) for (size_t iSub = 0; iSub < pGrandparent->NumSubdirectories(); iSub++)
{ {
if (pGrandparent->SubdirectoryByIndex(iSub) == pParent) if (pGrandparent->SubdirectoryByIndex(iSub) == pParent)
return createIndex(iSub, 0, pParent); return createIndex(static_cast<int>(iSub), 0, pParent);
} }
} }
else
else return createIndex(0, 0, mpRoot); {
return createIndex(0, 0, mpRoot);
}
} }
return QModelIndex(); return QModelIndex();
@ -57,9 +59,10 @@ QModelIndex CVirtualDirectoryModel::parent(const QModelIndex& rkChild) const
int CVirtualDirectoryModel::rowCount(const QModelIndex& rkParent) const int CVirtualDirectoryModel::rowCount(const QModelIndex& rkParent) const
{ {
CVirtualDirectory *pDir = IndexDirectory(rkParent); if (const CVirtualDirectory* pDir = IndexDirectory(rkParent))
if (pDir) return pDir->NumSubdirectories(); return static_cast<int>(pDir->NumSubdirectories());
else return mpRoot ? 1 : 0;
return mpRoot ? 1 : 0;
} }
int CVirtualDirectoryModel::columnCount(const QModelIndex&) const int CVirtualDirectoryModel::columnCount(const QModelIndex&) const
@ -201,11 +204,11 @@ QModelIndex CVirtualDirectoryModel::GetIndexForDirectory(CVirtualDirectory *pDir
{ {
bool Found = false; bool Found = false;
for (uint32 iDir = 0; iDir < pParent->NumSubdirectories(); iDir++) for (size_t iDir = 0; iDir < pParent->NumSubdirectories(); iDir++)
{ {
if (pParent->SubdirectoryByIndex(iDir) == pDir) if (pParent->SubdirectoryByIndex(iDir) == pDir)
{ {
Indices.push_front(iDir); Indices.push_front(static_cast<int>(iDir));
pDir = pParent; pDir = pParent;
pParent = pParent->Parent(); pParent = pParent->Parent();
Found = true; Found = true;