Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 18:27:21 -05:00
parent 1c627317ec
commit 09f4528bfb
122 changed files with 883 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
indra/newview/llinventorymodel.cpp
View File

@@ -122,7 +122,7 @@ bool LLCanCache::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
S32 descendents_actual = 0;
if(cats && items)
{
descendents_actual = cats->count() + items->count();
descendents_actual = cats->size() + items->size();
}
if(descendents_server == descendents_actual)
{
@@ -486,12 +486,12 @@ const LLUUID LLInventoryModel::findCategoryUUIDForType(LLFolderType::EType prefe
cats = get_ptr_in_map(mParentChildCategoryTree, root_id);
if(cats)
{
S32 count = cats->count();
S32 count = cats->size();
for(S32 i = 0; i < count; ++i)
{
if (cats->get(i)->getPreferredType() == preferred_type)
if(cats->at(i)->getPreferredType() == preferred_type)
{
rv = cats->get(i)->getUUID();
rv = cats->at(i)->getUUID();
break;
}
}
@@ -517,12 +517,12 @@ LLUUID LLInventoryModel::findCategoryByName(std::string name)
cats = get_ptr_in_map(mParentChildCategoryTree, root_id);
if(cats)
{
S32 count = cats->count();
S32 count = cats->size();
for(S32 i = 0; i < count; ++i)
{
if(cats->get(i)->getName() == name)
if(cats->at(i)->getName() == name)
{
return cats->get(i)->getUUID();
return cats->at(i)->getUUID();
}
}
}
@@ -715,13 +715,13 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
cat_array_t* cat_array = get_ptr_in_map(mParentChildCategoryTree, id);
if(cat_array)
{
S32 count = cat_array->count();
S32 count = cat_array->size();
for(S32 i = 0; i < count; ++i)
{
LLViewerInventoryCategory* cat = cat_array->get(i);
LLViewerInventoryCategory* cat = cat_array->at(i);
if(add(cat,NULL))
{
cats.put(cat);
cats.push_back(cat);
}
collectDescendentsIf(cat->getUUID(), cats, items, include_trash, add);
}
@@ -733,13 +733,13 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
// Move onto items
if(item_array)
{
S32 count = item_array->count();
S32 count = item_array->size();
for(S32 i = 0; i < count; ++i)
{
item = item_array->get(i);
item = item_array->at(i);
if(add(NULL, item))
{
items.put(item);
items.push_back(item);
}
}
}
@@ -757,10 +757,10 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
// Note: if making it fully recursive, need more checking against infinite loops.
if (follow_folder_links && item_array)
{
S32 count = item_array->count();
S32 count = item_array->size();
for(S32 i = 0; i < count; ++i)
{
item = item_array->get(i);
item = item_array->at(i);
if (item && item->getActualType() == LLAssetType::AT_LINK_FOLDER)
{
LLViewerInventoryCategory *linked_cat = item->getLinkedCategory();
@@ -774,7 +774,7 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
// BAP should this be added here? May not
// matter if it's only being used in current
// outfit traversal.
cats.put(LLPointer<LLViewerInventoryCategory>(linked_cat));
cats.push_back(LLPointer<LLViewerInventoryCategory>(linked_cat));
}
collectDescendentsIf(linked_cat->getUUID(), cats, items, include_trash, add, FALSE);
}
@@ -901,12 +901,12 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item)
item_array = get_ptr_in_map(mParentChildItemTree, old_parent_id);
if(item_array)
{
item_array->removeObj(old_item);
vector_replace_with_last(*item_array, old_item);
}
item_array = get_ptr_in_map(mParentChildItemTree, new_parent_id);
if(item_array)
{
item_array->put(old_item);
item_array->push_back(old_item);
}
mask |= LLInventoryObserver::STRUCTURE;
}
@@ -936,7 +936,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item)
{
// *FIX: bit of a hack to call update server from here...
new_item->updateServer(TRUE);
item_array->put(new_item);
item_array->push_back(new_item);
}
else
{
@@ -964,7 +964,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item)
item_array_t* item_array = get_ptr_in_map(mParentChildItemTree, parent_id);
if(item_array)
{
item_array->put(new_item);
item_array->push_back(new_item);
}
else
{
@@ -979,7 +979,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item)
// *FIX: bit of a hack to call update server from
// here...
new_item->updateServer(TRUE);
item_array->put(new_item);
item_array->push_back(new_item);
}
else
{
@@ -1061,7 +1061,7 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat)
return;
}
LLViewerInventoryCategory* old_cat = getCategory(cat->getUUID());
LLPointer<LLViewerInventoryCategory> old_cat = getCategory(cat->getUUID());
if(old_cat)
{
// We already have an old category, modify it's values
@@ -1075,12 +1075,12 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat)
cat_array = getUnlockedCatArray(old_parent_id);
if(cat_array)
{
cat_array->removeObj(old_cat);
vector_replace_with_last(*cat_array, old_cat);
}
cat_array = getUnlockedCatArray(new_parent_id);
if(cat_array)
{
cat_array->put(old_cat);
cat_array->push_back(old_cat);
}
mask |= LLInventoryObserver::STRUCTURE;
}
@@ -1103,7 +1103,7 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat)
cat_array = getUnlockedCatArray(cat->getParentUUID());
if(cat_array)
{
cat_array->put(new_cat);
cat_array->push_back(new_cat);
}
// make space in the tree for this category's children.
@@ -1132,27 +1132,27 @@ void LLInventoryModel::moveObject(const LLUUID& object_id, const LLUUID& cat_id)
<< cat_id << LL_ENDL;
return;
}
LLViewerInventoryCategory* cat = getCategory(object_id);
LLPointer<LLViewerInventoryCategory> cat = getCategory(object_id);
if(cat && (cat->getParentUUID() != cat_id))
{
cat_array_t* cat_array;
cat_array = getUnlockedCatArray(cat->getParentUUID());
if(cat_array) cat_array->removeObj(cat);
if(cat_array) vector_replace_with_last(*cat_array, cat);
cat_array = getUnlockedCatArray(cat_id);
cat->setParent(cat_id);
if(cat_array) cat_array->put(cat);
if(cat_array) cat_array->push_back(cat);
addChangedMask(LLInventoryObserver::STRUCTURE, object_id);
return;
}
LLViewerInventoryItem* item = getItem(object_id);
LLPointer<LLViewerInventoryItem> item = getItem(object_id);
if(item && (item->getParentUUID() != cat_id))
{
item_array_t* item_array;
item_array = getUnlockedItemArray(item->getParentUUID());
if(item_array) item_array->removeObj(item);
if(item_array) vector_replace_with_last(*item_array, item);
item_array = getUnlockedItemArray(cat_id);
item->setParent(cat_id);
if(item_array) item_array->put(item);
if(item_array) item_array->push_back(item);
addChangedMask(LLInventoryObserver::STRUCTURE, object_id);
return;
}
@@ -1242,13 +1242,13 @@ void LLInventoryModel::deleteObject(const LLUUID& id)
if(item_list)
{
LLViewerInventoryItem* item = (LLViewerInventoryItem*)((LLInventoryObject*)obj);
item_list->removeObj(item);
vector_replace_with_last(*item_list, item);
}
cat_array_t* cat_list = getUnlockedCatArray(parent_id);
if(cat_list)
{
LLViewerInventoryCategory* cat = (LLViewerInventoryCategory*)((LLInventoryObject*)obj);
cat_list->removeObj(cat);
vector_replace_with_last(*cat_list, cat);
}
item_list = getUnlockedItemArray(id);
if(item_list)
@@ -1374,16 +1374,16 @@ void LLInventoryModel::purgeDescendentsOf(const LLUUID& id)
categories,
items,
INCLUDE_TRASH);
S32 count = items.count();
S32 count = items.size();
for(S32 i = 0; i < count; ++i)
{
deleteObject(items.get(i)->getUUID());
deleteObject(items.at(i)->getUUID());
}
count = categories.count();
count = categories.size();
for(S32 i = 0; i < count; ++i)
{
deleteObject(categories.get(i)->getUUID());
deleteObject(categories.at(i)->getUUID());
}
}
}
@@ -1574,7 +1574,7 @@ void LLInventoryModel::cache(
LLViewerInventoryCategory* root_cat = getCategory(parent_folder_id);
if(!root_cat) return;
cat_array_t categories;
categories.put(root_cat);
categories.push_back(root_cat);
item_array_t items;
LLCanCache can_cache(this);
@@ -1687,7 +1687,7 @@ void LLInventoryModel::accountForUpdate(const LLCategoryUpdate& update) const
S32 descendents_actual = 0;
if(cats && items)
{
descendents_actual = cats->count() + items->count();
descendents_actual = cats->size() + items->size();
}
if(descendents_server == descendents_actual)
{
@@ -1802,12 +1802,12 @@ LLInventoryModel::EHasChildren LLInventoryModel::categoryHasChildren(
// Shouldn't have to run this, but who knows.
parent_cat_map_t::const_iterator cat_it = mParentChildCategoryTree.find(cat->getUUID());
if (cat_it != mParentChildCategoryTree.end() && cat_it->second->count() > 0)
if (cat_it != mParentChildCategoryTree.end() && cat_it->second->size() > 0)
{
return CHILDREN_YES;
}
parent_item_map_t::const_iterator item_it = mParentChildItemTree.find(cat->getUUID());
if (item_it != mParentChildItemTree.end() && item_it->second->count() > 0)
if (item_it != mParentChildItemTree.end() && item_it->second->size() > 0)
{
return CHILDREN_YES;
}
@@ -1827,7 +1827,7 @@ bool LLInventoryModel::isCategoryComplete(const LLUUID& cat_id) const
S32 descendents_actual = 0;
if(cats && items)
{
descendents_actual = cats->count() + items->count();
descendents_actual = cats->size() + items->size();
}
if(descendents_server == descendents_actual)
{
@@ -1926,7 +1926,7 @@ bool LLInventoryModel::loadSkeleton(
// found to generate a set of categories we should add. We
// will go through each category loaded and if the version
// does not match, invalidate the version.
S32 count = categories.count();
S32 count = categories.size();
cat_set_t::iterator not_cached = temp_cats.end();
std::set<LLUUID> cached_ids;
for (S32 i = 0; i < count; ++i)
@@ -2135,7 +2135,7 @@ void LLInventoryModel::buildParentChildMap()
for(cat_map_t::iterator cit = mCategoryMap.begin(); cit != mCategoryMap.end(); ++cit)
{
LLViewerInventoryCategory* cat = cit->second;
cats.put(cat);
cats.push_back(cat);
if (mParentChildCategoryTree.count(cat->getUUID()) == 0)
{
llassert_always(mCategoryLock[cat->getUUID()] == false);
@@ -2163,16 +2163,16 @@ void LLInventoryModel::buildParentChildMap()
// Now we have a structure with all of the categories that we can
// iterate over and insert into the correct place in the child
// category tree.
S32 count = cats.count();
S32 count = cats.size();
S32 i;
S32 lost = 0;
for(i = 0; i < count; ++i)
{
LLViewerInventoryCategory* cat = cats.get(i);
LLViewerInventoryCategory* cat = cats.at(i);
catsp = getUnlockedCatArray(cat->getParentUUID());
if(catsp)
{
catsp->put(cat);
catsp->push_back(cat);
}
else
{
@@ -2205,7 +2205,7 @@ void LLInventoryModel::buildParentChildMap()
catsp = getUnlockedCatArray(cat->getParentUUID());
if(catsp)
{
catsp->put(cat);
catsp->push_back(cat);
}
else
{
@@ -2232,20 +2232,20 @@ void LLInventoryModel::buildParentChildMap()
for(item_map_t::iterator iit = mItemMap.begin(); iit != mItemMap.end(); ++iit)
{
item = (*iit).second;
items.put(item);
items.push_back(item);
}
}
count = items.count();
count = items.size();
lost = 0;
uuid_vec_t lost_item_ids;
for(i = 0; i < count; ++i)
{
LLPointer<LLViewerInventoryItem> item;
item = items.get(i);
item = items.at(i);
itemsp = getUnlockedItemArray(item->getParentUUID());
if(itemsp)
{
itemsp->put(item);
itemsp->push_back(item);
}
else
{
@@ -2262,7 +2262,7 @@ void LLInventoryModel::buildParentChildMap()
itemsp = getUnlockedItemArray(item->getParentUUID());
if(itemsp)
{
itemsp->put(item);
itemsp->push_back(item);
}
else
{
@@ -2432,7 +2432,7 @@ bool LLInventoryModel::loadFromFile(const std::string& filename,
LLPointer<LLViewerInventoryCategory> inv_cat = new LLViewerInventoryCategory(LLUUID::null);
if(inv_cat->importFileLocal(file))
{
categories.put(inv_cat);
categories.push_back(inv_cat);
}
else
{
@@ -2460,7 +2460,7 @@ bool LLInventoryModel::loadFromFile(const std::string& filename,
}
else
{
items.put(inv_item);
items.push_back(inv_item);
}
}
else
@@ -2500,7 +2500,7 @@ bool LLInventoryModel::saveToFile(const std::string& filename,
}
fprintf(file, "\tinv_cache_version\t%d\n", sCurrentInvCacheVersion);
S32 count = categories.count();
S32 count = categories.size();
S32 i;
for(i = 0; i < count; ++i)
{
@@ -2511,7 +2511,7 @@ bool LLInventoryModel::saveToFile(const std::string& filename,
}
}
count = items.count();
count = items.size();
for(i = 0; i < count; ++i)
{
items[i]->exportFile(file);