diff options
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: |