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

Author: doxygen

cmake/CompilerWarnings.cmake

@@ -96,6 +96,7 @@ function(set_project_warnings project_name)
       -Wdouble-promotion # warn if float is implicit promoted to double
       -Wformat=2 # warn on security issues around functions that format output
                  # (ie printf)
+      $<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>
 
       # turn off warning caused by generated code (flex)
       -Wno-unused-parameter

src/configimpl.h

@@ -137,7 +137,7 @@ class ConfigList : public ConfigOption
     WidgetType widgetType() const { return m_widgetType; }
     StringVector *valueRef() { return &m_value; }
     StringVector getDefault() { return m_defaultValue; }
-    void emptyValueToDefault() override { if (m_value.empty() && !m_defaultValue.empty()) m_value=m_defaultValue; };
+    void emptyValueToDefault() override { if (m_value.empty() && !m_defaultValue.empty()) m_value=m_defaultValue; }
     void writeTemplate(TextStream &t,bool sl,bool) override;
     void compareDoxyfile(TextStream &t,Config::CompareMode compareMode) override;
     void writeXMLDoxyfile(TextStream &t) override;
@@ -205,7 +205,7 @@ class ConfigString : public ConfigOption
     void writeXSDDoxyfile(TextStream &t) override;
     void substEnvVars() override;
     void init() override { m_value = m_defValue; }
-    void emptyValueToDefault() override { if (m_value.isEmpty()) m_value=m_defValue; };
+    void emptyValueToDefault() override { if (m_value.isEmpty()) m_value=m_defValue; }
     bool isDefault() override { return m_value.stripWhiteSpace() == m_defValue.stripWhiteSpace(); }
 
   private:

src/definition.cpp

@@ -688,7 +688,7 @@ class FilterCache
       assert(startLineOffset <= endLineOffset);
       const size_t fragmentSize = endLineOffset-startLineOffset;
       return std::tie(startLineOffset,fragmentSize);
-    };
+    }
 
     //! Shrinks buffer \a str which should hold the contents of \a fileName to the
     //! fragment starting a line \a startLine and ending at line \a endLine

src/docgroup.h

@@ -24,7 +24,7 @@ class Entry;
 class DocGroup
 {
   public:
-    DocGroup() {};
+    DocGroup() {}
 
   public:
     void enterFile(const QCString &fileName,int);

src/growvector.h

@@ -69,8 +69,8 @@ class GrowVector
         Iterator operator++(int)    { Iterator tmp = *this; ++(*this); return tmp; }
         Iterator& operator--()      { m_pos--; return *this; }
         Iterator operator--(int)    { Iterator tmp = *this; --(*this); return tmp; }
-        friend bool operator== (const Iterator& a, const Iterator& b) { return a.m_pos == b.m_pos; };
-        friend bool operator!= (const Iterator& a, const Iterator& b) { return a.m_pos != b.m_pos; };
+        friend bool operator== (const Iterator& a, const Iterator& b) { return a.m_pos == b.m_pos; }
+        friend bool operator!= (const Iterator& a, const Iterator& b) { return a.m_pos != b.m_pos; }
 
       private:
         C     *m_vec;

src/htmlgen.h

@@ -355,9 +355,9 @@ class HtmlGenerator : public OutputGenerator, public OutputGenIntf
       int indent = 0;
       int maxLevel = 0;
       BoolVector inLi;
-      void writeIndent(TextStream &t) { for (int i=0;i<indent*2;i++) t << " "; };
-      void incIndent(TextStream &t,const QCString &text) { writeIndent(t); t << text << "\n"; indent++; };
-      void decIndent(TextStream &t,const QCString &text) { indent--; writeIndent(t); t << text << "\n"; };
+      void writeIndent(TextStream &t) { for (int i=0;i<indent*2;i++) t << " "; }
+      void incIndent(TextStream &t,const QCString &text) { writeIndent(t); t << text << "\n"; indent++; }
+      void decIndent(TextStream &t,const QCString &text) { indent--; writeIndent(t); t << text << "\n"; }
     };
     TocState m_tocState;
 };

src/lexscanner.h

@@ -34,7 +34,7 @@ class LexOutlineParser : public OutlineParserInterface
                     const char *fileBuf,
                     const std::shared_ptr<Entry> &root,
                     ClangTUParser *clangParser) override;
-    bool needsPreprocessing(const QCString &/* extension */) const override { return TRUE; };
+    bool needsPreprocessing(const QCString &/* extension */) const override { return TRUE; }
     void parsePrototype(const QCString &/* text */) override {}
 
   private:

src/mangen.h

@@ -222,8 +222,8 @@ class ManGenerator : public OutputGenerator, public OutputGenIntf
     void endDescTableTitle() override { endBoldEmphasis(); }
     void startDescTableRow() override {}
     void endDescTableRow() override {}
-    void startDescTableInit() override {};
-    void endDescTableInit() override {};
+    void startDescTableInit() override {}
+    void endDescTableInit() override {}
     void startDescTableData() override { m_t << "\n"; m_firstCol=TRUE; }
     void endDescTableData() override {}
 

src/rtfgen.h

@@ -186,7 +186,7 @@ class RTFGenerator : public OutputGenerator, public OutputGenIntf
     void endDoxyAnchor(const QCString &,const QCString &) override;
     void addLabel(const QCString &,const QCString &) override;
     void writeChar(char c) override;
-    void writeLatexSpacing() override {};//{ m_t << "\\hspace{0.3cm}"; }
+    void writeLatexSpacing() override {}//{ m_t << "\\hspace{0.3cm}"; }
     void writeStartAnnoItem(const QCString &type,const QCString &file,
                             const QCString &path,const QCString &name) override;
     void startCenter() override { m_t << "{\\qc\n"; }

src/vhdldocgen.h

@@ -52,7 +52,7 @@ struct VhdlConfNode
     compSpec=cs;
     isInlineConf=false;  // primary configuration?
     isLeaf=leaf;
-  };
+  }
 
   QCString confVhdl;
   QCString arch;