From e2e7b7f39ec836f3bf24539c70329502b872d50d Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 27 Apr 2013 13:45:04 -0400 Subject: [PATCH] Handle the lone deque. --- src/Foreach.h | 7 ------- src/ThemeManager.cpp | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Foreach.h b/src/Foreach.h index 3ae474e76c..74f92467b1 100644 --- a/src/Foreach.h +++ b/src/Foreach.h @@ -8,13 +8,6 @@ for( vector::iterator var = (vect).begin(); var != (vect).end(); ++var #define FOREACH_CONST( elemType, vect, var ) \ for( vector::const_iterator var = (vect).begin(); var != (vect).end(); ++var ) -/** @brief General foreach loop iterating over a deque. */ -#define FOREACHD( elemType, vect, var ) \ -for( deque::iterator var = (vect).begin(); var != (vect).end(); ++var ) -/** @brief General foreach loop iterating over a deque, using a constant iterator. */ -#define FOREACHD_CONST( elemType, vect, var ) \ -for( deque::const_iterator var = (vect).begin(); var != (vect).end(); ++var ) - /** @brief General foreach loop iterating over a set. */ #define FOREACHS( elemType, vect, var ) \ for( set::iterator var = (vect).begin(); var != (vect).end(); ++var ) diff --git a/src/ThemeManager.cpp b/src/ThemeManager.cpp index f2ac2c6c61..35bb6eec6e 100644 --- a/src/ThemeManager.cpp +++ b/src/ThemeManager.cpp @@ -726,10 +726,10 @@ bool ThemeManager::GetPathInfoToAndFallback( PathInfo &out, ElementCategory cate int n = 100; while( n-- ) { - FOREACHD_CONST( Theme, g_vThemes, iter ) + for (Theme const &theme : g_vThemes) { // search with requested name - if( GetPathInfoToRaw( out, iter->sThemeName, category, sMetricsGroup, sElement ) ) + if( GetPathInfoToRaw( out, theme.sThemeName, category, sMetricsGroup, sElement ) ) return true; }