Changeset 278 in pacpusframework for trunk/src/PacpusLib

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:

• trunk/src/PacpusLib/ComponentBase.cpp (modified) (3 diffs)

trunk/src/PacpusLib/ComponentBase.cpp

@@ -317 +317 @@
     typedef typename self_type::difference_type difference_type;
 
-    basic_dom_element_iterator<charT>()
+    basic_dom_element_iterator<charT>(QDomElement const& dom_element)
         : m_dom_element(NULL)
         , m_at_eof(true)
-        , m_i(0)
-    {
-    }
-
-    basic_dom_element_iterator<charT>(const QDomElement& dom_element,
-            const std::set<std::string>& allowed_options,
+        , m_i(dom_element.attributes().size())
+    {
+    }
+
+    basic_dom_element_iterator<charT>(QDomElement const& dom_element,
+            std::set<std::string> const& allowed_options,
             bool allow_unregistered = false)
         : m_dom_element(&dom_element)
@@ -409 +409 @@
     bool allowed_option(const std::string& s) const
     {
-        set<string>::const_iterator i = m_allowed_options.find(s);
-        if (i != m_allowed_options.end()) {
+        set<string>::const_iterator it = m_allowed_options.find(s);
+        if (it != m_allowed_options.end()) {
             return true;        
         }
@@ -469 +469 @@
     parsed_options result(&desc);        
     copy(basic_dom_element_iterator<charT>(dom_element, allowed_options, allow_unregistered),
-            basic_dom_element_iterator<charT>(),
+            basic_dom_element_iterator<charT>(dom_element),
             back_inserter(result.options));