diff options
| author | Nathan Yee <ny.nathan.yee@gmail.com> | 2015-01-01 10:50:39 -0800 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-05 09:34:08 +0000 |
| commit | a509a8d9951a0c31bea0f4ff8942720cad8b6e7f (patch) | |
| tree | d4494eb4ec45284869a373316a135ee1b181ac64 /avmedia | |
| parent | df5fa4082cfb17c5d5be6678995689485df6d429 (diff) | |
Resolves: fdo#87003 Kill BOOST_FOREACH on master
use C++11s range-based for() loops instead
Conflicts:
sd/source/filter/eppt/pptx-epptooxml.cxx
Change-Id: I0868eb345932c05b7e40b087035da252b99bf0b9
Reviewed-on: https://gerrit.libreoffice.org/13714
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 524e37a386ee..fe6ea56ca689 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -26,7 +26,6 @@ #include <boost/property_tree/ptree.hpp> #include <boost/property_tree/json_parser.hpp> -#include <boost/foreach.hpp> #include <boost/optional.hpp> #include <config_features.h> @@ -174,7 +173,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed: json_parser::read_json( sUrl, aTree ); // Buffers for geometry and animations - BOOST_FOREACH(ptree::value_type &rVal,aTree.get_child("buffers")) + for( ptree::value_type &rVal : aTree.get_child("buffers") ) { const std::string sBufferUri(rVal.second.get<std::string>("path")); vExternals.push_back(sBufferUri); @@ -185,7 +184,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed: boost::optional< ptree& > aImages = aTree.get_child_optional("images"); if( aImages ) { - BOOST_FOREACH(ptree::value_type &rVal,aImages.get()) + for( ptree::value_type &rVal : aImages.get() ) { const std::string sImageUri(rVal.second.get<std::string>("path")); if( !sImageUri.empty() ) @@ -197,7 +196,7 @@ static void lcl_EmbedExternals(const OUString& rSourceURL, uno::Reference<embed: } } // Shaders (contains names only) - BOOST_FOREACH(ptree::value_type &rVal,aTree.get_child("programs")) + for( ptree::value_type &rVal : aTree.get_child("programs") ) { vExternals.push_back(rVal.second.get<std::string>("fragmentShader") + ".glsl"); vExternals.push_back(rVal.second.get<std::string>("vertexShader") + ".glsl"); |