moved include-guards to the head of the headers

lib/jkqtplotter/graphs/jkqtpbarchart.h

@@ -17,6 +17,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsbarchart_H
+#define jkqtpgraphsbarchart_H
+
+
 #include <QString>
 #include <QPainter>
 #include <QPair>
@@ -27,9 +31,6 @@
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 #include "jkqtplotter/graphs/jkqtpbarchartbase.h"
-#ifndef jkqtpgraphsbarchart_H
-#define jkqtpgraphsbarchart_H
-
 
 
 /*! \brief This implements a bar graph with bars starting at \f$ yoverride \f$ to \f$ y=f(x) \f$

lib/jkqtplotter/graphs/jkqtpbarchartbase.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsbarchartbase_H
+#define jkqtpgraphsbarchartbase_H
+
 #include <QString>
 #include <QPainter>
 #include <QPair>
@@ -26,9 +29,6 @@
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
-#ifndef jkqtpgraphsbarchartbase_H
-#define jkqtpgraphsbarchartbase_H
-
 
 
 /** \brief This is a base-class for all bar graphs with vertical or horizontal orientation (the orientation is implemented in dervied classes!)

lib/jkqtplotter/graphs/jkqtpboxplot.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsboxplot_H
+#define jkqtpgraphsboxplot_H
+
 
 #include <QString>
 #include <QPainter>
@@ -29,9 +32,6 @@
 #include "jkqtplotter/graphs/jkqtpboxplotstylingmixins.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphsboxplot_H
-#define jkqtpgraphsboxplot_H
-
 
 
 

lib/jkqtplotter/graphs/jkqtpboxplotbase.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsboxplotbase_H
+#define jkqtpgraphsboxplotbase_H
+
 
 #include <QString>
 #include <QPainter>
@@ -28,9 +31,6 @@
 #include "jkqtplotter/graphs/jkqtpboxplotstylingmixins.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphsboxplotbase_H
-#define jkqtpgraphsboxplotbase_H
-
 
 
 

lib/jkqtplotter/graphs/jkqtpboxplotstylingmixins.h

@@ -18,6 +18,9 @@
 */
 
 
+#ifndef jkqtpgraphsboxplotstylingmixins_H
+#define jkqtpgraphsboxplotstylingmixins_H
+
 #include <QString>
 #include <QPainter>
 #include "jkqtplotter/jkqtptools.h"
@@ -25,9 +28,6 @@
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphsboxplotstylingmixins_H
-#define jkqtpgraphsboxplotstylingmixins_H
-
 
 
 

lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsevaluatedfunction_H
+#define jkqtpgraphsevaluatedfunction_H
+
 
 
 #include <QString>
@@ -29,9 +32,6 @@
 #include "jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h"
 #include <functional>
 
-#ifndef jkqtpgraphsevaluatedfunction_H
-#define jkqtpgraphsevaluatedfunction_H
-
 
 /** \brief This class extends JKQTPEvaluatedFunctionWithErrorsGraphBase with functions to draw the graphs and
  *         set the drawing style

lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h

@@ -18,6 +18,9 @@
 */
 
 
+#ifndef jkqtpevaluatedfunctionbase_H
+#define jkqtpevaluatedfunctionbase_H
+
 
 #include <QString>
 #include <QPainter>
@@ -28,9 +31,6 @@
 #include "jkqtcommon/jkqtpgeometrytools.h"
 #include <functional>
 
-#ifndef jkqtpevaluatedfunctionbase_H
-#define jkqtpevaluatedfunctionbase_H
-
 
 
 

lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h

@@ -18,6 +18,9 @@
 */
 
 
+#ifndef jkqtpevaluatedparametriccurve_H
+#define jkqtpevaluatedparametriccurve_H
+
 
 #include <QString>
 #include <QPainter>
@@ -29,9 +32,6 @@
 #include "jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h"
 #include <functional>
 
-#ifndef jkqtpevaluatedparametriccurve_H
-#define jkqtpevaluatedparametriccurve_H
-
 
 /** \brief Base class for line plots where the data is taken from a user supplied function \f$ [x,y]=f(t) \f$
   *        The function is evaluated on a user-specified range \f$ t \in \left[t_\text{min}, t_\text{max}\right] \f$

lib/jkqtplotter/graphs/jkqtpfilledcurve.h

@@ -17,15 +17,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsfilledcurve_H
+#define jkqtpgraphsfilledcurve_H
+
 
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/graphs/jkqtpspecialline.h"
 
-#ifndef jkqtpgraphsfilledcurve_H
-#define jkqtpgraphsfilledcurve_H
-
 
 
 

lib/jkqtplotter/graphs/jkqtpgeoannotations.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgeoannotations_H_INCLUDED
+#define jkqtpgeoannotations_H_INCLUDED
+
 
 #include <QString>
 #include <QPainter>
@@ -27,9 +30,6 @@
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtmathtext/jkqtmathtext.h"
 
-#ifndef jkqtpgeoannotations_H_INCLUDED
-#define jkqtpgeoannotations_H_INCLUDED
-
 
 
 

lib/jkqtplotter/graphs/jkqtpgeobase.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgeobase_H_INCLUDED
+#define jkqtpgeobase_H_INCLUDED
+
 
 #include <QString>
 #include <QPainter>
@@ -27,9 +30,6 @@
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtmathtext/jkqtmathtext.h"
 
-#ifndef jkqtpgeobase_H_INCLUDED
-#define jkqtpgeobase_H_INCLUDED
-
 
 /*! \brief This JKQTPGeometricPlotElement is used as base class for geometric drawing
            elements that only consist of lines (i.e. no filling of any kind is done)

lib/jkqtplotter/graphs/jkqtpgeolines.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgeolines_H_INCLUDED
+#define jkqtpgeolines_H_INCLUDED
+
 
 #include <QString>
 #include <QPainter>
@@ -27,9 +30,6 @@
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtmathtext/jkqtmathtext.h"
 
-#ifndef jkqtpgeolines_H_INCLUDED
-#define jkqtpgeolines_H_INCLUDED
-
 
 
 /** \brief This JKQTPGeometricPlotElement is used to draw a line, optionally line-end decorations (aka arrows) are pssible, but switched off by default.

lib/jkqtplotter/graphs/jkqtpgeoshapes.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgeoshapes_H_INCLUDED
+#define jkqtpgeoshapes_H_INCLUDED
+
 
 #include <QString>
 #include <QPainter>
@@ -27,9 +30,6 @@
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtmathtext/jkqtmathtext.h"
 
-#ifndef jkqtpgeoshapes_H_INCLUDED
-#define jkqtpgeoshapes_H_INCLUDED
-
 
 
 

lib/jkqtplotter/graphs/jkqtpimpulses.h

@@ -17,14 +17,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsimpulses_H
+#define jkqtpgraphsimpulses_H
+
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphsimpulses_H
-#define jkqtpgraphsimpulses_H
-
 
 
 /** \brief This is a base class for all impulse graphs

lib/jkqtplotter/graphs/jkqtppeakstream.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphspeakstream_H_INCLUDED
+#define jkqtpgraphspeakstream_H_INCLUDED
+
 
 
 #include <QString>
@@ -25,9 +28,6 @@
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphspeakstream_H_INCLUDED
-#define jkqtpgraphspeakstream_H_INCLUDED
-
 // forward declarations
 class JKQTBasePlotter;
 class JKQTPlotter;

lib/jkqtplotter/graphs/jkqtprange.h

@@ -16,6 +16,8 @@
     You should have received a copy of the GNU Lesser General Public License (LGPL)
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#ifndef jkqtpgraphsrange_H
+#define jkqtpgraphsrange_H
 
 
 #include <QString>
@@ -28,8 +30,6 @@
 #include "jkqtcommon/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
-#ifndef jkqtpgraphsrange_H
-#define jkqtpgraphsrange_H
 
 // forward declarations
 class JKQTBasePlotter;

lib/jkqtplotter/graphs/jkqtpscatter.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphs_H
+#define jkqtpgraphs_H
+
 
 #include <QString>
 #include <QPainter>
@@ -31,9 +34,6 @@
 #include "jkqtplotter/graphs/jkqtprange.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphs_H
-#define jkqtpgraphs_H
-
 // forward declarations
 class JKQTBasePlotter;
 class JKQTPlotter;

lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h

@@ -18,6 +18,9 @@
 */
 
 
+#ifndef jkqtpgraphssinglecolumnsymbols_H_INCLUDED
+#define jkqtpgraphssinglecolumnsymbols_H_INCLUDED
+
 
 #include <QString>
 #include <QPainter>
@@ -25,9 +28,6 @@
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphssinglecolumnsymbols_H_INCLUDED
-#define jkqtpgraphssinglecolumnsymbols_H_INCLUDED
-
 
 
 /*! \brief plots a 1-column set of data-values with symbols onto a JKQtPlotter/JKQtBasePlotter. the data from the single column

lib/jkqtplotter/graphs/jkqtpspecialline.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsspecialline_H
+#define jkqtpgraphsspecialline_H
+
 
 #include <QString>
 #include <QPainter>
@@ -30,9 +33,6 @@
 #include "jkqtplotter/graphs/jkqtprange.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphsspecialline_H
-#define jkqtpgraphsspecialline_H
-
 // forward declarations
 class JKQTBasePlotter;
 class JKQTPlotter;

lib/jkqtplotter/graphs/jkqtpstatisticsadaptors.h

@@ -17,6 +17,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef JKQTPGRAPHSSTATISTICSADAPTORS_H_INCLUDED
+#define JKQTPGRAPHSSTATISTICSADAPTORS_H_INCLUDED
+
+
 
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtcommon/jkqtpstatisticstools.h"
@@ -34,10 +38,6 @@
 #include "jkqtplotter/graphs/jkqtpfilledcurve.h"
 #include "jkqtplotter/graphs/jkqtpviolinplot.h"
 
-
-#ifndef JKQTPGRAPHSSTATISTICSADAPTORS_H_INCLUDED
-#define JKQTPGRAPHSSTATISTICSADAPTORS_H_INCLUDED
-
 /*! \brief add a JKQTPBoxplotHorizontalElement to the given plotter, where the boxplot values are calculated from the data range \a first ... \a last
     \ingroup jkqtptools_math_statistics_adaptors
 

lib/jkqtplotter/graphs/jkqtpviolinplot.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsviolinplot_H
+#define jkqtpgraphsviolinplot_H
+
 
 #include <QString>
 #include <QPainter>
@@ -28,9 +31,6 @@
 #include "jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphsviolinplot_H
-#define jkqtpgraphsviolinplot_H
-
 
 
 /** \brief This implements a single vertical <a href="https://en.wikipedia.org/wiki/Violin_plot">Violin Plot</a> as a "geometric element"

lib/jkqtplotter/graphs/jkqtpviolinplotstylingmixins.h

@@ -17,6 +17,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef jkqtpgraphsviolinplotstylingmixins_H
+#define jkqtpgraphsviolinplotstylingmixins_H
+
+
 
 #include <QString>
 #include <QPainter>
@@ -25,10 +29,6 @@
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
 
-#ifndef jkqtpgraphsviolinplotstylingmixins_H
-#define jkqtpgraphsviolinplotstylingmixins_H
-
-
 
 
 

lib/jkqtplotter/jkqtpbaseplotter.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef JKQTPBASEPLOTTER_H
+#define JKQTPBASEPLOTTER_H
+
 #include "jkqtplotter/jkqtptools.h"
 #include "jkqtplotter/jkqtpdatastorage.h"
 #include "jkqtplotter/jkqtpbaseplotterstyle.h"
@@ -44,12 +47,9 @@
 #include <vector>
 #include <cmath>
 #include <iostream>
- #include "jkqtplotter/jkqtplotter_imexport.h"
+#include "jkqtplotter/jkqtplotter_imexport.h"
 
 
-#ifndef JKQTPBASEPLOTTER_H
-#define JKQTPBASEPLOTTER_H
-
 
 class JKQTPGraphsModel; // forward
 class JKQTPGraph; // forward

lib/jkqtplotter/jkqtpdatastorage.h

@@ -17,6 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef JKQTPDATASTORAGE_H
+#define JKQTPDATASTORAGE_H
 
 
 #include "jkqtplotter/jkqtplotter_imexport.h"
@@ -37,8 +39,6 @@
 #include <QStringList>
 #include <QAbstractTableModel>
 #include <QObject>
-#ifndef JKQTPDATASTORAGE_H
-#define JKQTPDATASTORAGE_H
 
 
 class JKQTPColumn; // forward declaration

lib/jkqtplotter/jkqtpgraphsbaseerrors.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef JKQTPGRAPHSBASEERROR_H
+#define JKQTPGRAPHSBASEERROR_H
+
 
 #include <QString>
 #include <QPainter>
@@ -28,9 +31,6 @@
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtplotter/jkqtpimagetools.h"
 
-#ifndef JKQTPGRAPHSBASEERROR_H
-#define JKQTPGRAPHSBASEERROR_H
-
 
 /*! \brief This mix-in class assembles all styling properties applicable to error indicators
     \ingroup jkqtplotter_basegraphserrors

lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h

@@ -18,6 +18,10 @@
 */
 
 
+#ifndef jkqtpgraphsbasestylingmixins_H
+#define jkqtpgraphsbasestylingmixins_H
+
+
 #include <QString>
 #include <QPainter>
 #include <QPen>
@@ -28,10 +32,6 @@
 #include "jkqtcommon/jkqtpdrawingtools.h"
 
 
-#ifndef jkqtpgraphsbasestylingmixins_H
-#define jkqtpgraphsbasestylingmixins_H
-
-
 class JKQTPlotter; // forward
 
 

lib/jkqtplotter/jkqtplotter.h

@@ -17,6 +17,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef JKQTPLOTTER_H
+#define JKQTPLOTTER_H
+
 
 #include <QWidget>
 #include <QVector>
@@ -42,13 +45,11 @@
 #include "jkqtplotter/jkqtplotterstyle.h"
 #include "jkqtplotter/jkqtpbaseplotterstyle.h"
 #include "jkqtplotter/jkqtptools.h"
+#include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtplotter_imexport.h"
 #include "jkqtplotter/gui/jkvanishqtoolbar.h"
 #include <QKeyEvent>
 
-#ifndef JKQTPLOTTER_H
-#define JKQTPLOTTER_H
-
 /** \brief initialized Qt-ressources necessary for JKQTPlotter
  *  \ingroup jkqtpplottersupprt
 */