Use shortcut functions for find calls

[builder.git] / source / datapackcomponent.cpp

diff --git a/source/datapackcomponent.cpp b/source/datapackcomponent.cpp
index f936e9151e52c4cf501fb70dd1b5b162bcd5eb27..b95770f4e432891b34c303a375d929042c4d4ece 100644 (file)
--- a/source/datapackcomponent.cpp
+++ b/source/datapackcomponent.cpp
@@ -1,7 +1,7 @@
 #include <msp/fs/utils.h>
 #include "builder.h"
 #include "datapackcomponent.h"
-#include "file.h"
+#include "datasourcefile.h"
 #include "sourcepackage.h"
 #include "tool.h"
 
@@ -18,19 +18,18 @@ void DataPackComponent::create_targets() const
        Tool &dcomp = builder.get_toolchain().get_tool("DATA");
 
        list<Target *> files;
-       SourceList source_filenames = collect_source_files();
-       for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
+       for(const FS::Path &s: collect_source_files())
        {
-               string ext = FS::extpart(FS::basename(*i));
+               string ext = FS::extpart(FS::basename(s));
                if(ext==".mdt")
                {
-                       Target *src = dcomp.create_source(*this, *i);
+                       Target *src = dcomp.create_source(*this, s);
                        files.push_back(dcomp.create_target(*src, "collection"));
                }
-               else if(Target *tgt = builder.get_vfs().get_target(*i))
+               else if(Target *tgt = builder.get_vfs().get_target(s))
                        files.push_back(tgt);
                else
-                       files.push_back(new File(builder, package, *i));
+                       files.push_back(new DataSourceFile(builder, *this, s));
        }
 
        Target *result = dcomp.create_target(files, "pack");