Merge branch 'master' of github.com:doxygen/doxygen

5 files changed, 25 insertions, 12 deletions

diff --git a/doc/install.doc b/doc/install.doc
index 99cecc6..53c4466 100644
--- a/doc/install.doc
+++ b/doc/install.doc
@@ -229,8 +229,10 @@ of the GraphViz package to render nicer diagrams, see the
 If you want to produce compressed HTML files (see \ref
 cfg_generate_htmlhelp "GENERATE_HTMLHELP") in the configuration file, then
 you need the Microsoft HTML help workshop.
-You can download it from
-<a href="https://www.microsoft.com/en-us/download/details.aspx?id=21138">Microsoft</a>.
+In the beginning of 2021 Microsoft took the original page, with a.o. the download links,
+offline the HTML help workshop was already many years in maintenance mode). 
+You can download the HTML help workshop from the web archives at
+<a href="http://web.archive.org/web/20160201063255/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe">Installation executable</a>.
 
 If you want to produce Qt Compressed Help files (see \ref
 cfg_qhg_location "QHG_LOCATION") in the configuration file, then
diff --git a/src/config.xml b/src/config.xml
index 6dddcc3..080230c 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -2181,10 +2181,12 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
  If the \c GENERATE_HTMLHELP tag is set to \c YES then
  doxygen generates three additional HTML index files:
  \c index.hhp, \c index.hhc, and \c index.hhk. The \c index.hhp is a
- project file that can be read by
- <a href="https://www.microsoft.com/en-us/download/details.aspx?id=21138">
- Microsoft's HTML Help Workshop</a>
+ project file that can be read by Microsoft's HTML Help Workshop
  on Windows.
+  In the beginning of 2021 Microsoft took the original page, with a.o. the download links,
+  offline the HTML help workshop was already many years in maintenance mode). 
+  You can download the HTML help workshop from the web archives at
+  <a href="http://web.archive.org/web/20160201063255/http://download.microsoft.com/download/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe">Installation executable</a>.
 <br>
  The HTML Help Workshop contains a compiler that can convert all HTML output
  generated by doxygen into a single compiled HTML file (`.chm`). Compiled
@@ -3234,6 +3236,9 @@ front of it.
 <![CDATA[
 If the \c GENERATE_SQLITE3 tag is set to \c YES doxygen will generate a
 \c Sqlite3 database with symbols found by doxygen stored in tables.
+
+  @note The availability of this option depends on whether or not doxygen
+  was generated with the `-Duse_sqlite3=ON` option for CMake.
 ]]>
       </docs>
     </option>
@@ -3243,6 +3248,9 @@ If the \c GENERATE_SQLITE3 tag is set to \c YES doxygen will generate a
 The \c SQLITE3_OUTPUT tag is used to specify where the \c Sqlite3 database will be put.
 If a relative path is entered the value of \ref cfg_output_directory "OUTPUT_DIRECTORY" will be
 put in front of it.
+
+  @note The availability of this option depends on whether or not doxygen
+  was generated with the `-Duse_sqlite3=ON` option for CMake.
 ]]>
       </docs>
     </option>
@@ -3252,6 +3260,9 @@ put in front of it.
 The \c SQLITE3_OVERWRITE_DB tag is set to \c YES, the existing doxygen_sqlite3.db
 database file will be recreated with each doxygen run.
 If set to \c NO, doxygen will warn if an a database file is already found and not modify it.
+
+  @note The availability of this option depends on whether or not doxygen
+  was generated with the `-Duse_sqlite3=ON` option for CMake.
 ]]>
       </docs>
     </option>
diff --git a/src/context.cpp b/src/context.cpp
index 46249f5..f4614dd 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -136,11 +136,11 @@ class GenericConstIterator : public TemplateListIntf::ConstIterator
     }
     void toLast()
     {
-      m_index=(int)m_list.size()-1;
+      m_index=static_cast<int>(m_list.size())-1;
     }
     void toNext()
     {
-      if (m_index<static_cast<int>(m_list.size())) ++m_index;
+      if (m_index < static_cast<int>(m_list.size())) ++m_index;
     }
     void toPrev()
     {
@@ -148,7 +148,7 @@ class GenericConstIterator : public TemplateListIntf::ConstIterator
     }
     bool current(TemplateVariant &v) const
     {
-      if (m_index>=0 && m_index<static_cast<int>(m_list.size()))
+      if (m_index>=0 && m_index < static_cast<int>(m_list.size()))
       {
         v = m_list[m_index];
         return true;
diff --git a/src/docsets.cpp b/src/docsets.cpp
index 7cb5d31..f7c8c18 100644
--- a/src/docsets.cpp
+++ b/src/docsets.cpp
@@ -201,7 +201,7 @@ void DocSets::finalize()
 QCString DocSets::Private::indent()
 {
   QCString result;
-  result.fill(' ',((int)indentStack.size()+2)*2);
+  result.fill(' ',static_cast<int>(indentStack.size()+2)*2);
   return result;
 }
 
diff --git a/src/pre.l b/src/pre.l
index b14c479..b153942 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1996,7 +1996,7 @@ static void processConcatOperators(QCString &expr)
       size_t n = match.position();
       size_t l = match.length();
       //printf("Match: '%s'\n",expr.data()+i);
-      if (n+l+1<e.length() && e[n+l]=='@' && expr[n+l+1]=='-')
+      if (n+l+1<e.length() && e[static_cast<int>(n+l)]=='@' && expr[static_cast<int>(n+l+1)]=='-')
       {
         // remove no-rescan marker after ID
         l+=2;
@@ -2004,7 +2004,7 @@ static void processConcatOperators(QCString &expr)
       //printf("found '%s'\n",expr.mid(n,l).data());
       // remove the ## operator and the surrounding whitespace
       e=e.substr(0,n)+e.substr(n+l);
-      int k=n-1;
+      int k=static_cast<int>(n)-1;
       while (k>=0 && isId(e[k])) k--; 
       if (k>0 && e[k]=='-' && e[k-1]=='@')
       {
@@ -3322,7 +3322,7 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName)
       }
       else // simple define with argument
       {
-        int ine=i_equals - (nonRecursive ? 1 : 0);
+        int ine=static_cast<int>(i_equals) - (nonRecursive ? 1 : 0);
         def.name = ds.substr(0,ine);
         def.definition = ds.substr(i_equals+1);
       }