Merge from trunk 1.0
authorAlpar Juttner <alpar@cs.elte.hu>
Thu, 09 Oct 2008 16:42:32 +0100
branch1.0
changeset 3288c4d380787cf
parent 327 12626fc94ccf
parent 316 689f24ee83e6
child 329 2592532ee838
Merge from trunk
doc/Makefile.am
     1.1 --- a/doc/Doxyfile.in	Thu Oct 09 14:37:44 2008 +0100
     1.2 +++ b/doc/Doxyfile.in	Thu Oct 09 16:42:32 2008 +0100
     1.3 @@ -1,4 +1,4 @@
     1.4 -# Doxyfile 1.5.5
     1.5 +# Doxyfile 1.5.7.1
     1.6  
     1.7  #---------------------------------------------------------------------------
     1.8  # Project related configuration options
     1.9 @@ -33,9 +33,11 @@
    1.10  BUILTIN_STL_SUPPORT    = YES
    1.11  CPP_CLI_SUPPORT        = NO
    1.12  SIP_SUPPORT            = NO
    1.13 +IDL_PROPERTY_SUPPORT   = YES
    1.14  DISTRIBUTE_GROUP_DOC   = NO
    1.15  SUBGROUPING            = YES
    1.16  TYPEDEF_HIDES_STRUCT   = NO
    1.17 +SYMBOL_CACHE_SIZE      = 0
    1.18  #---------------------------------------------------------------------------
    1.19  # Build related configuration options
    1.20  #---------------------------------------------------------------------------
    1.21 @@ -66,7 +68,10 @@
    1.22  MAX_INITIALIZER_LINES  = 5
    1.23  SHOW_USED_FILES        = YES
    1.24  SHOW_DIRECTORIES       = YES
    1.25 +SHOW_FILES             = YES
    1.26 +SHOW_NAMESPACES        = YES
    1.27  FILE_VERSION_FILTER    = 
    1.28 +LAYOUT_FILE            = DoxygenLayout.xml
    1.29  #---------------------------------------------------------------------------
    1.30  # configuration options related to warning and progress messages
    1.31  #---------------------------------------------------------------------------
    1.32 @@ -75,7 +80,7 @@
    1.33  WARN_IF_UNDOCUMENTED   = YES
    1.34  WARN_IF_DOC_ERROR      = YES
    1.35  WARN_NO_PARAMDOC       = NO
    1.36 -WARN_FORMAT            = "$file:$line: $text  "
    1.37 +WARN_FORMAT            = "$file:$line: $text"
    1.38  WARN_LOGFILE           = doxygen.log
    1.39  #---------------------------------------------------------------------------
    1.40  # configuration options related to the input files
    1.41 @@ -133,20 +138,27 @@
    1.42  HTML_FOOTER            = 
    1.43  HTML_STYLESHEET        = 
    1.44  HTML_ALIGN_MEMBERS     = YES
    1.45 -GENERATE_HTMLHELP      = NO
    1.46 +HTML_DYNAMIC_SECTIONS  = NO
    1.47  GENERATE_DOCSET        = NO
    1.48  DOCSET_FEEDNAME        = "Doxygen generated docs"
    1.49  DOCSET_BUNDLE_ID       = org.doxygen.Project
    1.50 -HTML_DYNAMIC_SECTIONS  = NO
    1.51 +GENERATE_HTMLHELP      = NO
    1.52  CHM_FILE               = 
    1.53  HHC_LOCATION           = 
    1.54  GENERATE_CHI           = NO
    1.55 +CHM_INDEX_ENCODING     = 
    1.56  BINARY_TOC             = NO
    1.57  TOC_EXPAND             = NO
    1.58 +GENERATE_QHP           = NO
    1.59 +QCH_FILE               = 
    1.60 +QHP_NAMESPACE          = org.doxygen.Project
    1.61 +QHP_VIRTUAL_FOLDER     = doc
    1.62 +QHG_LOCATION           = 
    1.63  DISABLE_INDEX          = NO
    1.64  ENUM_VALUES_PER_LINE   = 4
    1.65  GENERATE_TREEVIEW      = NO
    1.66  TREEVIEW_WIDTH         = 250
    1.67 +FORMULA_FONTSIZE       = 10
    1.68  #---------------------------------------------------------------------------
    1.69  # configuration options related to the LaTeX output
    1.70  #---------------------------------------------------------------------------
    1.71 @@ -225,6 +237,9 @@
    1.72  MSCGEN_PATH            = 
    1.73  HIDE_UNDOC_RELATIONS   = YES
    1.74  HAVE_DOT               = YES
    1.75 +DOT_FONTNAME           = FreeSans
    1.76 +DOT_FONTSIZE           = 10
    1.77 +DOT_FONTPATH           = 
    1.78  CLASS_GRAPH            = YES
    1.79  COLLABORATION_GRAPH    = NO
    1.80  GROUP_GRAPHS           = NO
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/doc/DoxygenLayout.xml	Thu Oct 09 16:42:32 2008 +0100
     2.3 @@ -0,0 +1,182 @@
     2.4 +<doxygenlayout version="1.0">
     2.5 +  <!-- Navigation index tabs for HTML output -->
     2.6 +  <navindex>
     2.7 +    <tab type="mainpage" visible="yes" title=""/>
     2.8 +    <tab type="modules" visible="yes" title=""/>
     2.9 +    <tab type="classes" visible="yes" title="">
    2.10 +      <tab type="classes" visible="yes" title=""/>
    2.11 +      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
    2.12 +      <tab type="hierarchy" visible="yes" title=""/>
    2.13 +      <tab type="classmembers" visible="yes" title=""/>
    2.14 +    </tab>
    2.15 +    <tab type="namespaces" visible="yes" title="">
    2.16 +      <tab type="namespaces" visible="yes" title=""/>
    2.17 +      <tab type="namespacemembers" visible="yes" title=""/>
    2.18 +    </tab>
    2.19 +    <tab type="files" visible="yes" title="">
    2.20 +      <tab type="files" visible="yes" title=""/>
    2.21 +      <tab type="globals" visible="yes" title=""/>
    2.22 +    </tab>
    2.23 +    <tab type="dirs" visible="yes" title=""/>
    2.24 +    <tab type="examples" visible="yes" title=""/>  
    2.25 +    <tab type="pages" visible="yes" title=""/>
    2.26 +  </navindex>
    2.27 +
    2.28 +  <!-- Layout definition for a class page -->
    2.29 +  <class>
    2.30 +    <briefdescription visible="no"/>
    2.31 +    <detaileddescription title=""/>
    2.32 +    <includes visible="$SHOW_INCLUDE_FILES"/>
    2.33 +    <inheritancegraph visible="$CLASS_GRAPH"/>
    2.34 +    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
    2.35 +    <allmemberslink visible="yes"/>
    2.36 +    <memberdecl>
    2.37 +      <membergroups visible="yes"/>
    2.38 +      <nestedclasses visible="yes" title=""/>
    2.39 +      <publictypes title=""/>
    2.40 +      <publicslots title=""/>
    2.41 +      <signals title=""/>
    2.42 +      <publicmethods title=""/>
    2.43 +      <publicstaticmethods title=""/>
    2.44 +      <publicattributes title=""/>
    2.45 +      <publicstaticattributes title=""/>
    2.46 +      <protectedtypes title=""/>
    2.47 +      <protectedslots title=""/>
    2.48 +      <protectedmethods title=""/>
    2.49 +      <protectedstaticmethods title=""/>
    2.50 +      <protectedattributes title=""/>
    2.51 +      <protectedstaticattributes title=""/>
    2.52 +      <packagetypes title=""/>
    2.53 +      <packagemethods title=""/>
    2.54 +      <packagestaticmethods title=""/>
    2.55 +      <packageattributes title=""/>
    2.56 +      <packagestaticattributes title=""/>
    2.57 +      <properties title=""/>
    2.58 +      <events title=""/>
    2.59 +      <privatetypes title=""/>
    2.60 +      <privateslots title=""/>
    2.61 +      <privatemethods title=""/>
    2.62 +      <privatestaticmethods title=""/>
    2.63 +      <privateattributes title=""/>
    2.64 +      <privatestaticattributes title=""/>
    2.65 +      <friends title=""/>
    2.66 +      <related title="" subtitle=""/>
    2.67 +    </memberdecl>
    2.68 +    <memberdef>
    2.69 +      <typedefs title=""/>
    2.70 +      <enums title=""/>
    2.71 +      <constructors title=""/>
    2.72 +      <functions title=""/>
    2.73 +      <related title=""/>
    2.74 +      <variables title=""/>
    2.75 +      <properties title=""/>
    2.76 +      <events title=""/>
    2.77 +    </memberdef>
    2.78 +    <usedfiles visible="$SHOW_USED_FILES"/>
    2.79 +    <authorsection visible="yes"/>
    2.80 +  </class>
    2.81 +
    2.82 +  <!-- Layout definition for a namespace page -->
    2.83 +  <namespace>
    2.84 +    <briefdescription visible="no"/>
    2.85 +    <detaileddescription title=""/>
    2.86 +    <memberdecl>
    2.87 +      <nestednamespaces visible="yes" title=""/>
    2.88 +      <classes visible="yes" title=""/>
    2.89 +      <membergroups visible="yes"/>
    2.90 +      <typedefs title=""/>
    2.91 +      <enums title=""/>
    2.92 +      <functions title=""/>
    2.93 +      <variables title=""/>
    2.94 +    </memberdecl>
    2.95 +    <memberdef>
    2.96 +      <typedefs title=""/>
    2.97 +      <enums title=""/>
    2.98 +      <functions title=""/>
    2.99 +      <variables title=""/>
   2.100 +    </memberdef>
   2.101 +    <authorsection visible="yes"/>
   2.102 +  </namespace>
   2.103 +
   2.104 +  <!-- Layout definition for a file page -->
   2.105 +  <file>
   2.106 +    <briefdescription visible="no"/>
   2.107 +    <detaileddescription title=""/>
   2.108 +    <includes visible="$SHOW_INCLUDE_FILES"/>
   2.109 +    <includegraph visible="$INCLUDE_GRAPH"/>
   2.110 +    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
   2.111 +    <sourcelink visible="yes"/>
   2.112 +    <memberdecl>
   2.113 +      <classes visible="yes" title=""/>
   2.114 +      <namespaces visible="yes" title=""/>
   2.115 +      <defines title=""/>
   2.116 +      <typedefs title=""/>
   2.117 +      <enums title=""/>
   2.118 +      <functions title=""/>
   2.119 +      <variables title=""/>
   2.120 +    </memberdecl>
   2.121 +    <memberdef>
   2.122 +      <defines title=""/>
   2.123 +      <typedefs title=""/>
   2.124 +      <enums title=""/>
   2.125 +      <functions title=""/>
   2.126 +      <variables title=""/>
   2.127 +    </memberdef>
   2.128 +    <authorsection/>
   2.129 +  </file>
   2.130 +
   2.131 +  <!-- Layout definition for a group page -->
   2.132 +  <group>
   2.133 +    <briefdescription visible="no"/>
   2.134 +    <detaileddescription title=""/>
   2.135 +    <groupgraph visible="$GROUP_GRAPHS"/>
   2.136 +    <memberdecl>
   2.137 +      <classes visible="yes" title=""/>
   2.138 +      <namespaces visible="yes" title=""/>
   2.139 +      <dirs visible="yes" title=""/>
   2.140 +      <nestedgroups visible="yes" title=""/>
   2.141 +      <files visible="yes" title=""/>
   2.142 +      <defines title=""/>
   2.143 +      <typedefs title=""/>
   2.144 +      <enums title=""/>
   2.145 +      <enumvalues title=""/>
   2.146 +      <functions title=""/>
   2.147 +      <variables title=""/>
   2.148 +      <signals title=""/>
   2.149 +      <publicslots title=""/>
   2.150 +      <protectedslots title=""/>
   2.151 +      <privateslots title=""/>
   2.152 +      <events title=""/>
   2.153 +      <properties title=""/>
   2.154 +      <friends title=""/>
   2.155 +    </memberdecl>
   2.156 +    <memberdef>
   2.157 +      <pagedocs/>
   2.158 +      <defines title=""/>
   2.159 +      <typedefs title=""/>
   2.160 +      <enums title=""/>
   2.161 +      <enumvalues title=""/>
   2.162 +      <functions title=""/>
   2.163 +      <variables title=""/>
   2.164 +      <signals title=""/>
   2.165 +      <publicslots title=""/>
   2.166 +      <protectedslots title=""/>
   2.167 +      <privateslots title=""/>
   2.168 +      <events title=""/>
   2.169 +      <properties title=""/>
   2.170 +      <friends title=""/>
   2.171 +    </memberdef>
   2.172 +    <authorsection visible="yes"/>
   2.173 +  </group>
   2.174 +
   2.175 +  <!-- Layout definition for a directory page -->
   2.176 +  <directory>
   2.177 +    <briefdescription visible="no"/>
   2.178 +    <detaileddescription title=""/>
   2.179 +    <directorygraph visible="yes"/>
   2.180 +    <memberdecl>
   2.181 +      <dirs visible="yes"/>
   2.182 +      <files visible="yes"/>
   2.183 +    </memberdecl>
   2.184 +  </directory>
   2.185 +</doxygenlayout>
     3.1 --- a/doc/Makefile.am	Thu Oct 09 14:37:44 2008 +0100
     3.2 +++ b/doc/Makefile.am	Thu Oct 09 16:42:32 2008 +0100
     3.3 @@ -1,5 +1,6 @@
     3.4  EXTRA_DIST += \
     3.5  	doc/Doxyfile.in \
     3.6 +	doc/DoxygenLayout.xml \
     3.7  	doc/coding_style.dox \
     3.8  	doc/dirs.dox \
     3.9  	doc/groups.dox \