INTEGRATION: CWS adc18 (1.2.56); FILE MERGED

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

2 files changed, 26 insertions, 26 deletions

diff --git a/autodoc/source/parser/inc/doc_deal.hxx b/autodoc/source/parser/inc/doc_deal.hxx
index 5133ad76fce7..41bcdbc272bd 100644
--- a/autodoc/source/parser/inc/doc_deal.hxx
+++ b/autodoc/source/parser/inc/doc_deal.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: doc_deal.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:34:33 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:02:24 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,19 +36,19 @@
 #ifndef ADC_DOC_DEAL_HXX
 #define ADC_DOC_DEAL_HXX
 
-
-
-// USED SERVICES
-    // BASE CLASSES
+// BASE CLASSES
 #include <tokens/tokproct.hxx>
-    // COMPONENTS
-    // PARAMETERS
-#include <ary/cpp/c_etypes.hxx>
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
 
 namespace ary
 {
-    class Documentation;
+namespace doc
+{
+    class OldCppDocu;
 }
+}
+
 
 
 
@@ -75,24 +75,23 @@ class DocuDealer
         or ary::Glossary.
     */
     void                TakeDocu(
-                            DYN ary::Documentation &
+                            DYN ary::doc::OldCppDocu &
                                                 let_drInfo );
   private:
     virtual void        do_TakeDocu(
-                            DYN ary::Documentation &
+                            DYN ary::doc::OldCppDocu &
                                                 let_drInfo ) = 0;
 };
 
 
 
-// IMPLEMENTATION
 
+// IMPLEMENTATION
 inline void
-DocuDealer::TakeDocu( DYN ary::Documentation & let_drInfo )
+DocuDealer::TakeDocu( DYN ary::doc::OldCppDocu & let_drInfo )
     { do_TakeDocu(let_drInfo); }
 
 
 
 
 #endif
-
diff --git a/autodoc/source/parser/inc/x_parse.hxx b/autodoc/source/parser/inc/x_parse.hxx
index e828e2d3d555..189c21adb176 100644
--- a/autodoc/source/parser/inc/x_parse.hxx
+++ b/autodoc/source/parser/inc/x_parse.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: x_parse.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 18:34:49 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 17:02:42 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,11 +36,10 @@
 #ifndef ADC_X_PARSE_HXX
 #define ADC_X_PARSE_HXX
 
-// USED SERVICES
-    // BASE CLASSES
+// BASE CLASSES
 #include <autodoc/x_parsing.hxx>
-    // COMPONENTS
-    // PARAMETERS
+
+
 
 
 class X_Parser : public autodoc::X_Parser_Ifc
@@ -50,21 +49,23 @@ class X_Parser : public autodoc::X_Parser_Ifc
                         X_Parser(
                             E_Event             i_eEvent,
                             const char *        i_sObject,
-                            const udmstri &     i_sCausingFile_FullPath,
+                            const String &      i_sCausingFile_FullPath,
                             uintt               i_nCausingLineNr );
                         ~X_Parser();
     // INQUIRY
     virtual E_Event     GetEvent() const;
     virtual void        GetInfo(
-                            ostream &           o_rOutputMedium ) const;
+                            std::ostream &      o_rOutputMedium ) const;
 
   private:
     E_Event             eEvent;
-    udmstri             sObject;
-    udmstri             sCausingFile_FullPath;
+    String              sObject;
+    String              sCausingFile_FullPath;
     uintt               nCausingLineNr;
 
 };
 
-#endif
 
+
+
+#endif