INTEGRATION: CWS adc18 (1.2.56); FILE MERGED

2007/10/18 15:23:16 np 1.2.56.1: #i81775#

2 files changed, 23 insertions, 22 deletions

diff --git a/autodoc/source/parser/cpp/c_rcode.hxx b/autodoc/source/parser/cpp/c_rcode.hxx
index bef3768ab482..8fa5e9fe11b4 100644
--- a/autodoc/source/parser/cpp/c_rcode.hxx
+++ b/autodoc/source/parser/cpp/c_rcode.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: c_rcode.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:15:32 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:48:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,48 +36,49 @@
 #ifndef ADC_CPP_C_RCODE_HXX
 #define ADC_CPP_C_RCODE_HXX
 
-
-
-// USED SERVICES
-    // BASE CLASSES
+// BASE CLASSES
 #include <tokens/tokproct.hxx>
-    // COMPONENTS
+// USED SERVICES
 #include <cosv/ploc.hxx>
 #include "cxt2ary.hxx"
-    // PARAMETERS
-#include <ary/ids.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/loc/loc_types4loc.hxx>
 
 
 
 namespace ary
 {
-    namespace cpp
-    {
-        class RwGate;
-    }
-
-    class Documentation;
+namespace cpp
+{
+    class Gate;
+}
+namespace doc
+{
+    class OldCppDocu;
+}
 }
 
 namespace cpp
 {
-
     class PE_File;
     class Token;
     class Cpp_PE;
 
+
+
+
 class CodeExplorer : private TokenProcessing_Types
 
 {
   public:
                         CodeExplorer(
-                            ary::cpp::RwGate & io_rAryGate );
+                            ary::cpp::Gate &    io_rAryGate );
                         ~CodeExplorer();
 
     void                StartNewFile();
     void                Process_Token(
                             DYN cpp::Token &    let_drToken );
-    ary::Cid            CurFile() const;
+    ary::loc::Le_id     CurFile() const;
 
     // ACCESS
     FileScope_EventHandler &
@@ -100,7 +101,7 @@ class CodeExplorer : private TokenProcessing_Types
     EnvironmentStack    aEnvironments;
     Dyn<PE_File>        pPE_File;
 
-    ary::cpp::RwGate *  pGate;
+    ary::cpp::Gate *    pGate;
     cpp::Token *        dpCurToken;
 };
 
diff --git a/autodoc/source/parser/cpp/cpp_pe.hxx b/autodoc/source/parser/cpp/cpp_pe.hxx
index 40d86c110c83..f38563b2d04d 100644
--- a/autodoc/source/parser/cpp/cpp_pe.hxx
+++ b/autodoc/source/parser/cpp/cpp_pe.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cpp_pe.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:16:21 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 16:49:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -45,7 +45,7 @@
     // COMPONENTS
 #include "pev.hxx"
     // PARAMETERS
-#include <ary/ids.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
 
 
 namespace cpp {