github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid member data access when constructing bundles::item_t

Browse Source
This commit is contained in:
Allan Odgaard
2013-03-17 16:03:11 +01:00
parent 594bfcb29d
commit 7d6763eee7
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Frameworks/bundles/src/io.cc
View File

@@ -149,7 +149,6 @@ namespace bundles
std::map< oak::uuid_t, std::vector<oak::uuid_t> > menus;
std::map<oak::uuid_t, delta_item_t> deltaItems;
std::set< std::pair<oak::uuid_t, oak::uuid_t> > hiddenItems;
std::set<oak::uuid_t> loadedItems;
bool local = true;
@@ -187,6 +186,7 @@ namespace bundles
}
item_ptr bundle;
std::set<oak::uuid_t> hiddenItems;
citerate(infoPlist, *bundleNode.entries())
{
if(infoPlist->name() != "info.plist")
@@ -250,8 +250,7 @@ namespace bundles
if(plist::get_key_path(submenuIter->second, kFieldName, name) && plist::get_key_path(submenuIter->second, "items", uuids))
{
item_ptr item(new item_t(submenuIter->first, bundle, kItemTypeMenu));
item->_uuid = submenuIter->first;
item->_fields.insert(std::make_pair(kFieldName, name));
item->set_name(name);
items.push_back(item);
menus.insert(std::make_pair(submenuIter->first, to_menu(uuids)));
}
@@ -262,7 +261,7 @@ namespace bundles
iterate(uuid, uuids)
{
if(std::string const* str = boost::get<std::string>(&*uuid))
hiddenItems.insert(std::make_pair(*str, bundleUUID));
hiddenItems.insert(*str);
}
break;
@@ -351,6 +350,9 @@ namespace bundles
continue;
}
if(hiddenItems.find(item->uuid()) != hiddenItems.end())
plist.insert(std::make_pair(kFieldHideFromUser, true));
item->initialize(plist);
items.push_back(item);
@@ -376,10 +378,6 @@ namespace bundles
fprintf(stderr, "Warning: Bundle item ‘%s’ at path %s has no (non-delta) parent\n", item->name().c_str(), text::join(item->paths(), ", ").c_str());
items.erase(items.begin() + i);
}
else
{
item->_hidden_from_user = hiddenItems.find(std::make_pair(item->uuid(), item->bundle_uuid())) != hiddenItems.end() ?: item->_hidden_from_user;
}
}
set_index(items, menus);