diff options
Diffstat (limited to 'CIAO/tools/Config_Handlers/cpd.cpp')
-rw-r--r-- | CIAO/tools/Config_Handlers/cpd.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/CIAO/tools/Config_Handlers/cpd.cpp b/CIAO/tools/Config_Handlers/cpd.cpp index 9ae5c83a9f3..c59e5e18fef 100644 --- a/CIAO/tools/Config_Handlers/cpd.cpp +++ b/CIAO/tools/Config_Handlers/cpd.cpp @@ -453,13 +453,13 @@ namespace CIAO ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ()); ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ())); - if (n == ACE_TEXT ("name")) + if (n == "name") { name_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e)); name_->container (this); } - else if (n == ACE_TEXT ("referencedImplementation")) + else if (n == "referencedImplementation") { referencedImplementation_ = ::std::auto_ptr< ::CIAO::Config_Handlers::ComponentImplementationDescription > (new ::CIAO::Config_Handlers::ComponentImplementationDescription (e)); referencedImplementation_->container (this); @@ -486,43 +486,43 @@ namespace CIAO ::XSCRT::XML::Element< ACE_TCHAR > e (p.next_element ()); ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (e.name ())); - if (n == ACE_TEXT ("label")) + if (n == "label") { ::XMLSchema::string< ACE_TCHAR > t (e); label (t); } - else if (n == ACE_TEXT ("UUID")) + else if (n == "UUID") { ::XMLSchema::string< ACE_TCHAR > t (e); UUID (t); } - else if (n == ACE_TEXT ("realizes")) + else if (n == "realizes") { ::CIAO::Config_Handlers::ComponentInterfaceDescription t (e); realizes (t); } - else if (n == ACE_TEXT ("configProperty")) + else if (n == "configProperty") { ::CIAO::Config_Handlers::Property t (e); add_configProperty (t); } - else if (n == ACE_TEXT ("implementation")) + else if (n == "implementation") { ::CIAO::Config_Handlers::PackagedComponentImplementation t (e); add_implementation (t); } - else if (n == ACE_TEXT ("infoProperty")) + else if (n == "infoProperty") { ::CIAO::Config_Handlers::Property t (e); add_infoProperty (t); } - else if (n == ACE_TEXT ("contentLocation")) + else if (n == "contentLocation") { ::XMLSchema::string< ACE_TCHAR > t (e); contentLocation (t); @@ -537,7 +537,7 @@ namespace CIAO { ::XSCRT::XML::Attribute< ACE_TCHAR > a (p.next_attribute ()); ::std::basic_string< ACE_TCHAR > n (::XSCRT::XML::uq_name (a.name ())); - if (n == ACE_TEXT ("href")) + if (n == "href") { ::XMLSchema::string< ACE_TCHAR > t (a); href (t); @@ -1130,7 +1130,7 @@ namespace CIAO void PackagedComponentImplementation:: name (Type const& o) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("name"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ())); Traversal::PackagedComponentImplementation::name (o); pop_ (); } @@ -1138,7 +1138,7 @@ namespace CIAO void PackagedComponentImplementation:: referencedImplementation (Type const& o) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("referencedImplementation"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("referencedImplementation", top_ ())); Traversal::PackagedComponentImplementation::referencedImplementation (o); pop_ (); } @@ -1167,7 +1167,7 @@ namespace CIAO void ComponentPackageDescription:: label (Type const& o) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("label"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("label", top_ ())); Traversal::ComponentPackageDescription::label (o); pop_ (); } @@ -1175,7 +1175,7 @@ namespace CIAO void ComponentPackageDescription:: UUID (Type const& o) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("UUID"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("UUID", top_ ())); Traversal::ComponentPackageDescription::UUID (o); pop_ (); } @@ -1183,7 +1183,7 @@ namespace CIAO void ComponentPackageDescription:: realizes (Type const& o) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("realizes"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("realizes", top_ ())); Traversal::ComponentPackageDescription::realizes (o); pop_ (); } @@ -1191,7 +1191,7 @@ namespace CIAO void ComponentPackageDescription:: configProperty_pre (Type const&) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("configProperty"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("configProperty", top_ ())); } void ComponentPackageDescription:: @@ -1210,7 +1210,7 @@ namespace CIAO void ComponentPackageDescription:: implementation_pre (Type const&) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("implementation"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("implementation", top_ ())); } void ComponentPackageDescription:: @@ -1229,7 +1229,7 @@ namespace CIAO void ComponentPackageDescription:: infoProperty_pre (Type const&) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("infoProperty"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("infoProperty", top_ ())); } void ComponentPackageDescription:: @@ -1248,7 +1248,7 @@ namespace CIAO void ComponentPackageDescription:: contentLocation (Type const& o) { - push_ (::XSCRT::XML::Element< ACE_TCHAR > (ACE_TEXT ("contentLocation"), top_ ())); + push_ (::XSCRT::XML::Element< ACE_TCHAR > ("contentLocation", top_ ())); Traversal::ComponentPackageDescription::contentLocation (o); pop_ (); } @@ -1256,7 +1256,7 @@ namespace CIAO void ComponentPackageDescription:: href (Type const& o) { - ::XSCRT::XML::Attribute< ACE_TCHAR > a (ACE_TEXT ("href"), ACE_TEXT (""), top_ ()); + ::XSCRT::XML::Attribute< ACE_TCHAR > a ("href", "", top_ ()); attr_ (&a); Traversal::ComponentPackageDescription::href (o); attr_ (0); |