diff options
| author | senator <elsenator@gmail.com> | 2011-12-01 15:58:45 +0100 |
|---|---|---|
| committer | senator <elsenator@gmail.com> | 2011-12-01 15:58:45 +0100 |
| commit | bf3029b893e7138593d2d185d4ce9de26491a15e (patch) | |
| tree | 557cd81a1cd3f192346dca187f006f7814d8a5e3 /server/src/fieldnamescanner.cc | |
| parent | 9989ea2f6bfa19bd349bbbdec8ec3f56c1427245 (diff) | |
| parent | 5ed7a801b4194e72cc3898de57fb1d9ea0e8caa4 (diff) | |
Merge branch 'master' of http://git.aasimon.org/public/pracro
Diffstat (limited to 'server/src/fieldnamescanner.cc')
| -rw-r--r-- | server/src/fieldnamescanner.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/fieldnamescanner.cc b/server/src/fieldnamescanner.cc index 5418bb4..ba3b61f 100644 --- a/server/src/fieldnamescanner.cc +++ b/server/src/fieldnamescanner.cc @@ -58,12 +58,12 @@ fieldnames_t getFields(Widget &widget) return fieldnames; } -templates_t scanfieldnames(std::set<std::string> &filter) +templates_t scanfieldnames(Environment &env, std::set<std::string> &filter) { templates_t templates; // TemplateList templatelist(Conf::xml_basedir + "/templates"); - MacroList macrolist(Conf::xml_basedir + "/macros"); + // MacroList macrolist(Conf::xml_basedir + "/macros"); // Iterate templates: std::vector<std::string> templatefiles = getTemplates(); @@ -83,7 +83,7 @@ templates_t scanfieldnames(std::set<std::string> &filter) if(ms->isHeader == false) { std::string macro = ms->name; DEBUG(scanner, "Name '%s'\n", macro.c_str()); - std::string macrofile = macrolist.getLatestVersion(macro); + std::string macrofile = env.macrolist.getLatestVersion(macro); DEBUG(scanner, "File '%s'\n", macrofile.c_str()); // Iterate fields: |