@@ -139,18 +139,25 @@ void CSearchManager::CloseMenu( void )
139
139
Lock lock (this ,LOCK_DATA);
140
140
m_LastRequestId++;
141
141
m_LastProgramsRequestId=m_LastRequestId;
142
- if (g_LogCategories& LOG_SEARCH)
142
+ if (g_LogCategories & LOG_SEARCH)
143
143
{
144
- for (std::vector<SearchItem>::const_iterator it= m_ProgramItems. begin ();it!=m_ProgramItems. end ();++it )
144
+ for (const auto & item : m_ProgramItems)
145
145
{
146
- if (it-> category == CATEGORY_PROGRAM)
147
- LOG_MENU (LOG_SEARCH,L" Program: '%s', %d" ,it-> name ,it-> rank );
146
+ if (item. category == CATEGORY_PROGRAM)
147
+ LOG_MENU (LOG_SEARCH, L" Program: '%s', %d" , item. name , item. rank );
148
148
}
149
- std::sort (m_SettingsItems.begin (),m_SettingsItems.end ());
150
- for (std::vector<SearchItem>::const_iterator it=m_SettingsItems.begin ();it!=m_SettingsItems.end ();++it)
149
+
150
+ std::sort (m_SettingsItems.begin (), m_SettingsItems.end ());
151
+
152
+ for (const auto & item : m_SettingsItems)
153
+ {
154
+ if (item.category == CATEGORY_SETTING)
155
+ LOG_MENU (LOG_SEARCH, L" Setting: '%s', %d" , item.name , item.rank );
156
+ }
157
+ for (const auto & item : m_SettingsItems)
151
158
{
152
- if (it-> category ==CATEGORY_SETTING )
153
- LOG_MENU (LOG_SEARCH,L" Setting : '%s', %d" ,it-> name ,it-> rank );
159
+ if (item. category == CATEGORY_METROSETTING )
160
+ LOG_MENU (LOG_SEARCH, L" MetroSetting : '%s', %d" , item. name , item. rank );
154
161
}
155
162
}
156
163
if (m_bProgramsFound)
@@ -675,7 +682,7 @@ void CSearchManager::SearchThread( void )
675
682
if (GetWinVersion ()>=WIN_VER_WIN8 && searchRequest.bSearchMetroApps )
676
683
{
677
684
std::vector<MetroLink> links;
678
- GetMetroLinks (links,false );
685
+ GetMetroLinks (links,true );
679
686
for (std::vector<MetroLink>::const_iterator it=links.begin ();it!=links.end ();++it)
680
687
{
681
688
if (GetWinVersion ()<WIN_VER_WIN10)
0 commit comments