Subversion Repositories spk

Rev

Rev 249 | Rev 262 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 249 Rev 258
Line 7305... Line 7305...
7305 
	if (_lGlobals.empty())
 7305 
	if (_lGlobals.empty())
7306 
	{
 7306 
	{
7307 
		bool anyGlobals = false;
 7307 
		bool anyGlobals = false;
7308 
		for (CListNode<CBaseFile>* node = m_lPackages.Front(); node; node = node->next())
 7308 
		for (CListNode<CBaseFile>* node = m_lPackages.Front(); node; node = node->next())
7309 
		{
 7309 
		{
7310 
			if (node->Data()->getGlobals().size())
 7310 
			if (node->Data()->IsEnabled() && node->Data()->getGlobals().size())
7311 
			{
 7311 
			{
7312 
				anyGlobals = true;
 7312 
				anyGlobals = true;
7313 
				break;
 7313 
				break;
7314 
			}
 7314 
			}
7315 
		}
 7315 
		}
Line 7323... Line 7323...
7323 
	{
 7323 
	{
7324 
		// apply package settings
 7324 
		// apply package settings
7325 
		for (CListNode<CBaseFile>* node = m_lPackages.Front(); node; node = node->next())
 7325 
		for (CListNode<CBaseFile>* node = m_lPackages.Front(); node; node = node->next())
7326 
		{
 7326 
		{
7327 
			CBaseFile* p = node->Data();
 7327 
			CBaseFile* p = node->Data();
7328 
			auto& list = p->;getGlobals();
 7328 
			if (p->;IsEnabled())
7329 
			for (auto itr = list.begin(); itr != list.end(); itr++)
 - 
 
7330 
			{
 7329 
			{
- 
 
 7330 
				auto& list = p->getGlobals();
- 
 
 7331 
				for (auto itr = list.begin(); itr != list.end(); itr++)
- 
 
 7332 
				{
7331 
				if(!globals.changeData((*itr)->str, (*itr)->data))
 7333 
					if (!globals.changeData((*itr)->str, (*itr)->data))
7332 
					globals.pushBack((*itr)->str, (*itr)->data);
 7334 
						globals.pushBack((*itr)->str, (*itr)->data);
- 
 
 7335 
				}
7333 
			}
 7336 
			}
7334 
		}
 7337 
		}
7335 
 
 7338 
 
7336 
		// apply out settings
 7339 
		// apply out settings
7337 
		for (auto itr = _lGlobals.begin(); itr != _lGlobals.end(); itr++)
 7340 
		for (auto itr = _lGlobals.begin(); itr != _lGlobals.end(); itr++)