21 files changed, 206 insertions, 91 deletions
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
index 6ae71a6..6aacd8b 100644
--- a/addon/doxywizard/CMakeLists.txt
+++ b/addon/doxywizard/CMakeLists.txt
@@ -31,7 +31,6 @@ endif()
 include_directories(
 	.
         ${CMAKE_SOURCE_DIR}/libversion
-	${CMAKE_SOURCE_DIR}/src
 	${CMAKE_SOURCE_DIR}/qtools
 	${GENERATED_SRC}
 )
@@ -72,7 +71,17 @@ OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
 )
 set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1)
 
-FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "${LEX_FLAGS}")
+set(LEX_FILES config_doxyw) 
+foreach(lex_file ${LEX_FILES})
+    add_custom_command(
+	    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
+        DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l
+	OUTPUT  ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
+    )
+    set_source_files_properties(${GENERATED_SRC_WIZARD}/${lex_file}.l.h PROPERTIES GENERATED 1)
+
+    FLEX_TARGET(${lex_file}        ${lex_file}.l        ${GENERATED_SRC_WIZARD}/${lex_file}.cpp        COMPILE_FLAGS "${LEX_FLAGS}")
+endforeach()
 
 qt_wrap_cpp(doxywizard_MOC
 doxywizard.h
@@ -97,6 +106,7 @@ inputint.cpp
 inputstrlist.cpp
 ${GENERATED_SRC_WIZARD}/settings.h
 ${GENERATED_SRC_WIZARD}/config_doxyw.cpp
+${GENERATED_SRC_WIZARD}/config_doxyw.l.h
 ${GENERATED_SRC_WIZARD}/configdoc.cpp
 ${doxywizard_MOC}
 ${doxywizard_RESOURCES_RCC}
diff --git a/addon/doxywizard/config.h b/addon/doxywizard/config.h
index 147056a..378ed13 100644
--- a/addon/doxywizard/config.h
+++ b/addon/doxywizard/config.h
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef CONFIG_H
 #define CONFIG_H
 
diff --git a/addon/doxywizard/config_doxyw.l b/addon/doxywizard/config_doxyw.l
index 8549e6b..59fa427 100644
--- a/addon/doxywizard/config_doxyw.l
+++ b/addon/doxywizard/config_doxyw.l
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * $Id: config_templ.l,v 1.8 2001/01/01 10:15:16 root Exp $
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -66,6 +64,8 @@ static QString                        g_codecName = QString::fromLatin1("UTF-8")
 static int                            g_lastState;
 static QByteArray                     g_tmpString;
 
+static const char *stateToString(int state);
+
 /* -----------------------------------------------------------------
  */
 #undef	YY_INPUT
@@ -587,4 +587,4 @@ void writeStringValue(QTextStream &t,QTextCodec *codec,const QString &s)
     }
   }
 }
-
+#include "config_doxyw.l.h"
diff --git a/addon/doxywizard/configdoc.h b/addon/doxywizard/configdoc.h
index 97ed6c3..fa3bca7 100644
--- a/addon/doxywizard/configdoc.h
+++ b/addon/doxywizard/configdoc.h
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef CONFIGDOC_H
 #define CONFIGDOC_H
 
diff --git a/addon/doxywizard/docintf.h b/addon/doxywizard/docintf.h
index 6c0ff26..ee54bda 100644
--- a/addon/doxywizard/docintf.h
+++ b/addon/doxywizard/docintf.h
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef DOCINTF_H
 #define DOCINTF_H
 
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 02e8cd0..dc0a6dc 100755
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "doxywizard.h"
 #include "version.h"
 #include "expert.h"
@@ -218,7 +230,7 @@ void MainWindow::about()
   t << QString::fromLatin1("<qt><center>A tool to configure and run doxygen version ")+
        QString::fromLatin1(getVersion())+
        QString::fromLatin1(" on your source files.</center><p><br>"
-       "<center>Written by<br> Dimitri van Heesch<br>&copy; 2000-2015</center><p>"
+       "<center>Written by<br> Dimitri van Heesch<br>&copy; 2000-2019</center><p>"
        "</qt>");
   QMessageBox::about(this,tr("Doxygen GUI"),msg);
 }
diff --git a/addon/doxywizard/doxywizard.h b/addon/doxywizard/doxywizard.h
index 49b7c02..c64941e 100755
--- a/addon/doxywizard/doxywizard.h
+++ b/addon/doxywizard/doxywizard.h
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef DOXYWIZARD_H
 #define DOXYWIZARD_H
 
diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp
index c875d8d..1303a22 100644
--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "expert.h"
 #include "inputbool.h"
 #include "inputstring.h"
@@ -386,6 +398,7 @@ static QString getDocsForNode(const QDomElement &child)
 
   // Remove / replace doxygen markup strings
   // the regular expressions are hard to read so the intention will be given
+  // Note: see also configgen.py in the src directory for other doxygen parts
   QRegExp regexp;
   // remove \n at end and replace by a space
   regexp.setPattern(SA("\\n$"));
@@ -420,6 +433,8 @@ static QString getDocsForNode(const QDomElement &child)
   docs.replace(regexp,SA("\"External Indexing and Searching\""));
   regexp.setPattern(SA("\\\\ref[ ]+external"));
   docs.replace(regexp,SA("\"Linking to external documentation\""));
+  regexp.setPattern(SA("\\\\ref[ ]+formulas"));
+  docs.replace(regexp,SA("\"Including formulas\""));
   // fallback for not handled
   docs.replace(SA("\\\\ref"),SA(""));
   // \b word -> <b>word<\b>
diff --git a/addon/doxywizard/expert.h b/addon/doxywizard/expert.h
index ff571cb..f58ef62 100644
--- a/addon/doxywizard/expert.h
+++ b/addon/doxywizard/expert.h
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef EXPERT_H
 #define EXPERT_H
 
diff --git a/addon/doxywizard/helplabel.h b/addon/doxywizard/helplabel.h
index 07e2932..362ebcd 100644
--- a/addon/doxywizard/helplabel.h
+++ b/addon/doxywizard/helplabel.h
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef HELPLABEL_H
 #define HELPLABEL_H
 
diff --git a/addon/doxywizard/input.h b/addon/doxywizard/input.h
index 5d86cc8..ff8339a 100644
--- a/addon/doxywizard/input.h
+++ b/addon/doxywizard/input.h
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #ifndef INPUT_H
 #define INPUT_H
 
diff --git a/addon/doxywizard/inputbool.cpp b/addon/doxywizard/inputbool.cpp
index ef71dd9..63d9998 100644
--- a/addon/doxywizard/inputbool.cpp
+++ b/addon/doxywizard/inputbool.cpp
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/inputbool.h b/addon/doxywizard/inputbool.h
index 5a90477..98f7f85 100644
--- a/addon/doxywizard/inputbool.h
+++ b/addon/doxywizard/inputbool.h
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/inputint.cpp b/addon/doxywizard/inputint.cpp
index a57e7f4..2aa019b 100644
--- a/addon/doxywizard/inputint.cpp
+++ b/addon/doxywizard/inputint.cpp
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/inputint.h b/addon/doxywizard/inputint.h
index 457c942..10d735e 100644
--- a/addon/doxywizard/inputint.h
+++ b/addon/doxywizard/inputint.h
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp
index 7fb6ec3..5c0f2c9 100644
--- a/addon/doxywizard/inputstring.cpp
+++ b/addon/doxywizard/inputstring.cpp
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/inputstring.h b/addon/doxywizard/inputstring.h
index 6234256..4f4a7f7 100644
--- a/addon/doxywizard/inputstring.h
+++ b/addon/doxywizard/inputstring.h
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/inputstrlist.cpp b/addon/doxywizard/inputstrlist.cpp
index 822bc4c..dd1ecb2 100644
--- a/addon/doxywizard/inputstrlist.cpp
+++ b/addon/doxywizard/inputstrlist.cpp
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/inputstrlist.h b/addon/doxywizard/inputstrlist.h
index c374092..adb0fb0 100644
--- a/addon/doxywizard/inputstrlist.h
+++ b/addon/doxywizard/inputstrlist.h
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
diff --git a/addon/doxywizard/wizard.cpp b/addon/doxywizard/wizard.cpp
index ae8fa61..2233379 100644
--- a/addon/doxywizard/wizard.cpp
+++ b/addon/doxywizard/wizard.cpp
@@ -1,3 +1,15 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ */
+
 #include "wizard.h"
 #include "input.h"
 #include "doxywizard.h"
diff --git a/addon/doxywizard/wizard.h b/addon/doxywizard/wizard.h
index 11a42be..810ab95 100644
--- a/addon/doxywizard/wizard.h
+++ b/addon/doxywizard/wizard.h
@@ -1,8 +1,6 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation under the terms of the GNU General Public License is hereby 
@@ -52,11 +50,11 @@ class TuneColorDialog : public QDialog
     void updateImage(int hue,int sat,int val);
 
   private:
-    QImage *m_image;
-    QLabel *m_imageLab;
-    int m_hue;
-    int m_sat;
-    int m_gam;
+    QImage *m_image = 0;
+    QLabel *m_imageLab = 0;
+    int m_hue = 0;
+    int m_sat = 0;
+    int m_gam = 0;
 };
 
 class ColorPicker : public QWidget
@@ -91,11 +89,11 @@ private:
     void setSat(int v);
     void setGam(int v);
 
-    QPixmap *m_pix;
-    Mode m_mode;
-    int m_gam;
-    int m_hue;
-    int m_sat;
+    QPixmap *m_pix = 0;
+    Mode m_mode = Hue;
+    int m_gam = 0;
+    int m_hue = 0;
+    int m_sat = 0;
 
 };
 
@@ -120,16 +118,16 @@ class Step1 : public QWidget
     void setRecursiveScan(int);
 
   private:
-    QLineEdit *m_projName;
-    QLineEdit *m_projBrief;
-    QLineEdit *m_projNumber;
-    QLineEdit *m_sourceDir;
-    QLineEdit *m_destDir;
-    QLabel    *m_projIconLab;
-    QCheckBox *m_recursive;
-    QPushButton *m_srcSelectDir;
-    QPushButton *m_dstSelectDir;
-    Wizard    *m_wizard;
+    QLineEdit *m_projName = 0;
+    QLineEdit *m_projBrief = 0;
+    QLineEdit *m_projNumber = 0;
+    QLineEdit *m_sourceDir = 0;
+    QLineEdit *m_destDir = 0;
+    QLabel    *m_projIconLab = 0;
+    QCheckBox *m_recursive = 0;
+    QPushButton *m_srcSelectDir = 0;
+    QPushButton *m_dstSelectDir = 0;
+    Wizard    *m_wizard = 0;
     const QHash<QString,Input *> &m_modelData;
 };
 
@@ -146,12 +144,12 @@ class Step2 : public QWidget
     void changeCrossRefState(int choice);
 
   private:
-    QGroupBox    *m_extractMode;
-    QGroupBox    *m_optimizeLang;
-    QButtonGroup *m_extractModeGroup;
-    QButtonGroup *m_optimizeLangGroup;
-    QCheckBox    *m_crossRef;
-    Wizard       *m_wizard;
+    QGroupBox    *m_extractMode = 0;
+    QGroupBox    *m_optimizeLang = 0;
+    QButtonGroup *m_extractModeGroup = 0;
+    QButtonGroup *m_optimizeLangGroup = 0;
+    QCheckBox    *m_crossRef = 0;
+    Wizard       *m_wizard = 0;
     const QHash<QString,Input *> &m_modelData;
 };
 
@@ -175,18 +173,18 @@ class Step3 : public QWidget
     void tuneColorDialog();
 
   private:
-    QGroupBox *m_texOptions;
-    QButtonGroup *m_texOptionsGroup;
-    QGroupBox *m_htmlOptions;
-    QButtonGroup *m_htmlOptionsGroup;
-    QCheckBox *m_htmlEnabled;
-    QCheckBox *m_latexEnabled;
-    QCheckBox *m_manEnabled;
-    QCheckBox *m_rtfEnabled;
-    QCheckBox *m_xmlEnabled;
-    QCheckBox *m_searchEnabled;
-    QPushButton *m_tuneColor;
-    Wizard    *m_wizard;
+    QGroupBox *m_texOptions = 0;
+    QButtonGroup *m_texOptionsGroup = 0;
+    QGroupBox *m_htmlOptions = 0;
+    QButtonGroup *m_htmlOptionsGroup = 0;
+    QCheckBox *m_htmlEnabled = 0;
+    QCheckBox *m_latexEnabled = 0;
+    QCheckBox *m_manEnabled = 0;
+    QCheckBox *m_rtfEnabled = 0;
+    QCheckBox *m_xmlEnabled = 0;
+    QCheckBox *m_searchEnabled = 0;
+    QPushButton *m_tuneColor = 0;
+    Wizard    *m_wizard = 0;
     const QHash<QString,Input *> &m_modelData;
 };
 
@@ -209,17 +207,17 @@ class Step4 : public QWidget
     void setCallerGraphEnabled(int state);
 
   private:
-    QGroupBox *m_diagramMode;
-    QButtonGroup *m_diagramModeGroup;
-    QGroupBox *m_dotGroup;
-    QCheckBox *m_dotClass;
-    QCheckBox *m_dotCollaboration;
-    QCheckBox *m_dotInclude;
-    QCheckBox *m_dotIncludedBy;
-    QCheckBox *m_dotInheritance;
-    QCheckBox *m_dotCall;
-    QCheckBox *m_dotCaller;
-    Wizard    *m_wizard;
+    QGroupBox *m_diagramMode = 0;
+    QButtonGroup *m_diagramModeGroup = 0;
+    QGroupBox *m_dotGroup = 0;
+    QCheckBox *m_dotClass = 0;
+    QCheckBox *m_dotCollaboration = 0;
+    QCheckBox *m_dotInclude = 0;
+    QCheckBox *m_dotIncludedBy = 0;
+    QCheckBox *m_dotInheritance = 0;
+    QCheckBox *m_dotCall = 0;
+    QCheckBox *m_dotCaller = 0;
+    Wizard    *m_wizard = 0;
     const QHash<QString,Input *> &m_modelData;
 };
 
@@ -243,14 +241,14 @@ class Wizard : public QSplitter
 
   private:
     const QHash<QString,Input *> &m_modelData;
-    QTreeWidget    *m_treeWidget;
-    QStackedWidget *m_topicStack;
-    Step1          *m_step1;
-    Step2          *m_step2;
-    Step3          *m_step3;
-    Step4          *m_step4;
-    QPushButton    *m_next;
-    QPushButton    *m_prev;
+    QTreeWidget    *m_treeWidget = 0;
+    QStackedWidget *m_topicStack = 0;
+    Step1          *m_step1 = 0;
+    Step2          *m_step2 = 0;
+    Step3          *m_step3 = 0;
+    Step4          *m_step4 = 0;
+    QPushButton    *m_next = 0;
+    QPushButton    *m_prev = 0;
 };
 
 #endif