Changeset 89:189e010a5c1a in rrlib_logging


Ignore:
Timestamp:
16.06.2012 19:11:47 (8 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
default
Phase:
public
Transplant:
bc42d35aac31e646a620920c08a5c45f5c717c2a
Message:

Adapted to rrlib_xml2_wrapper -> rrlib_xml rename

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • configuration.cpp

    r76 r89  
    4343 
    4444#ifdef _LIB_RRLIB_XML2_WRAPPER_PRESENT_ 
    45 #include "rrlib/xml2_wrapper/tXMLDocument.h" 
     45#include "rrlib/xml/tDocument.h" 
    4646#endif 
    4747 
     
    166166#ifdef _LIB_RRLIB_XML2_WRAPPER_PRESENT_ 
    167167 
    168   xml2::tXMLDocument document(file_name); 
     168  xml::tDocument document(file_name); 
    169169  return ConfigureFromXMLNode(document.RootNode()); 
    170170 
     
    183183// AddConfigurationFromXMLNode 
    184184//---------------------------------------------------------------------- 
    185 bool AddConfigurationFromXMLNode(const xml2::tXMLNode &node, const std::string &parent_name) 
     185bool AddConfigurationFromXMLNode(const xml::tNode &node, const std::string &parent_name) 
    186186{ 
    187187  static const std::vector<std::string> level_names = { "error", "warning", "debug_warning", "debug", "debug_verbose_1", "debug_verbose_2", "debug_verbose_3" }; 
     
    245245 
    246246//  int sink_mask = 0; 
    247 //  for (xml2::tXMLNode::const_iterator it = node.ChildrenBegin(); it != node.ChildrenEnd(); ++it) 
     247//  for (xml::tNode::const_iterator it = node.ChildrenBegin(); it != node.ChildrenEnd(); ++it) 
    248248//  { 
    249249//    if (it->Name() == "sink") 
     
    262262//  } 
    263263 
    264   for (xml2::tXMLNode::const_iterator it = node.ChildrenBegin(); it != node.ChildrenEnd(); ++it) 
     264  for (xml::tNode::const_iterator it = node.ChildrenBegin(); it != node.ChildrenEnd(); ++it) 
    265265  { 
    266266    if (it->Name() == "domain") 
     
    281281// ConfigureFromXMLNode 
    282282//---------------------------------------------------------------------- 
    283 bool ConfigureFromXMLNode(const xml2::tXMLNode &node) 
     283bool ConfigureFromXMLNode(const xml::tNode &node) 
    284284{ 
    285285  if (node.Name() != "rrlib_logging") 
     
    300300    } 
    301301 
    302     for (xml2::tXMLNode::const_iterator it = node.ChildrenBegin(); it != node.ChildrenEnd(); ++it) 
     302    for (xml::tNode::const_iterator it = node.ChildrenBegin(); it != node.ChildrenEnd(); ++it) 
    303303    { 
    304304      if (it->Name() == "domain") 
     
    311311    } 
    312312  } 
    313   catch (const xml2::tXML2WrapperException &exception) 
     313  catch (const xml::tException &exception) 
    314314  { 
    315315    RRLIB_LOG_PRINT(eLL_ERROR, exception); 
  • configuration.h

    r79 r89  
    106106 * \returns Whether the configuration could be applied or not 
    107107 */ 
    108 bool ConfigureFromXMLNode(const xml2::tXMLNode &node); 
     108bool ConfigureFromXMLNode(const xml::tNode &node); 
    109109 
    110110#endif 
  • configuration/tDomainRegistry.h

    r86 r89  
    5757 
    5858#ifdef _LIB_RRLIB_XML2_WRAPPER_PRESENT_ 
    59 #include "rrlib/xml2_wrapper/tXMLNode.h" 
     59#include "rrlib/xml/tNode.h" 
    6060#endif 
    6161 
Note: See TracChangeset for help on using the changeset viewer.