← Back to branch summary

~e7appew/ubuntu/vivid/bombono-dvd/mux-files-with-spaces

« back to all changes in this revision

Viewing changes to src/mgui/editor/toolbar.cpp

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-05-02 22:09:31 UTC
  • Revision ID: package-import@ubuntu.com-20130502220931-pui7uqs6b468z8sb
Tags: 1.2.1-0ubuntu5
Cherry-pick patches from upstream to build against boost1.53.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mgui/editor/toolbar.cpp
283
283
        Str::List o_lst;
284
284
        boost_foreach( const std::string& str, IconsDirs() )
285
285
        {
286
 
            fs::path dir = fs::path(str);
 
286
            fs::path dir = fs::path(str);
287
287
            if( fs::is_directory(dir) )
288
 
            {    
289
 
                boost_foreach( const fs::path& pth, dir_range(dir) )
290
 
                    o_lst.push_back(pth.filename());
291
 
            }
 
288
            {
 
289
                boost_foreach( const fs::path& pth, dir_range(dir) )
 
290
                    o_lst.push_back(fs::name_str(pth));
 
291
            }
292
292
        }
293
293
        std::sort(o_lst.begin(), o_lst.end(), &ByExtName);
294
294
        Project::MakeUnique(o_lst);