Changeset 278 in pacpusframework


Ignore:
Timestamp:
Mar 20, 2014, 9:19:23 AM (11 years ago)
Author:
Marek Kurdej
Message:

Fixed: problems with basic_dom_element_iterator on Unix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/PacpusLib/ComponentBase.cpp

    r276 r278  
    317317    typedef typename self_type::difference_type difference_type;
    318318
    319     basic_dom_element_iterator<charT>()
     319    basic_dom_element_iterator<charT>(QDomElement const& dom_element)
    320320        : m_dom_element(NULL)
    321321        , m_at_eof(true)
    322         , m_i(0)
    323     {
    324     }
    325 
    326     basic_dom_element_iterator<charT>(const QDomElement& dom_element,
    327             const std::set<std::string>& allowed_options,
     322        , m_i(dom_element.attributes().size())
     323    {
     324    }
     325
     326    basic_dom_element_iterator<charT>(QDomElement const& dom_element,
     327            std::set<std::string> const& allowed_options,
    328328            bool allow_unregistered = false)
    329329        : m_dom_element(&dom_element)
     
    409409    bool allowed_option(const std::string& s) const
    410410    {
    411         set<string>::const_iterator i = m_allowed_options.find(s);
    412         if (i != m_allowed_options.end()) {
     411        set<string>::const_iterator it = m_allowed_options.find(s);
     412        if (it != m_allowed_options.end()) {
    413413            return true;       
    414414        }
     
    469469    parsed_options result(&desc);       
    470470    copy(basic_dom_element_iterator<charT>(dom_element, allowed_options, allow_unregistered),
    471             basic_dom_element_iterator<charT>(),
     471            basic_dom_element_iterator<charT>(dom_element),
    472472            back_inserter(result.options));
    473473
Note: See TracChangeset for help on using the changeset viewer.