summaryrefslogtreecommitdiff
path: root/autodoc/source
diff options
context:
space:
mode:
Diffstat (limited to 'autodoc/source')
-rw-r--r--autodoc/source/display/html/aryattrs.hxx81
-rw-r--r--autodoc/source/display/html/cre_link.hxx68
-rw-r--r--autodoc/source/display/html/dsply_cl.hxx46
-rw-r--r--autodoc/source/display/html/dsply_da.hxx33
-rw-r--r--autodoc/source/display/html/dsply_op.hxx38
-rw-r--r--autodoc/source/display/html/hd_chlst.hxx73
6 files changed, 173 insertions, 166 deletions
diff --git a/autodoc/source/display/html/aryattrs.hxx b/autodoc/source/display/html/aryattrs.hxx
index 487285ea3fb8f..c8fc981b13e85 100644
--- a/autodoc/source/display/html/aryattrs.hxx
+++ b/autodoc/source/display/html/aryattrs.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: aryattrs.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 17:24:13 $
+ * last change: $Author: hr $ $Date: 2007-11-02 16:23:41 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,65 +36,65 @@
#ifndef ADC_DISPLAY_ARYATTRS_HXX
#define ADC_DISPLAY_ARYATTRS_HXX
-
-
// USED SERVICES
- // BASE CLASSES
- // COMPONENTS
- // PARAMETERS
-#include <ary/ids.hxx>
-#include <ary/cpp/c_etypes.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/doc/d_docu.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
namespace ary
{
namespace cpp
{
+ class CodeEntity;
class Class;
class DisplayGate;
class Function;
class Namespace;
}
- class CodeEntity;
}
+
+
+
const char * Get_ClassTypeKey(
- const ary::cpp::Class &
- i_rClass );
+ const ary::cpp::Class & i_rClass );
const char * Get_TypeKey(
- const ary::CodeEntity &
- i_rCe );
+ const ary::cpp::CodeEntity &
+ i_rCe );
bool Ce_IsInternal(
- const ary::CodeEntity &
- i_rCe );
+ const ary::cpp::CodeEntity &
+ i_rCe );
const char * Namespace_DisplayName(
const ary::cpp::Namespace &
- i_rNsp );
+ i_rNsp );
const char * TypeText(
- ary::Tid i_nId,
- const ary::cpp::DisplayGate &
- i_rAryGate );
+ ary::cpp::Type_id i_nId,
+ const ary::cpp::Gate & i_rAryGate );
const char * SyntaxText_PreName(
const ary::cpp::Function &
i_rFunction,
- const ary::cpp::DisplayGate &
- i_rAryGate );
+ const ary::cpp::Gate & i_rAryGate );
const char * SyntaxText_PostName(
const ary::cpp::Function &
i_rFunction,
- const ary::cpp::DisplayGate &
- i_rAryGate );
+ const ary::cpp::Gate & i_rAryGate );
bool Get_TypeText(
const char * & o_rPreName,
const char * & o_rName,
const char * & o_rPostName,
- ary::Tid i_nTypeid,
- const ary::cpp::DisplayGate &
- i_rAryGate );
+ ary::cpp::Type_id i_nTypeid,
+ const ary::cpp::Gate & i_rAryGate );
+
+inline const ary::doc::OldCppDocu *
+Get_CppDocu(const ary::doc::Documentation & i_doc)
+{
+ return dynamic_cast< const ary::doc::OldCppDocu* >(i_doc.Data());
+}
class FunctionParam_Iterator
@@ -109,19 +109,18 @@ class FunctionParam_Iterator
void Assign(
const ary::cpp::Function &
- i_rFunction,
- const ary::cpp::DisplayGate &
- i_rAryGate );
+ i_rFunction );
- ary::Tid CurType() const;
- const udmstri & CurName() const;
+ ary::cpp::Type_id
+ CurType() const;
+ const String & CurName() const;
bool IsFunctionConst() const;
bool IsFunctionVolatile() const;
private:
- typedef std::vector<ary::Tid>::const_iterator Type_Iterator;
- typedef StringVector::const_iterator Name_Iterator;
+ typedef std::vector<ary::cpp::Type_id>::const_iterator Type_Iterator;
+ typedef StringVector::const_iterator Name_Iterator;
bool IsValid() const;
@@ -137,6 +136,10 @@ class FunctionParam_Iterator
ary::cpp::E_ConVol eConVol;
};
+
+
+
+// IMPLEMENTATION
inline
FunctionParam_Iterator::operator bool() const
{ return IsValid(); }
@@ -149,12 +152,12 @@ FunctionParam_Iterator::IsValid() const
return itTypes != itTypes_end;
}
-inline ary::Tid
+inline ary::cpp::Type_id
FunctionParam_Iterator::CurType() const
- { return IsValid() ? *itTypes : 0; }
-inline const udmstri &
+ { return IsValid() ? *itTypes : ary::cpp::Type_id(0); }
+inline const String &
FunctionParam_Iterator::CurName() const
- { return IsValid() ? *itNames_andMore : udmstri::Null_(); }
+ { return IsValid() ? *itNames_andMore : String::Null_(); }
inline bool
FunctionParam_Iterator::IsFunctionConst() const
{ return (eConVol & ary::cpp::CONVOL_const) != 0; }
@@ -163,6 +166,6 @@ FunctionParam_Iterator::IsFunctionVolatile() const
{ return (eConVol & ary::cpp::CONVOL_volatile) != 0; }
-#endif
+#endif
diff --git a/autodoc/source/display/html/cre_link.hxx b/autodoc/source/display/html/cre_link.hxx
index 163454742006a..1fc13111a6a53 100644
--- a/autodoc/source/display/html/cre_link.hxx
+++ b/autodoc/source/display/html/cre_link.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: cre_link.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 17:25:23 $
+ * last change: $Author: hr $ $Date: 2007-11-02 16:24:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -39,19 +39,44 @@
// USED SERVICES
// BASE CLASSES
-#include <ary/cpp/cpp_disp.hxx>
+#include <cosv/tpl/processor.hxx>
// COMPONENTS
// PARAMETERS
namespace ary
{
+namespace cpp
+{
class CodeEntity;
+ class Namespace;
+ class Class;
+ class Enum;
+ class Typedef;
+ class Function;
+ class Variable;
+ class EnumValue;
+ class Define;
+ class Macro;
+}
}
class OuputPage_Environment;
-class LinkCreator : public ary::cpp::Display
+
+
+/** Displays links to ->{ary::cpp::CodeEntity CodeEntites}.
+*/
+class LinkCreator : public csv::ProcessorIfc,
+ public csv::ConstProcessor<ary::cpp::Namespace>,
+ public csv::ConstProcessor<ary::cpp::Class>,
+ public csv::ConstProcessor<ary::cpp::Enum>,
+ public csv::ConstProcessor<ary::cpp::Typedef>,
+ public csv::ConstProcessor<ary::cpp::Function>,
+ public csv::ConstProcessor<ary::cpp::Variable>,
+ public csv::ConstProcessor<ary::cpp::EnumValue>,
+ public csv::ConstProcessor<ary::cpp::Define>,
+ public csv::ConstProcessor<ary::cpp::Macro>
{
public:
LinkCreator(
@@ -63,41 +88,38 @@ class LinkCreator : public ary::cpp::Display
void SetEnv(
const OuputPage_Environment &
i_rEnv );
-
- virtual void Display_Namespace(
+ private:
+ void Create_PrePath(
+ const ary::cpp::CodeEntity &
+ i_rData );
+ // Interface csv::ConstProcessor<>
+ virtual void do_Process(
const ary::cpp::Namespace &
i_rData );
- virtual void Display_Class(
+ virtual void do_Process(
const ary::cpp::Class &
i_rData );
- virtual void Display_Enum(
+ virtual void do_Process(
const ary::cpp::Enum &
i_rData );
- virtual void Display_Typedef(
+ virtual void do_Process(
const ary::cpp::Typedef &
i_rData );
- virtual void Display_Function(
+ virtual void do_Process(
const ary::cpp::Function &
i_rData );
- virtual void Display_Variable(
+ virtual void do_Process(
const ary::cpp::Variable &
i_rData );
- virtual void Display_EnumValue(
+ virtual void do_Process(
const ary::cpp::EnumValue &
i_rData );
-
- virtual void Display_Define(
+ virtual void do_Process(
const ary::cpp::Define &
i_rData );
- virtual void Display_Macro(
+ virtual void do_Process(
const ary::cpp::Macro &
i_rData );
-
- private:
- void Create_PrePath(
- const ary::CodeEntity &
- i_rData );
-
// DATA
char * pOut;
uintt nOutMaxSize;
@@ -106,8 +128,9 @@ class LinkCreator : public ary::cpp::Display
};
-// IMPLEMENTATION
+
+// IMPLEMENTATION
inline void
LinkCreator::SetEnv( const OuputPage_Environment & i_rEnv )
{ pEnv = &i_rEnv; }
@@ -116,4 +139,3 @@ LinkCreator::SetEnv( const OuputPage_Environment & i_rEnv )
#endif
-
diff --git a/autodoc/source/display/html/dsply_cl.hxx b/autodoc/source/display/html/dsply_cl.hxx
index 13125fee7797b..64c0c397d12c8 100644
--- a/autodoc/source/display/html/dsply_cl.hxx
+++ b/autodoc/source/display/html/dsply_cl.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: dsply_cl.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 17:26:03 $
+ * last change: $Author: hr $ $Date: 2007-11-02 16:25:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,32 +36,29 @@
#ifndef ADC_DISPLAY_HTML_HD_PAGE_HXX
#define ADC_DISPLAY_HTML_HD_PAGE_HXX
-
-
-// USED SERVICES
- // BASE CLASSES
+// BASE CLASSES
#include <ary/ary_disp.hxx>
-#include <ary/cpp/cpp_disp.hxx>
- // COMPONENTS
- // PARAMETERS
-#include <ary/idlists.hxx>
-
-
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <ary/types.hxx>
class OuputPage_Environment;
namespace ary
{
- namespace cpp
- {
- class Class;
- }
+namespace cpp
+{
+ class Class;
+}
}
-
class PageDisplay;
-class ClassDisplayer : public ary::cpp::Display
+
+
+
+class ClassDisplayer : public ary::Display,
+ public csv::ConstProcessor<ary::cpp::Class>
{
public:
ClassDisplayer( // TODO
@@ -69,12 +66,13 @@ class ClassDisplayer : public ary::cpp::Display
io_rEnv );
virtual ~ClassDisplayer();
- virtual void Display_Class(
- const ary::cpp::Class &
- i_rData );
private:
- // Interface ary::cpp::Display:
- virtual const ary::DisplayGate *
+ // Interface csv::ConstProcessor<>:
+ virtual void do_Process(
+ const ary::cpp::Class &
+ i_data );
+ // Interface ary::Display:
+ virtual const ary::cpp::Gate *
inq_Get_ReFinder() const;
// Locals
@@ -93,5 +91,5 @@ class ClassDisplayer : public ary::cpp::Display
-#endif
+#endif
diff --git a/autodoc/source/display/html/dsply_da.hxx b/autodoc/source/display/html/dsply_da.hxx
index 6692a6bef1701..34f4513fc3b18 100644
--- a/autodoc/source/display/html/dsply_da.hxx
+++ b/autodoc/source/display/html/dsply_da.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: dsply_da.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 17:26:35 $
+ * last change: $Author: hr $ $Date: 2007-11-02 16:25:33 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,14 +36,11 @@
#ifndef ADC_DISPLAY_HTML_DSPLY_DA_HXX
#define ADC_DISPLAY_HTML_DSPLY_DA_HXX
-
-
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
// USED SERVICES
- // BASE CLASSES
-#include <ary/cpp/cpp_disp.hxx>
- // COMPONENTS
- // PARAMETERS
-
+#include <ary/cpp/c_ce.hxx>
namespace ary
{
@@ -61,11 +58,14 @@ namespace csi
}
+
+
class OuputPage_Environment;
class PageDisplay;
class Docu_Display;
-class DataDisplay : public ary::cpp::Display
+class DataDisplay : public ary::Display,
+ public csv::ConstProcessor<ary::cpp::Variable>
{
public:
DataDisplay(
@@ -73,9 +73,6 @@ class DataDisplay : public ary::cpp::Display
io_rInfo );
virtual ~DataDisplay();
- virtual void Display_Variable(
- const ary::cpp::Variable &
- i_rData );
void PrepareForConstants();
void PrepareForVariables();
void PrepareForStdMembers();
@@ -84,12 +81,16 @@ class DataDisplay : public ary::cpp::Display
void Create_Files();
private:
+ // Interface csv::ConstProcessor<>:
+ virtual void do_Process(
+ const ary::cpp::Variable &
+ i_rData );
// Interface ary::cpp::Display:
- virtual const ary::DisplayGate *
+ virtual const ary::cpp::Gate *
inq_Get_ReFinder() const;
// Locals
- typedef ary::Lid SourceFileId;
+ typedef ary::cpp::Lid SourceFileId;
typedef std::map< SourceFileId, DYN PageDisplay* > Map_FileId2PagePtr;
PageDisplay & FindPage_for(
@@ -110,5 +111,5 @@ class DataDisplay : public ary::cpp::Display
-#endif
+#endif
diff --git a/autodoc/source/display/html/dsply_op.hxx b/autodoc/source/display/html/dsply_op.hxx
index 59ac1f9a65cb4..a0716f879695c 100644
--- a/autodoc/source/display/html/dsply_op.hxx
+++ b/autodoc/source/display/html/dsply_op.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: dsply_op.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 17:27:16 $
+ * last change: $Author: hr $ $Date: 2007-11-02 16:26:09 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,14 +36,11 @@
#ifndef ADC_DISPLAY_HTML_DSPLY_OP_HXX
#define ADC_DISPLAY_HTML_DSPLY_OP_HXX
-
-
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
// USED SERVICES
- // BASE CLASSES
-#include <ary/cpp/cpp_disp.hxx>
- // COMPONENTS
- // PARAMETERS
-
+#include <ary/cpp/c_ce.hxx>
namespace ary
{
@@ -60,13 +57,15 @@ namespace csi
}
}
-
class OuputPage_Environment;
class PageDisplay;
class Docu_Display;
-class OperationsDisplay : public ary::cpp::Display
+
+
+class OperationsDisplay : public ary::Display,
+ public csv::ConstProcessor<ary::cpp::Function>
{
public:
OperationsDisplay(
@@ -74,23 +73,22 @@ class OperationsDisplay : public ary::cpp::Display
io_rInfo );
virtual ~OperationsDisplay();
-
- virtual void Display_Function(
- const ary::cpp::Function &
- i_rData );
-
void PrepareForGlobals();
void PrepareForStdMembers();
void PrepareForStaticMembers();
void Create_Files();
private:
- // Interface ary::cpp::Display:
- virtual const ary::DisplayGate *
+ // Interface csv::ConstProcessor<>:
+ virtual void do_Process(
+ const ary::cpp::Function &
+ i_rData );
+ // Interface ary::Display:
+ virtual const ary::cpp::Gate *
inq_Get_ReFinder() const;
// Locals
- typedef ary::Lid SourceFileId;
+ typedef ary::cpp::Lid SourceFileId;
typedef std::map< SourceFileId, DYN PageDisplay* > Map_FileId2PagePtr;
PageDisplay & FindPage_for(
@@ -111,5 +109,5 @@ class OperationsDisplay : public ary::cpp::Display
-#endif
+#endif
diff --git a/autodoc/source/display/html/hd_chlst.hxx b/autodoc/source/display/html/hd_chlst.hxx
index ad5a7469911e0..94b6fd718db55 100644
--- a/autodoc/source/display/html/hd_chlst.hxx
+++ b/autodoc/source/display/html/hd_chlst.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: hd_chlst.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 17:28:31 $
+ * last change: $Author: hr $ $Date: 2007-11-02 16:26:52 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,15 +36,15 @@
#ifndef ADC_DISPLAY_HTML_HD_CHLST_HXX
#define ADC_DISPLAY_HTML_HD_CHLST_HXX
-
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
// USED SERVICES
- // BASE CLASSES
-#include <ary/cpp/cpp_disp.hxx>
-#include <ary/cpp/c_etypes.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
#include "hdimpl.hxx"
- // COMPONENTS
- // PARAMETERS
+
+
namespace ary
{
@@ -67,7 +67,14 @@ namespace ary
class Docu_Display;
class ProtectionArea;
-class ChildList_Display : public ary::cpp::Display,
+class ChildList_Display : public ary::Display,
+ public csv::ConstProcessor<ary::cpp::Namespace>,
+ public csv::ConstProcessor<ary::cpp::Class>,
+ public csv::ConstProcessor<ary::cpp::Enum>,
+ public csv::ConstProcessor<ary::cpp::Typedef>,
+ public csv::ConstProcessor<ary::cpp::Function>,
+ public csv::ConstProcessor<ary::cpp::Variable>,
+ public csv::ConstProcessor<ary::cpp::EnumValue>,
private HtmlDisplay_Impl
{
public:
@@ -112,15 +119,6 @@ class ChildList_Display : public ary::cpp::Display,
const char * i_sListTitle,
ary::cpp::E_ClassKey
i_eFilter );
-#if 0
- void Run_GlobalClasses(
- Area_Result & o_rResult,
- ary::SlotAccessId i_nSlot,
- const char * i_sListLabel,
- const char * i_sListTitle_classes,
- const char * i_sListTitle_structs,
- const char * i_sListTitle_unions );
-#endif
void Run_Members(
Area_Result & o_rResult_public,
Area_Result & o_rResult_protected,
@@ -141,58 +139,45 @@ class ChildList_Display : public ary::cpp::Display,
const char * i_sListTitle,
ary::cpp::E_ClassKey
i_eFilter );
-#if 0
- void Run_MemberClasses(
- Area_Result & o_rResult_public,
- Area_Result & o_rResult_protected,
- Area_Result & o_rResult_private,
- ary::SlotAccessId i_nSlot,
- const char * i_sListLabel_public,
- const char * i_sListLabel_protected,
- const char * i_sListLabel_private,
- const char * i_sListTitle_classes,
- const char * i_sListTitle_structs,
- const char * i_sListTitle_unions );
-#endif
-
- virtual void Display_Namespace(
+ private:
+ // Interface csv::ConstProcessor<>:
+ virtual void do_Process(
const ary::cpp::Namespace &
i_rData );
- /** i_rData is showed only, if it passes two filters:
+ /** i_rData is shown only, if it passes two filters:
it must have the right protection, checked with pFilter,
and the right class key (class,struct,union), checked with
pClassFilter. A not exsting filter allows i_rData to be
displayed.
*/
- virtual void Display_Class(
+ virtual void do_Process(
const ary::cpp::Class &
i_rData );
- virtual void Display_Enum(
+ virtual void do_Process(
const ary::cpp::Enum &
i_rData );
- virtual void Display_Typedef(
+ virtual void do_Process(
const ary::cpp::Typedef &
i_rData );
- virtual void Display_Function(
+ virtual void do_Process(
const ary::cpp::Function &
i_rData );
- virtual void Display_Variable(
+ virtual void do_Process(
const ary::cpp::Variable &
i_rData );
- virtual void Display_EnumValue(
+ virtual void do_Process(
const ary::cpp::EnumValue &
i_rData );
private:
// Interface ary::Display:
virtual void do_StartSlot();
virtual void do_FinishSlot();
- virtual const ary::DisplayGate *
+ virtual const ary::cpp::Gate *
inq_Get_ReFinder() const;
-
// Locals
struct S_AreaCo;
void Write_ListItem(
- const udmstri & i_sLeftText,
+ const String & i_sLeftText,
const char * i_sLink,
const ary::info::DocuText &
i_rRightText,
@@ -225,5 +210,5 @@ class ChildList_Display : public ary::cpp::Display,
-#endif
+#endif
generated by cgit (git 2.34.1) at 2025-05-14 08:41:00 +0000