mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-17 00:53:50 +00:00
Remove AUTO_VAR macro and _toString function (#592)
This commit is contained in:
parent
7d6658fe5b
commit
55231bb8d3
294 changed files with 5067 additions and 5773 deletions
|
|
@ -120,9 +120,8 @@ bool StitchSlot::add(TextureHolder *textureHolder)
|
|||
}
|
||||
|
||||
//for (final StitchSlot subSlot : subSlots)
|
||||
for(AUTO_VAR(it, subSlots->begin()); it != subSlots->end(); ++it)
|
||||
for ( StitchSlot *subSlot : *subSlots )
|
||||
{
|
||||
StitchSlot *subSlot = *it;
|
||||
if (subSlot->add(textureHolder))
|
||||
{
|
||||
return true;
|
||||
|
|
@ -134,23 +133,15 @@ bool StitchSlot::add(TextureHolder *textureHolder)
|
|||
|
||||
void StitchSlot::collectAssignments(vector<StitchSlot *> *result)
|
||||
{
|
||||
if (textureHolder != NULL)
|
||||
if (textureHolder)
|
||||
{
|
||||
result->push_back(this);
|
||||
}
|
||||
else if (subSlots != NULL)
|
||||
else if (subSlots)
|
||||
{
|
||||
//for (StitchSlot subSlot : subSlots)
|
||||
for(AUTO_VAR(it, subSlots->begin()); it != subSlots->end(); ++it)
|
||||
for(StitchSlot *subSlot : *subSlots)
|
||||
{
|
||||
StitchSlot *subSlot = *it;
|
||||
subSlot->collectAssignments(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//@Override
|
||||
wstring StitchSlot::toString()
|
||||
{
|
||||
return L"Slot{originX=" + _toString(originX) + L", originY=" + _toString(originY) + L", width=" + _toString(width) + L", height=" + _toString(height) + L", texture=" + _toString(textureHolder) + L", subSlots=" + _toString(subSlots) + L'}';
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue