diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 14:11:28 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 14:11:28 +0000 |
commit | 450a0c7180da359951b060c23dfa74f4e170907d (patch) | |
tree | d9134c035f2d2f96a548f60b7bb07165ba4a9a60 | |
parent | 2e9c59953338d4f87c1799bd82916301ca471a3a (diff) |
INTEGRATION: CWS adc18 (1.3.56); FILE MERGED
2007/10/18 13:06:36 np 1.3.56.1: #i81775#
-rw-r--r-- | autodoc/inc/ary/idl/i_attribute.hxx | 32 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_ce2s.hxx | 8 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_comrela.hxx | 38 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_constant.hxx | 42 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_function.hxx | 34 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_interface.hxx | 39 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_namelookup.hxx | 34 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_property.hxx | 37 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_service.hxx | 47 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_siservice.hxx | 33 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_sisingleton.hxx | 35 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_struct.hxx | 34 | ||||
-rw-r--r-- | autodoc/inc/ary/idl/i_structelem.hxx | 35 |
13 files changed, 205 insertions, 243 deletions
diff --git a/autodoc/inc/ary/idl/i_attribute.hxx b/autodoc/inc/ary/idl/i_attribute.hxx index 951da6ff008b..26555f41bd41 100644 --- a/autodoc/inc/ary/idl/i_attribute.hxx +++ b/autodoc/inc/ary/idl/i_attribute.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_attribute.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:06:00 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:05:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,26 +36,23 @@ #ifndef ARY_IDL_I_ATTRIBUTE_HXX #define ARY_IDL_I_ATTRIBUTE_HXX - -// USED SERVICES - // BASE CLASSES +// BASE CLASSES #include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS + + namespace ary { namespace idl { - namespace ifc_attribute { struct attr; } -/* OPEN? -*/ + + /** @resp Represents an IDL property. @@ -86,11 +83,13 @@ class Attribute : public CodeEntity bool IsBound() const; private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -114,8 +113,8 @@ class Attribute : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline void Attribute::Add_GetException( Type_id i_nException ) { aGetExceptions.push_back(i_nException); } @@ -136,8 +135,9 @@ inline bool Attribute::IsBound() const { return bBound; } -} // namespace idl -} // namespace ary + +} // namespace idl +} // namespace ary #endif diff --git a/autodoc/inc/ary/idl/i_ce2s.hxx b/autodoc/inc/ary/idl/i_ce2s.hxx index f593f8869aba..68cda8c034d7 100644 --- a/autodoc/inc/ary/idl/i_ce2s.hxx +++ b/autodoc/inc/ary/idl/i_ce2s.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_ce2s.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:06:33 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:05:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,7 @@ // BASE CLASSES // COMPONENTS // PARAMETERS -#include <ary/idl/i_language.hxx> +#include <ary/idl/i_types4idl.hxx> namespace ary @@ -61,7 +61,7 @@ class Ce_2s virtual ~Ce_2s(); static DYN Ce_2s * Create_( - RCid i_nCeClass ); + ClassId i_nCeClass ); // OPERATIONS void Add_Link2DescriptionInManual( const String & i_link, diff --git a/autodoc/inc/ary/idl/i_comrela.hxx b/autodoc/inc/ary/idl/i_comrela.hxx index ff60cd62fb04..917bd00181a9 100644 --- a/autodoc/inc/ary/idl/i_comrela.hxx +++ b/autodoc/inc/ary/idl/i_comrela.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_comrela.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:06:49 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:06:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,21 +36,22 @@ #ifndef ARY_IDL_I_COMRELA_HXX #define ARY_IDL_I_COMRELA_HXX - // USED SERVICES - // BASE CLASSES - // COMPONENTS - // PARAMETERS -#include <ary/idl/i_language.hxx> - +#include <ary/idl/i_types4idl.hxx> namespace ary { - namespace info - { - class CodeInformation; - } +namespace doc +{ + class OldIdlDocu; +} +} + + + +namespace ary +{ namespace idl { @@ -65,26 +66,23 @@ class CommentedRelation CommentedRelation( Type_id i_nType, - info::CodeInformation * - i_pInfo ) + doc::OldIdlDocu * i_pInfo ) : nType(i_nType), pInfo(i_pInfo) {} // INQUIRY Type_id Type() const { return nType; } - info::CodeInformation * - Info() const { return pInfo; } + doc::OldIdlDocu * Info() const { return pInfo; } private: // DATA Type_id nType; - info::CodeInformation * - pInfo; + doc::OldIdlDocu * pInfo; }; -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif diff --git a/autodoc/inc/ary/idl/i_constant.hxx b/autodoc/inc/ary/idl/i_constant.hxx index e91c3094a6fe..1bc83cd30848 100644 --- a/autodoc/inc/ary/idl/i_constant.hxx +++ b/autodoc/inc/ary/idl/i_constant.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_constant.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:07:14 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:06:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,30 +36,23 @@ #ifndef ARY_IDL_I_CONSTANT_HXX #define ARY_IDL_I_CONSTANT_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { namespace idl { - namespace ifc_constant { -struct attr; + struct attr; } -/* OPEN? -*/ -/** @resp - Represents an IDL constant. +/** Represents an IDL constant. */ class Constant : public CodeEntity { @@ -80,11 +73,13 @@ class Constant : public CodeEntity private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -103,20 +98,23 @@ class Constant : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline Type_id Constant::Type() const - { return nType; } +{ + return nType; +} inline const String & Constant::Value() const - { return sInitValue; } +{ + return sInitValue; +} -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif - diff --git a/autodoc/inc/ary/idl/i_function.hxx b/autodoc/inc/ary/idl/i_function.hxx index 56c2646f60b6..a9a85d6e26f3 100644 --- a/autodoc/inc/ary/idl/i_function.hxx +++ b/autodoc/inc/ary/idl/i_function.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_function.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:08:49 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:07:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,32 +36,25 @@ #ifndef ARY_IDL_I_FUNCTION_HXX #define ARY_IDL_I_FUNCTION_HXX - +// BASE CLASSES +#include <ary/idl/i_ce.hxx> // USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS #include <ary/idl/i_param.hxx> - // PARAMETERS #include <ary/idl/ik_function.hxx> #include <ary/stdconstiter.hxx> + namespace ary { namespace idl { -/* OPEN? -*/ - -/** @resp - Represents an IDL function. +/** Represents an IDL function. - @descr Special case constructor: Constructors have return type "0". */ @@ -108,11 +101,13 @@ class Function : public CodeEntity bool HasEllipse() const { return bEllipse; } private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -135,8 +130,8 @@ class Function : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline void Function::Add_Parameter( const String & i_sName, Type_id i_nType, @@ -167,10 +162,7 @@ Function::IsOneway() const + } // namespace idl } // namespace ary - - - #endif - diff --git a/autodoc/inc/ary/idl/i_interface.hxx b/autodoc/inc/ary/idl/i_interface.hxx index ad120ca5f167..4ded939b5872 100644 --- a/autodoc/inc/ary/idl/i_interface.hxx +++ b/autodoc/inc/ary/idl/i_interface.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_interface.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:09:29 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:08:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,17 +36,16 @@ #ifndef ARY_IDL_I_INTERFACE_HXX #define ARY_IDL_I_INTERFACE_HXX - +// BASE CLASSES +#include <ary/idl/i_ce.hxx> // USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS #include <ary/idl/i_comrela.hxx> - // PARAMETERS #include <ary/stdconstiter.hxx> + + namespace ary { namespace idl @@ -55,11 +54,10 @@ namespace ifc_interface { struct attr; } + class Interface_2s; -class Interface_2s; -/** @resp - Represents an IDL interface. +/** Represents an IDL interface. */ class Interface : public CodeEntity { @@ -81,15 +79,17 @@ class Interface : public CodeEntity Ce_id i_nId ); void Add_Base( Type_id i_nInterface, - DYN info::CodeInformation * + DYN doc::OldIdlDocu * pass_dpDocu ); private: - // Interface ary::RepositoryEntity: - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity: - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -111,8 +111,8 @@ class Interface : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline bool Interface::HasBase() const { return aBases.size() > 0; } @@ -123,12 +123,13 @@ inline void Interface::Add_Attribute( Ce_id i_nId ) { aAttributes.push_back(i_nId); } inline void -Interface::Add_Base( Type_id i_nInterface, - DYN info::CodeInformation * pass_dpDocu ) +Interface::Add_Base( Type_id i_nInterface, + DYN doc::OldIdlDocu * pass_dpDocu ) { aBases.push_back( CommentedRelation(i_nInterface, pass_dpDocu) ); } -} // namespace idl -} // namespace ary + +} // namespace idl +} // namespace ary #endif diff --git a/autodoc/inc/ary/idl/i_namelookup.hxx b/autodoc/inc/ary/idl/i_namelookup.hxx index a8e9790648a6..78bd1b2f7fc7 100644 --- a/autodoc/inc/ary/idl/i_namelookup.hxx +++ b/autodoc/inc/ary/idl/i_namelookup.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_namelookup.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:10:26 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:09:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,33 +36,26 @@ #ifndef ARY_IDL_I_NAMELOOKUP_HXX #define ARY_IDL_I_NAMELOOKUP_HXX +// BASE CLASSES +#include <ary/idl/i_types4idl.hxx> // USED SERVICES - // BASE CLASSES -#include <ary/idl/i_language.hxx> - // COMPONENTS - // PARAMETERS #include <ary/stdconstiter.hxx> #include <ary/itrange.hxx> #include <vector> #include <map> + + namespace ary { - namespace idl { -/* OPEN? -*/ - -/** @resp - This class finds all occurrences in the current language of a +/** This class finds all occurrences in the current language of a name in the repository. - - @descr */ class NameLookup { @@ -75,13 +68,13 @@ class NameLookup nOwner(0) {} NameProperties( Ce_id i_id, - RCid i_class, + ClassId i_class, Ce_id i_owner ) : nId(i_id), nClass(i_class), nOwner(i_owner) {} Ce_id nId; - RCid nClass; + ClassId nClass; Ce_id nOwner; }; @@ -95,14 +88,14 @@ class NameLookup void Add_Name( const String & i_name, Ce_id i_id, - RCid i_class, + ClassId i_class, Ce_id i_owner ); // INQUIRY /** */ bool Has_Name( const String & i_name, - RCid i_class, + ClassId i_class, Ce_id i_owner ) const; void Get_Names( Dyn_StdConstIterator<Map_Names::value_type> & @@ -115,12 +108,7 @@ class NameLookup -// IMPLEMENTATION - } // namespace idl } // namespace ary - - #endif - diff --git a/autodoc/inc/ary/idl/i_property.hxx b/autodoc/inc/ary/idl/i_property.hxx index acb076cc1db6..bb93fb192a6b 100644 --- a/autodoc/inc/ary/idl/i_property.hxx +++ b/autodoc/inc/ary/idl/i_property.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_property.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:11:01 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:09:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,30 +36,23 @@ #ifndef ARY_IDL_I_PROPERTY_HXX #define ARY_IDL_I_PROPERTY_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { namespace idl { - namespace ifc_property { struct attr; } -/* OPEN? -*/ -/** @resp - Represents an IDL property. +/** Represents an IDL property. */ class Property : public CodeEntity { @@ -117,11 +110,13 @@ class Property : public CodeEntity Type_id Type() const; private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -140,15 +135,17 @@ class Property : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline Type_id Property::Type() const - { return nType; } +{ + return nType; +} -} // namespace idl -} // namespace ary -#endif +} // namespace idl +} // namespace ary +#endif diff --git a/autodoc/inc/ary/idl/i_service.hxx b/autodoc/inc/ary/idl/i_service.hxx index 74fb00479ba7..2100eb164b15 100644 --- a/autodoc/inc/ary/idl/i_service.hxx +++ b/autodoc/inc/ary/idl/i_service.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_service.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:11:17 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:10:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,17 +36,17 @@ #ifndef ARY_IDL_I_SERVICE_HXX #define ARY_IDL_I_SERVICE_HXX - +// BASE CLASSES +#include <ary/idl/i_ce.hxx> // USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS #include <ary/idl/i_comrela.hxx> - // PARAMETERS #include <ary/stdconstiter.hxx> #include <ary/idl/ik_service.hxx> + + + namespace ary { namespace info @@ -61,11 +61,7 @@ namespace ifc_service } -/* OPEN? -*/ - -/** @resp - Represents an IDL service. +/** Represents an IDL service. */ class Service : public CodeEntity { @@ -91,18 +87,20 @@ class Service : public CodeEntity Ce_id i_nProperty ); void AddRef_IncludedService( Type_id i_nService, - DYN info::CodeInformation * + DYN doc::OldIdlDocu * pass_dpDocu ); void AddRef_SupportedInterface( Type_id i_nInterface, - DYN info::CodeInformation * + DYN doc::OldIdlDocu * pass_dpDocu ); private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -124,27 +122,26 @@ class Service : public CodeEntity -// IMPLEMENTATION - +// IMPLEMENTATION inline void Service::Add_Property( Ce_id i_nProperty ) { aProperties.push_back(i_nProperty); } inline void -Service::AddRef_IncludedService( Type_id i_nService, - DYN info::CodeInformation * pass_dpDocu ) +Service::AddRef_IncludedService( Type_id i_nService, + DYN doc::OldIdlDocu * pass_dpDocu ) { aIncludedServices.push_back( CommentedRelation(i_nService, pass_dpDocu) ); } inline void -Service::AddRef_SupportedInterface( Type_id i_nInterface, - DYN info::CodeInformation * pass_dpDocu ) +Service::AddRef_SupportedInterface( Type_id i_nInterface, + DYN doc::OldIdlDocu * pass_dpDocu ) { aSupportedInterfaces.push_back( CommentedRelation(i_nInterface, pass_dpDocu) ); } -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif diff --git a/autodoc/inc/ary/idl/i_siservice.hxx b/autodoc/inc/ary/idl/i_siservice.hxx index b63c5c85237b..8cc213c4f156 100644 --- a/autodoc/inc/ary/idl/i_siservice.hxx +++ b/autodoc/inc/ary/idl/i_siservice.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_siservice.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:11:48 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:10:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,13 +36,11 @@ #ifndef ARY_IDL_I_SISERVICE_HXX #define ARY_IDL_I_SISERVICE_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> + -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { @@ -54,8 +52,7 @@ namespace ifc_sglifcservice } -/** @resp - Represents an IDL single interface service. +/** Represents an IDL single interface service. */ class SglIfcService : public CodeEntity { @@ -76,11 +73,13 @@ class SglIfcService : public CodeEntity Type_id BaseInterface() const { return nBaseInterface; } private: - // Interface ary::RepositoryEntity: - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity: - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -100,15 +99,17 @@ class SglIfcService : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline void SglIfcService::Add_Constructor( Ce_id i_nId ) - { aConstructors.push_back(i_nId); } +{ + aConstructors.push_back(i_nId); +} -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif diff --git a/autodoc/inc/ary/idl/i_sisingleton.hxx b/autodoc/inc/ary/idl/i_sisingleton.hxx index db972c46eec5..5e85f1dc87cb 100644 --- a/autodoc/inc/ary/idl/i_sisingleton.hxx +++ b/autodoc/inc/ary/idl/i_sisingleton.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_sisingleton.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:12:03 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:10:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,27 +36,23 @@ #ifndef ARY_IDL_I_SISINGLETON_HXX #define ARY_IDL_I_SISINGLETON_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> + -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { namespace idl { - namespace ifc_sglifcsingleton { struct attr; } -/** @resp - Represents an IDL interface. +/** Represents an IDL interface. */ class SglIfcSingleton : public CodeEntity { @@ -72,13 +68,14 @@ class SglIfcSingleton : public CodeEntity // INQUIRY Type_id BaseInterface() const; - private: - // Interface ary::RepositoryEntity: - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity: - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -95,15 +92,17 @@ class SglIfcSingleton : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline Type_id SglIfcSingleton::BaseInterface() const - { return nBaseInterface; } +{ + return nBaseInterface; +} -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif diff --git a/autodoc/inc/ary/idl/i_struct.hxx b/autodoc/inc/ary/idl/i_struct.hxx index 5de031d68fd5..822505f53115 100644 --- a/autodoc/inc/ary/idl/i_struct.hxx +++ b/autodoc/inc/ary/idl/i_struct.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_struct.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:12:18 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:11:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,28 +36,23 @@ #ifndef ARY_IDL_I_STRUCT_HXX #define ARY_IDL_I_STRUCT_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { namespace idl { - namespace ifc_struct { struct attr; } -/** @resp - Represents an IDL struct. +/** Represents an IDL struct. */ class Struct : public CodeEntity { @@ -69,9 +64,8 @@ class Struct : public CodeEntity const String & i_sName, Ce_id i_nOwner, Type_id i_nBase, - const String & i_sTemplateParameter, // = String::Null_() // First let the compiler find old calls to this function - Type_id i_nTemplateParameterType - ); + const String & i_sTemplateParameter, + Type_id i_nTemplateParameterType ); ~Struct(); // INQUIRY Type_id Base() const; @@ -82,11 +76,13 @@ class Struct : public CodeEntity void Add_Member( Ce_id i_nMember ); private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -108,8 +104,8 @@ class Struct : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline Type_id Struct::Base() const { @@ -135,8 +131,8 @@ Struct::Add_Member( Ce_id i_nMember ) } -} // namespace idl -} // namespace ary +} // namespace idl +} // namespace ary #endif diff --git a/autodoc/inc/ary/idl/i_structelem.hxx b/autodoc/inc/ary/idl/i_structelem.hxx index dea0897bd62c..52c6c6b7a903 100644 --- a/autodoc/inc/ary/idl/i_structelem.hxx +++ b/autodoc/inc/ary/idl/i_structelem.hxx @@ -4,9 +4,9 @@ * * $RCSfile: i_structelem.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 16:12:36 $ + * last change: $Author: hr $ $Date: 2007-11-02 15:11:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,31 +36,23 @@ #ifndef ARY_IDL_I_STRUCTELEM_HXX #define ARY_IDL_I_STRUCTELEM_HXX +// BASE CLASSES +#include <ary/idl/i_ce.hxx> -// USED SERVICES - // BASE CLASSES -#include <ary/idl/i_ce.hxx> - // COMPONENTS - // PARAMETERS namespace ary { namespace idl { - namespace ifc_structelement { struct attr; } -/* OPEN? -*/ - -/** @resp - Represents an IDL struct element. +/** Represents an IDL struct element. */ class StructElement : public CodeEntity { @@ -79,11 +71,13 @@ class StructElement : public CodeEntity Type_id Type() const; private: - // Interface ary::RepositoryEntity - virtual RCid inq_ClassId() const; + // Interface csv::ConstProcessorClient: + virtual void do_Accept( + csv::ProcessorIfc & io_processor ) const; + // Interface ary::Object: + virtual ClassId get_AryClass() const; // Interface CodeEntity - virtual void do_Visit_CeHost(CeHost & o_rHost) const; virtual const String & inq_LocalName() const; virtual Ce_id inq_NameRoom() const; virtual Ce_id inq_Owner() const; @@ -101,16 +95,17 @@ class StructElement : public CodeEntity -// IMPLEMENTATION +// IMPLEMENTATION inline Type_id StructElement::Type() const - { return nType; } +{ + return nType; +} + } // namespace idl } // namespace ary - - #endif |