Skip to content

Commit dd97525

Browse files
albert-githubalbert-github
committed
Remove obsolete attribute altdefval from configuration settings
With issue doxygen#9236 (and resulting PR doxygen#9526) the possibility to have a "system dependent value" through the attribute `altdefval` has been removed from the configuration file, though in the coded references still existed as well as (now) in the translation files. The possibility has been removed completely now.
1 parent bc44814 commit dd97525

11 files changed

Lines changed: 5 additions & 36 deletions

File tree

‎addon/doxywizard/expert.cpp‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -856,16 +856,9 @@ QString Expert::getDocsForNode(const QDomElement &child) const
856856
{
857857
if (!docs.endsWith(SA("<br/>"))) docs += SA("<br/>");
858858
docs+=SA("<br/>");
859-
if (child.hasAttribute(SA("altdefval")))
860-
{
861-
docs+=SA(" ")+m_messages[SA("defsysdep")];
862-
}
863-
else
864-
{
865-
QString defval = child.attribute(SA("defval"));
866-
QString valStr = (defval==SA("1")?SA("YES"):SA("NO"));
867-
docs+=SA(" ")+m_messages[SA("defvalcode")].arg(valStr);
868-
}
859+
QString defval = child.attribute(SA("defval"));
860+
QString valStr = (defval==SA("1")?SA("YES"):SA("NO"));
861+
docs+=SA(" ")+m_messages[SA("defvalcode")].arg(valStr);
869862
}
870863
else if (type==SA("list"))
871864
{

‎src/config.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4434,8 +4434,6 @@ This setting is not only used for dot files but also for msc temporary files.
44344434
<message name='possible'><![CDATA[Possible values are: ]]></message>
44354435
<message name='defvaltxt'><![CDATA[The default value is: {0}.]]></message>
44364436
<message name='defvalcode'><![CDATA[The default value is: <code>{0}</code>.]]></message>
4437-
<message name='defsysdep'><![CDATA[The default value is: system dependent]]></message>
4438-
<message name='sysdep'><![CDATA[system dependent]]></message>
44394437
<message name='defdir'><![CDATA[The default directory is: <code>{0}</code>.]]></message>
44404438
<message name='deffile'><![CDATA[The default file is: <code>{0}</code>.]]></message>
44414439
<message name='deffileabs'><![CDATA[The default file (with absolute path) is <code>{0}</code>]]></message>

‎src/configgen.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,7 @@ def prepCDocs(node):
192192
maxval = node.getAttribute('maxval')
193193
doc += "<br/>" + messages['minmaxdef'].format(minval, maxval, defval)
194194
elif (type == 'bool'):
195-
if (node.hasAttribute('altdefval')):
196-
doc += "<br/>" + messages['defvaltxt'].format(messages['sysdep'])
197-
else:
198-
doc += "<br/>" + messages['defvaltxt'].format("YES" if (defval == "1") else "NO")
195+
doc += "<br/>" + messages['defvaltxt'].format("YES" if (defval == "1") else "NO")
199196
elif (type == 'list'):
200197
if format == 'string':
201198
values = collectValues(node)
@@ -607,10 +604,7 @@ def parseOptionDoc(node, first):
607604
elif (type == 'bool'):
608605
print("")
609606
print("")
610-
if (node.hasAttribute('altdefval')):
611-
print(messages['defvaltxt'].format(messages['sysdep']))
612-
else:
613-
print(messages['defvalcode'].format("YES" if (defval == "1") else "NO"))
607+
print(messages['defvalcode'].format("YES" if (defval == "1") else "NO"))
614608
print("")
615609
elif (type == 'list'):
616610
if format == 'string':

‎src/i18n/config_de.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,8 +1830,6 @@
18301830
<message name="possible"><![CDATA[Mögliche Werte sind: ]]></message>
18311831
<message name="defvaltxt"><![CDATA[Der Standardwert ist: {0}.]]></message>
18321832
<message name="defvalcode"><![CDATA[Der Standardwert ist: <code>{0}</code>.]]></message>
1833-
<message name="defsysdep"><![CDATA[Der Standardwert ist: systemabhängig.]]></message>
1834-
<message name="sysdep"><![CDATA[systemabhängig]]></message>
18351833
<message name="defdir"><![CDATA[Das Standardverzeichnis ist: <code>{0}</code>.]]></message>
18361834
<message name="deffile"><![CDATA[Die Standarddatei ist: <code>{0}</code>.]]></message>
18371835
<message name="deffileabs"><![CDATA[Die Standarddatei (mit absolutem Pfad) ist: <code>{0}</code>.]]></message>

‎src/i18n/config_es.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,8 +1831,6 @@
18311831
<message name='possible'><![CDATA[Los valores posibles son:]]></message>
18321832
<message name='defvaltxt'><![CDATA[El valor predeterminado es: {0}.]]></message>
18331833
<message name='defvalcode'><![CDATA[El valor predeterminado es: <code>{0}</code>.]]></message>
1834-
<message name='defsysdep'><![CDATA[El valor predeterminado es: dependiente del sistema.]]></message>
1835-
<message name='sysdep'><![CDATA[dependiente del sistema]]></message>
18361834
<message name='defdir'><![CDATA[El directorio predeterminado es: <code>{0}</code>.]]></message>
18371835
<message name='deffile'><![CDATA[El archivo predeterminado es: <code>{0}</code>.]]></message>
18381836
<message name='deffileabs'><![CDATA[El archivo predeterminado (con ruta absoluta) es: <code>{0}</code>.]]></message>

‎src/i18n/config_fr.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,8 +1830,6 @@
18301830
<message name='possible'><![CDATA[Les valeurs possibles sont :]]></message>
18311831
<message name='defvaltxt'><![CDATA[La valeur par défaut est : {0}.]]></message>
18321832
<message name='defvalcode'><![CDATA[La valeur par défaut est : <code>{0}</code>.]]></message>
1833-
<message name='defsysdep'><![CDATA[La valeur par défaut dépend du système.]]></message>
1834-
<message name='sysdep'><![CDATA[dépend du système]]></message>
18351833
<message name='defdir'><![CDATA[Le répertoire par défaut est : <code>{0}</code>.]]></message>
18361834
<message name='deffile'><![CDATA[Le fichier par défaut est : <code>{0}</code>.]]></message>
18371835
<message name='deffileabs'><![CDATA[Le fichier par défaut (avec chemin absolu) est : <code>{0}</code>.]]></message>

‎src/i18n/config_ja.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,8 +1829,6 @@
18291829
<message name='possible'><![CDATA[可能な値は:]]></message>
18301830
<message name='defvaltxt'><![CDATA[デフォルト値は {0} です。]]></message>
18311831
<message name='defvalcode'><![CDATA[デフォルト値は <code>{0}</code> です。]]></message>
1832-
<message name='defsysdep'><![CDATA[デフォルト値はシステム依存です。]]></message>
1833-
<message name='sysdep'><![CDATA[システム依存で]]></message>
18341832
<message name='defdir'><![CDATA[デフォルトのディレクトリは <code>{0}</code> です。]]></message>
18351833
<message name='deffile'><![CDATA[デフォルトのファイルは <code>{0}</code> です。]]></message>
18361834
<message name='deffileabs'><![CDATA[デフォルトのファイル（絶対パス）は <code>{0}</code> です。]]></message>

‎src/i18n/config_ko.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,8 +1828,6 @@
18281828
<message name='possible'><![CDATA[가능한 값:]]></message>
18291829
<message name='defvaltxt'><![CDATA[기본값은 {0}입니다.]]></message>
18301830
<message name='defvalcode'><![CDATA[기본값은 <code>{0}</code>입니다.]]></message>
1831-
<message name='defsysdep'><![CDATA[기본값은 시스템에 따라 다릅니다.]]></message>
1832-
<message name='sysdep'><![CDATA[시스템 종속적]]></message>
18331831
<message name='defdir'><![CDATA[기본 디렉토리는 <code>{0}</code>입니다.]]></message>
18341832
<message name='deffile'><![CDATA[기본 파일은 <code>{0}</code>입니다.]]></message>
18351833
<message name='deffileabs'><![CDATA[기본 파일(절대 경로)은 <code>{0}</code>입니다.]]></message>

‎src/i18n/config_ru.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2402,8 +2402,6 @@ doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
24022402
<message name='possible'><![CDATA[Возможные значения:]]></message>
24032403
<message name='defvaltxt'><![CDATA[Значение по умолчанию: {0}.]]></message>
24042404
<message name='defvalcode'><![CDATA[Значение по умолчанию: <code>{0}</code>.]]></message>
2405-
<message name='defsysdep'><![CDATA[Значение по умолчанию зависит от системы.]]></message>
2406-
<message name='sysdep'><![CDATA[зависит от системы]]></message>
24072405
<message name='defdir'><![CDATA[Каталог по умолчанию: <code>{0}</code>.]]></message>
24082406
<message name='deffile'><![CDATA[Файл по умолчанию: <code>{0}</code>.]]></message>
24092407
<message name='deffileabs'><![CDATA[Файл по умолчанию (с абсолютным путём): <code>{0}</code>.]]></message>

‎src/i18n/config_zh_CN.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,8 +1826,6 @@
18261826
<message name='possible'><![CDATA[可能的值有：]]></message>
18271827
<message name='defvaltxt'><![CDATA[默认值为：{0}。]]></message>
18281828
<message name='defvalcode'><![CDATA[默认值为：<code>{0}</code>。]]></message>
1829-
<message name='defsysdep'><![CDATA[默认值：取决于系统。]]></message>
1830-
<message name='sysdep'><![CDATA[系统相关取]]></message>
18311829
<message name='defdir'><![CDATA[默认目录为：<code>{0}</code>。]]></message>
18321830
<message name='deffile'><![CDATA[默认文件为：<code>{0}</code>。]]></message>
18331831
<message name='deffileabs'><![CDATA[默认文件（带绝对路径）为：<code>{0}</code>。]]></message>

0 commit comments

Comments
 (0)