From 9e21f520fb19163eeac2a9b80a4568dabfc29268 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 15 Apr 2010 14:30:56 +0200
Subject: Adjust to changed predicate names

---
 xsd/processing/cardinality/processor.cxx |  4 ++--
 xsd/processing/inheritance/processor.cxx | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'xsd/processing')

diff --git a/xsd/processing/cardinality/processor.cxx b/xsd/processing/cardinality/processor.cxx
index 497507f..473c412 100644
--- a/xsd/processing/cardinality/processor.cxx
+++ b/xsd/processing/cardinality/processor.cxx
@@ -275,7 +275,7 @@ namespace Processing
         {
           SemanticGraph::ContainsParticle& cp (e.contained_particle ());
 
-          String name (e.qualified ()
+          String name (e.qualified_p ()
                        ? e.namespace_ ().name () + L" " + e.name ()
                        : e.name ());
 
@@ -345,7 +345,7 @@ namespace Processing
         {
           FrontendElements::Context& ctx (a.context ());
 
-          ctx.set ("min", a.optional () ? 0UL : 1UL);
+          ctx.set ("min", a.optional_p () ? 0UL : 1UL);
           ctx.set ("max", 1UL);
         }
       };
diff --git a/xsd/processing/inheritance/processor.cxx b/xsd/processing/inheritance/processor.cxx
index 5687bb7..d92ea6c 100644
--- a/xsd/processing/inheritance/processor.cxx
+++ b/xsd/processing/inheritance/processor.cxx
@@ -59,7 +59,7 @@ namespace Processing
         if (dynamic_cast<SemanticGraph::Namespace*> (&n) != 0)
           return L"<namespace-level>"; // There is a bug if you see this.
 
-        if (n.named ())
+        if (n.named_p ())
         {
           SemanticGraph::Scope& scope (n.scope ());
 
@@ -108,7 +108,7 @@ namespace Processing
         {
           SemanticGraph::Type& t (m.type ());
 
-          if (!t.named () && types_seen_.find (&t) == types_seen_.end ())
+          if (!t.named_p () && types_seen_.find (&t) == types_seen_.end ())
           {
             FrontendElements::Context& ctx (t.context ());
 
@@ -193,7 +193,7 @@ namespace Processing
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (t.named ())
+          if (t.named_p ())
             types_seen_.insert (&t);
         }
 
@@ -209,7 +209,7 @@ namespace Processing
         {
           SemanticGraph::Type& t (e.type ());
 
-          if (!t.named ())
+          if (!t.named_p ())
           {
             t.context ().set ("instance-name", xpath (e));
             check_dep (e, t);
@@ -321,7 +321,7 @@ namespace Processing
               //
               String name (t.name ());
               {
-                Names& n (t.named_ ());
+                Names& n (t.named ());
                 root_.delete_edge (scope, t, n);
               }
 
@@ -330,7 +330,7 @@ namespace Processing
               {
                 // Convert to the insert-after call.
                 //
-                Scope::NamesIterator i (scope.find (global.named_ ()));
+                Scope::NamesIterator i (scope.find (global.named ()));
 
                 if (i == scope.names_begin ())
                   i = scope.names_end ();
-- 
cgit v1.1