cleanup duplicated stuff

Author: ferdymercury

.github/workflows/root-docs.yml

@@ -127,7 +127,7 @@ jobs:
       run: |
         source ROOT-CI/build/bin/thisroot.sh
         export DOXYGEN_OUTPUT_DIRECTORY=/github/home/${DOC_DIR}
-        cd ROOT-CI/src/documentation/doxygen_s3
+        cd ROOT-CI/src/documentation/doxygen
         make -j `nproc --all`
 
     - name: Create documentation archives

documentation/doxygen/Doxyfile

@@ -1649,7 +1649,7 @@ QHP_SECT_FILTER_ATTRS  =
 # run qhelpgenerator on the generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHG_LOCATION           = qhelpgenerator
+QHG_LOCATION           = qhelpgenerator-qt5
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
 # generated, together with the HTML files, they form an Eclipse help plugin. To

documentation/doxygen/DoxygenLayout.xml

@@ -1,10 +1,10 @@
 <doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.6 -->
+  <!-- First version generated by doxygen 1.8.6 -->
   <!-- Navigation index tabs for HTML output -->
   <navindex>
     <tab type="mainpage" visible="yes" title=""/>
     <tab type="user" visible="yes" title="Tutorials" url="group__Tutorials.html"/>
-    <tab type="modules" visible="yes" title="Functional Parts" intro=""/>
+    <tab type="topics" visible="yes" title="Functional Parts" intro=""/>
     <tab type="namespaces" visible="yes" title="">
       <tab type="namespacelist" visible="yes" title="" intro=""/>
       <tab type="namespacemembers" visible="yes" title="" intro=""/>

documentation/doxygen/filter.cxx

@@ -89,7 +89,9 @@
 #include <stdarg.h>
 #include <memory>
 
-using std::string, std::ios_base, std::unique_ptr;
+using std::string;
+using std::ios_base;
+using std::unique_ptr;
 
 // Auxiliary functions
 void   FilterClass();

documentation/doxygen/makeNotebooks.sh

@@ -61,5 +61,6 @@ EOF
 # Run rest in parallel
 xargs -L 1 -P ${nJobs:-1} ${Python3_EXECUTABLE:-python3} < $inputFile
 
-rm ${inputFile}.back
-
+if [ -e "${inputFile}.back" ]; then
+    rm "${inputFile}.back"
+fi