INTEGRATION: CWS adc18 (1.2.56); FILE MERGED

2007/10/18 13:06:34 np 1.2.56.1: #i81775#

5 files changed, 60 insertions, 88 deletions

diff --git a/autodoc/inc/ary/actions.hxx b/autodoc/inc/ary/actions.hxx
index f28591cf88a2..1d600f1c8c9d 100644
--- a/autodoc/inc/ary/actions.hxx
+++ b/autodoc/inc/ary/actions.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: actions.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 15:48:33 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 14:36:35 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,8 +35,7 @@
 
 #ifndef ARY_ACTIONS_HXX
 #define ARY_ACTIONS_HXX
-
-//  VERSION:            Autodoc 2.2
+//  KORR_DEPRECATED_3.0
 
 
 // USED SERVICES
@@ -47,10 +46,7 @@
 
 namespace ary
 {
-namespace n22
-{
     class RepositoryCenter;
-}
 
 
 /*
diff --git a/autodoc/inc/ary/ary_disp.hxx b/autodoc/inc/ary/ary_disp.hxx
index b18546e13549..e7cff9f0b256 100644
--- a/autodoc/inc/ary/ary_disp.hxx
+++ b/autodoc/inc/ary/ary_disp.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ary_disp.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 15:49:18 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 14:37:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,18 +35,25 @@
 
 #ifndef ARY_ARY_DISP_HXX
 #define ARY_ARY_DISP_HXX
+//  KORR_DEPRECATED_3.0
+
 
 // USED SERVICES
     // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
     // COMPONENTS
     // PARAMETERS
-#include <ary/ids.hxx>
+#include <ary/types.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
 
 namespace ary
 {
-    class DisplayGate;
+namespace cpp
+{
+    class Gate;
+}
 
-class Display
+class Display : public csv::ProcessorIfc
 {
   public:
     virtual             ~Display() {}
@@ -57,25 +64,25 @@ class Display
 
     /** This method depends on the result of Get_ReFinder().
         If Get_ReFinder() != 0, then DisplayGate::Find_Re() is called
-        and if valid, RepositoryEntity::StoreAt( *this ) is called.
+        and if valid, cpp::CppEntity::Accept( *this ) is called.
         If Get_ReFinder() == 0, simply do_DisplaySlot_Rid() is called
         with just the id as parameter.
     */
     void                DisplaySlot_Rid(
                             ary::Rid            i_nId );
-    void                DisplaySlot_Lid(
-                            ary::Lid            i_nId );
+//    void                DisplaySlot_Lid(
+//                          ary::Lid            i_nId );
     /** This method depends on the result of Get_ReFinder().
         If Get_ReFinder() != 0, then DisplayGate::Find_Re() is called
-        and if valid, RepositoryEntity::StoreAt( *this ) is called.
+        and if valid, cpp::CppEntity::Accept( *this ) is called.
         If Get_ReFinder() == 0, simply do_DisplaySlot_LocalCe() is called
         with just the id as parameter.
     */
     void                DisplaySlot_LocalCe(
-                            ary::Rid            i_nId,
-                            const udmstri &     i_sName );
+                            ary::cpp::Ce_id     i_nId,
+                            const String  &     i_sName );
     // INQUIRY
-    const DisplayGate * Get_ReFinder() const;
+    const cpp::Gate *   Get_ReFinder() const;
 
   private:
     virtual void        do_StartSlot();
@@ -84,13 +91,11 @@ class Display
 
     virtual void        do_DisplaySlot_Rid(
                             ary::Rid            i_nId );
-    virtual void        do_DisplaySlot_Lid(
-                            ary::Lid            i_nId );
     virtual void        do_DisplaySlot_LocalCe(
-                            ary::Rid            i_nId,
-                            const udmstri &     i_sName );
-    virtual const DisplayGate *
-                        inq_Get_ReFinder() const;
+                            ary::cpp::Ce_id     i_nId,
+                            const String  &     i_sName );
+    virtual const cpp::Gate *
+                        inq_Get_ReFinder() const = 0;
 };
 
 
@@ -103,17 +108,12 @@ Display::StartSlot()
 inline void
 Display::FinishSlot()
     { do_FinishSlot(); }
-inline void
-Display::DisplaySlot_Lid( ary::Lid i_nId )
-    { do_DisplaySlot_Lid( i_nId ); }
-inline const DisplayGate *
+inline const cpp::Gate *
 Display::Get_ReFinder() const
     { return inq_Get_ReFinder(); }
 
 
-} // namespace ary
 
 
+} // namespace ary
 #endif
-
-
diff --git a/autodoc/inc/ary/arygroup.hxx b/autodoc/inc/ary/arygroup.hxx
index 2cec5885ebb9..fdec3ef51bd9 100644
--- a/autodoc/inc/ary/arygroup.hxx
+++ b/autodoc/inc/ary/arygroup.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: arygroup.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 15:49:33 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 14:37:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,23 +35,37 @@
 
 #ifndef ARY_ARYGROUP_HXX
 #define ARY_ARYGROUP_HXX
+//  KORR_DEPRECATED_3.0
 
 
 // USED SERVICES
     // BASE CLASSES
-    // COMPONENTS
-    // PARAMETERS
-#include <ary/ids.hxx>
+    // OTHER
+#include <ary/types.hxx>
+
 
 namespace ary
 {
-    class RepositoryEntity;
-    class Slot;
+namespace cpp
+{
+    class CppEntity;
+}
+
+class Slot;
 
 namespace group
 {
     typedef std::vector< SlotAccessId > SlotList;
 }
+}
+
+
+
+
+namespace ary
+{
+
+
 
 class AryGroup
 {
@@ -61,7 +75,7 @@ class AryGroup
 
     // INQUIRY
     Gid                 Id_Group() const;
-    const RepositoryEntity &
+    const cpp::CppEntity &
                         RE_Group() const;
     const group::SlotList &
                         Slots() const;
@@ -71,7 +85,7 @@ class AryGroup
 
   private:
     virtual Gid         inq_Id_Group() const = 0;
-    virtual const RepositoryEntity &
+    virtual const cpp::CppEntity &
                         inq_RE_Group() const = 0;
     virtual const group::SlotList &
                         inq_Slots() const = 0;
@@ -80,12 +94,12 @@ class AryGroup
 };
 
 
-// IMPLEMENTATION
 
+// IMPLEMENTATION
 inline Gid
 AryGroup::Id_Group() const
     { return inq_Id_Group(); }
-inline const RepositoryEntity &
+inline const cpp::CppEntity &
 AryGroup::RE_Group() const
     { return inq_RE_Group(); }
 inline const group::SlotList &
@@ -98,9 +112,4 @@ AryGroup::Create_Slot( SlotAccessId i_nSlot ) const
 
 
 }   // namespace ary
-
-
 #endif
-
-
-
diff --git a/autodoc/inc/ary/ceslot.hxx b/autodoc/inc/ary/ceslot.hxx
index d826f3a437ad..35604a04e7e5 100644
--- a/autodoc/inc/ary/ceslot.hxx
+++ b/autodoc/inc/ary/ceslot.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ceslot.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 15:50:09 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 14:37:43 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,6 +35,7 @@
 
 #ifndef ARY_CESLOT_HXX
 #define ARY_CESLOT_HXX
+//  KORR_DEPRECATED_3.0
 
 
 // USED SERVICES
@@ -104,36 +105,7 @@ class Slot_AutoPtr
 };
 
 
-#if 0
-/*
-class CeIteratingSlot
-{
-  public:
-
-    // LIFECYCLE
-    virtual             ~CeIteratingSlot() {}
-
-    // OPERATORS
-    virtual CeIteratingSlot &
-                        operator++() = 0;
-    virtual             operator bool() const = 0;
-
-    // OPERATIONS
-    virtual void        Start() = 0;
-    virtual void        StoreCurrentElementAt(
-                            Display &           o_rDestination ) const = 0;
-  private:
-    // Forbidden
-    void                operator++(int) const {}
-};
-*/
-#endif // 0
 
 
 }   // namespace ary
-
-
 #endif
-
-
-
diff --git a/autodoc/inc/ary/qualiname.hxx b/autodoc/inc/ary/qualiname.hxx
index 3a364baeafdc..2165549dd4f4 100644
--- a/autodoc/inc/ary/qualiname.hxx
+++ b/autodoc/inc/ary/qualiname.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: qualiname.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 15:54:46 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 14:42:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,14 +36,13 @@
 #ifndef ARY_QUALINAME_HXX
 #define ARY_QUALINAME_HXX
 
-//  VERSION:            Autodoc 2.2
 
 
 // USED SERVICES
     // BASE CLASSES
     // COMPONENTS
     // PARAMETERS
-#include <cosv/template/tpltools.hxx>
+#include <cosv/tpl/tpltools.hxx>
 
 
 namespace ary
@@ -105,12 +104,8 @@ class QualifiedName
     bool                bIsFunction;            /// true := ending with "()"
 };
 
-// IMPLEMENTATION
-
-
-}   // namespace ary
 
 
 
+}   // namespace ary
 #endif
-