AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-01 10:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

CEnumProperty: Make use of size_t where applicable

Browse Source
This commit is contained in:
Lioncash 2020-06-22 23:14:58 -04:00
parent d3be84ae23
commit a25430eec3
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Core/Resource/Script/Property/CEnumProperty.h
View File

@ -108,10 +108,10 @@ public:
void AddValue(TString ValueName, uint32 ValueID) void AddValue(TString ValueName, uint32 ValueID)
{ {
mValues.push_back( SEnumValue(ValueName, ValueID) ); mValues.emplace_back(std::move(ValueName), ValueID);
} }
uint32 NumPossibleValues() const { return mValues.size(); } size_t NumPossibleValues() const { return mValues.size(); }
uint32 ValueIndex(uint32 ID) const uint32 ValueIndex(uint32 ID) const
{ {
@ -122,27 +122,29 @@ public:
return ValueIdx; return ValueIdx;
} }
} }
return -1; return UINT32_MAX;
} }
uint32 ValueID(uint32 Index) const uint32 ValueID(size_t Index) const
{ {
ASSERT(Index >= 0 && Index < mValues.size()); ASSERT(Index < mValues.size());
return mValues[Index].ID; return mValues[Index].ID;
} }
TString ValueName(uint32 Index) const TString ValueName(size_t Index) const
{ {
ASSERT(Index >= 0 && Index < mValues.size()); ASSERT(Index < mValues.size());
return mValues[Index].Name; return mValues[Index].Name;
} }
bool HasValidValue(void* pPropertyData) bool HasValidValue(void* pPropertyData)
{ {
if (mValues.empty()) return true; if (mValues.empty())
int ID = base::ValueRef(pPropertyData); return true;
uint32 Index = ValueIndex(ID);
return Index >= 0 && Index < mValues.size(); const int ID = base::ValueRef(pPropertyData);
const uint32 Index = ValueIndex(ID);
return Index < mValues.size();
} }
bool OverridesTypeName() const bool OverridesTypeName() const

2
src/Editor/PropertyEdit/CPropertyDelegate.cpp
View File

@ -132,7 +132,7 @@ QWidget* CPropertyDelegate::createEditor(QWidget* pParent, const QStyleOptionVie
QComboBox *pComboBox = new QComboBox(pParent); QComboBox *pComboBox = new QComboBox(pParent);
CEnumProperty* pEnum = TPropCast<CEnumProperty>(pProp); CEnumProperty* pEnum = TPropCast<CEnumProperty>(pProp);
for (uint32 ValueIdx = 0; ValueIdx < pEnum->NumPossibleValues(); ValueIdx++) for (size_t ValueIdx = 0; ValueIdx < pEnum->NumPossibleValues(); ValueIdx++)
pComboBox->addItem(TO_QSTRING(pEnum->ValueName(ValueIdx))); pComboBox->addItem(TO_QSTRING(pEnum->ValueName(ValueIdx)));
CONNECT_RELAY(pComboBox, rkIndex, currentIndexChanged(int)) CONNECT_RELAY(pComboBox, rkIndex, currentIndexChanged(int))