From 83ad8df83e846d438c2fd437948a06ac0a9177d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 13 Sep 2018 12:18:16 +0200 Subject: [PATCH] doxygen: display the deprecation label next to the name, not after brief. --- doxygen/templates/annotated.html | 6 ++---- doxygen/templates/files.html | 6 ++---- doxygen/templates/modules.html | 6 ++---- doxygen/templates/namespaces.html | 6 ++---- doxygen/test/compound_deprecated/annotated.html | 10 +++++----- doxygen/test/compound_deprecated/files.html | 6 +++--- doxygen/test/compound_deprecated/modules.html | 4 ++-- doxygen/test/compound_deprecated/namespaces.html | 2 +- 8 files changed, 19 insertions(+), 27 deletions(-) diff --git a/doxygen/templates/annotated.html b/doxygen/templates/annotated.html index f2b83fe5..c1e156ec 100644 --- a/doxygen/templates/annotated.html +++ b/doxygen/templates/annotated.html @@ -7,15 +7,13 @@ {% for i in index.symbols recursive %} {% if i.children %}
  • - {{ i.kind }} {{ i.name }} {{ i.brief }}{% if i.is_deprecated %} deprecated{% endif %} - - {# the above is here to preserve the newline #} + {{ i.kind }} {{ i.name }}{% if i.is_deprecated %} deprecated{% endif %} {{ i.brief }}
    • {% else %} -
  • {{ i.kind }} {{ i.name }} {{ i.brief }}{% if i.is_deprecated %} deprecated{% endif %}
    • +
  • {{ i.kind }} {{ i.name }}{% if i.is_deprecated %} deprecated{% endif %} {{ i.brief }}
    • {% endif %} {% endfor %} diff --git a/doxygen/templates/files.html b/doxygen/templates/files.html index 602cc8c6..09efe44a 100644 --- a/doxygen/templates/files.html +++ b/doxygen/templates/files.html @@ -7,15 +7,13 @@ {% for i in index.files recursive %} {% if i.children %}
  • - {{ i.kind }} {{ i.name }} {{ i.brief }}{% if i.is_deprecated %} deprecated{% endif %} - - {# the above is here to preserve the newline #} + {{ i.kind }} {{ i.name }}{% if i.is_deprecated %} deprecated{% endif %} {{ i.brief }}
    • {% else %} -
  • {{ i.kind }} {{ i.name }} {{ i.brief }}{% if i.is_deprecated %} deprecated{% endif %}
    • +
  • {{ i.kind }} {{ i.name }}{% if i.is_deprecated %} deprecated{% endif %} {{ i.brief }}
    • {% endif %} {% endfor %} diff --git a/doxygen/templates/modules.html b/doxygen/templates/modules.html index c43d0a56..68ab0266 100644 --- a/doxygen/templates/modules.html +++ b/doxygen/templates/modules.html @@ -7,15 +7,13 @@ {% for i in index.modules recursive %} {% if i.has_nestable_children %}
  • - module {{ i.name }} {{ i.brief }}{% if i.is_deprecated %} deprecated{% endif %} - - {# the above is here to preserve the newline #} + module {{ i.name }}{% if i.is_deprecated %} deprecated{% endif %} {{ i.brief }}
    • {% else %} -
  • module {{ i.name }} {{ i.brief }}{% if i.is_deprecated %} deprecated{% endif %}
    • +
  • module {{ i.name }}{% if i.is_deprecated %} deprecated{% endif %} {{ i.brief }}
    • {% endif %} {% endfor %} diff --git a/doxygen/templates/namespaces.html b/doxygen/templates/namespaces.html index 70b2bc8f..63794bc1 100644 --- a/doxygen/templates/namespaces.html +++ b/doxygen/templates/namespaces.html @@ -7,15 +7,13 @@ {% for i in index.symbols|selectattr('kind', 'equalto', 'namespace') recursive %} {% if i.has_nestable_children %}
  • - {{ i.kind }} {{ i.name }} {{ i.brief }}{% if i.is_deprecated %} deprecated{% endif %} - - {# the above is here to preserve the newline #} + {{ i.kind }} {{ i.name }}{% if i.is_deprecated %} deprecated{% endif %} {{ i.brief }}
    • {% else %} -
  • {{ i.kind }} {{ i.name }} {{ i.brief }}{% if i.is_deprecated %} deprecated{% endif %}
    • +
  • {{ i.kind }} {{ i.name }}{% if i.is_deprecated %} deprecated{% endif %} {{ i.brief }}
    • {% endif %} {% endfor %} diff --git a/doxygen/test/compound_deprecated/annotated.html b/doxygen/test/compound_deprecated/annotated.html index d4a13d7f..6a7fba39 100644 --- a/doxygen/test/compound_deprecated/annotated.html +++ b/doxygen/test/compound_deprecated/annotated.html @@ -22,12 +22,12 @@

    Classes

    diff --git a/doxygen/test/compound_deprecated/files.html b/doxygen/test/compound_deprecated/files.html index 4bbbc429..70f8fac8 100644 --- a/doxygen/test/compound_deprecated/files.html +++ b/doxygen/test/compound_deprecated/files.html @@ -25,12 +25,12 @@ dir Dir A directory. @@ -54,4 +54,4 @@ - \ No newline at end of file + diff --git a/doxygen/test/compound_deprecated/modules.html b/doxygen/test/compound_deprecated/modules.html index 261cffc6..215598b2 100644 --- a/doxygen/test/compound_deprecated/modules.html +++ b/doxygen/test/compound_deprecated/modules.html @@ -24,7 +24,7 @@
  • module A group
    • @@ -48,4 +48,4 @@ - \ No newline at end of file + diff --git a/doxygen/test/compound_deprecated/namespaces.html b/doxygen/test/compound_deprecated/namespaces.html index 891726dd..6ed2b5fb 100644 --- a/doxygen/test/compound_deprecated/namespaces.html +++ b/doxygen/test/compound_deprecated/namespaces.html @@ -21,7 +21,7 @@

    Namespaces