NEW: Using Q_SIGNALS/Q_SLOTS instead of signals/slots MOC-keywords ... this allows for interoperability with other signals/slots frameworks

doc/dox/whatsnew.dox

@@ -83,6 +83,7 @@ Changes, compared to  \ref page_whatsnew_V4_0_0 "v4.0.0" include:
     <li>NEW: secondary axes: added functionality to manage additional secondary axes in a JKQTPBasePlotter and to select which x-/y-Axis to use for drawing a JKQTPPlotElement</li>
     <li>NEW: You can use additional syntax derived from CCS to define colors in style.ini.files (or when using  jkqtp_String2QColor() ): You can use full CSS-color syntax with functions <code>"rgb(R,G,B)"</code>, <code>"rgba(...)"</code>, <code>"hsl(...)"</code>, <code>"hsv(...)"</code>, <code>"gray(...)"</code>, <code>"green(...)"</code>, <code>"red(...)"</code>, <code>"blue(...)"</code>.</li>
     <li>NEW: several new color palettes (especially stepped/categorial palettes), e.g. JKQTPMathImageColorPalette::JKQTPMathImageOkabeIto_STEP, JKQTPMathImageColorPalette::JKQTPMathImageIBMColorBlindSafe, JKQTPMathImageColorPalette::JKQTPMathImageIBMColorBlindSafe_STEP, ...</li>
+    <li>NEW: Using Q_SIGNALS/Q_SLOTS instead of signals/slots MOC-keywords ... this allows for interoperability with other signals/slots frameworks, thanks to <a href="https://github.com/nickmontini">user:nickmontini</a> for the proposal</li>
   </ul></li>
   
   <li>JKQTMathText:<ul>

examples/contourplot/contourplotanimator.h

@@ -14,7 +14,7 @@ class ContourPlotAnimator: public QObject {
         ContourPlotAnimator(JKQTPDatastore* ds_, JKQTPlotter* pplot_, int NX_, int NY_,double w_, double h_, double dx_, size_t cPotential_);
 
         void start(int delayMS);
-    protected slots:
+    protected Q_SLOTS:
         void step();
     protected:
         double angle;

examples/jkqtfastplotter_test/jkqtfastplotter_test_testmain.h

@@ -17,9 +17,9 @@ class TestMain : public QWidget {
         explicit TestMain(QWidget *parent = 0);
         virtual ~TestMain();
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
         void enableRed(bool enabled);
         void enableGreen(bool enabled);
         void enableBlue(bool enabled);

examples/jkqtmathtext_test/testform.h

@@ -22,7 +22,7 @@ class TestForm : public QWidget
         explicit TestForm(QWidget *parent = 0);
         ~TestForm();
         
-    public slots:
+    public Q_SLOTS:
         void updateMath();
     private:
         Ui::TestForm *ui;

examples/jkqtplot_test/TestWidgetBarcharts.h

@@ -31,9 +31,9 @@ class TestWidgetBarcharts : public QWidget
     public:
         explicit TestWidgetBarcharts(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
 
         void setBarchartLogLog(bool checked);

examples/jkqtplot_test/TestWidgetContourPlots.h

@@ -32,9 +32,9 @@ class TestWidgetContourPlots : public QWidget
     public:
         explicit TestWidgetContourPlots(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
 
     protected:

examples/jkqtplot_test/TestWidgetEmptyPlot.h

@@ -27,9 +27,9 @@ class TestWidgetEmptyPlot : public QWidget
     public:
         explicit TestWidgetEmptyPlot(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
 
     protected:

examples/jkqtplot_test/TestWidgetFunctionPlots.h

@@ -30,9 +30,9 @@ class TestWidgetFunctionPlots : public QWidget
     public:
         explicit TestWidgetFunctionPlots(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
 
         void setPFuncStyle();

examples/jkqtplot_test/TestWidgetGeometry.h

@@ -29,9 +29,9 @@ class TestWidgetGeometry : public QWidget
     public:
         explicit TestWidgetGeometry(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
 
     protected:

examples/jkqtplot_test/TestWidgetGraphs.h

@@ -29,9 +29,9 @@ class TestWidgetGraphs : public QWidget
     public:
         explicit TestWidgetGraphs(QWidget *parent = nullptr);
         
-    signals:
+    Q_SIGNALS:
         
-    protected slots:
+    protected Q_SLOTS:
 
         void setErrorLineStyle(int index);
         void setESSymbol(int index);

examples/jkqtplot_test/TestWidgetImages.h

@@ -27,9 +27,9 @@ class TestWidgetImages : public QWidget
     public:
         explicit TestWidgetImages(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
 
         void setImgPalette(int index);

examples/jkqtplot_test/TestWidgetLogGraphs.h

@@ -29,9 +29,9 @@ class TestWidgetLogGraphs : public QWidget
     public:
         explicit TestWidgetLogGraphs(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
 
     protected:

examples/jkqtplot_test/TestWidgetParamScatterPlots.h

@@ -31,9 +31,9 @@ class TestWidgetParamScatterPlots : public QWidget
     public:
         explicit TestWidgetParamScatterPlots(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
         void setPSPSymmErrors(bool checked);
 

examples/jkqtplot_test/TestWidgetPeaksPlots.h

@@ -26,9 +26,9 @@ class TestWidgetPeaksPlots : public QWidget
     public:
         explicit TestWidgetPeaksPlots(QWidget *parent = nullptr);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
         void setDrawBaseline(bool checked);
         void setYPeaks(bool checked);
 

examples/jkqtplot_test/TestWidgetRGBImages.h

@@ -32,9 +32,9 @@ class TestWidgetRGBImages : public QWidget
     public:
         explicit TestWidgetRGBImages(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
         void setRGBColorBars(bool checked);
 
         void setRGBMode1(int mode);

examples/jkqtplot_test/testmain.h

@@ -16,9 +16,9 @@ class TestMain : public QTabWidget
     public:
         explicit TestMain(QWidget *parent = 0);
         
-    signals:
+    Q_SIGNALS:
         
-    public slots:
+    public Q_SLOTS:
 
 
     protected:

examples/libexampletools/jkqtpexampleapplication.h

@@ -15,7 +15,7 @@ public:
     virtual ~JKQTPExampleApplication();
     void addExportStepFunctor(const std::function<void(void)>& f);
     int exec();
-public slots:
+public Q_SLOTS:
     void notifyReadyForScreenshot();
 protected:
     bool waitForScreenshotReady;

examples/mandelbrot/mandelbrotmainwindow.h

@@ -17,9 +17,9 @@ class MandelbrotMainWindow : public QMainWindow
 public:
     explicit MandelbrotMainWindow(QWidget *parent = nullptr);
     ~MandelbrotMainWindow();
-signals:
+Q_SIGNALS:
     void readyForScreenshot();
-protected slots:
+protected Q_SLOTS:
     void paletteChanged(JKQTPMathImageColorPalette pal);
     void plotZoomChangedLocally(double newxmin, double newxmax, double newymin, double newymax, JKQTPlotter* sender);
     void maxIterationsChanged(int maxIter);

examples/multiplot/test_multiplot_ui.h

@@ -19,7 +19,7 @@ class TestMultiplotUI : public QDialog
         explicit TestMultiplotUI(JKQTPlotter* plotTop_, JKQTPlotter* plotBot_, JKQTPlotter* plotRight_, QGridLayout* plotLayout_, QWidget *parent = nullptr);
         ~TestMultiplotUI();
 
-    protected slots:
+    protected Q_SLOTS:
         void updatePlot();
     private:
         JKQTPlotter* plotTop;

examples/speed/speedtestplot.h

@@ -36,7 +36,7 @@ class SpeedTestPlot: public JKQTPlotter {
         SpeedTestPlot();
 
         virtual ~SpeedTestPlot();
-    protected slots:
+    protected Q_SLOTS:
         void plotNewData();
         void updateDataSize(size_t newSize, bool updatePlots=true);
         static double addOutlier(double prob, double height);

examples/styling/jkqtpstyleplaintextedit.h

@@ -11,7 +11,7 @@ public:
     virtual ~JKQTPStylePlainTextEdit();
 protected:
     void contextMenuEvent(QContextMenuEvent *event) override;
-protected slots:
+protected Q_SLOTS:
     void changeCurrentLineValueTo(const QString &targetText);
     void addTransparencyToCurrentLineValue(const QString &targetText);
     void addMathFontSpecifier(const QString &newMath);

examples/styling/test_styling.h

@@ -18,7 +18,7 @@ class TestStyling : public QMainWindow
         explicit TestStyling(QWidget *parent = nullptr);
         ~TestStyling();
 
-    protected slots:
+    protected Q_SLOTS:
         void on_btnUpdate_clicked();
         void on_btnLoad_clicked(const QString &filename=QString());
         void on_btnSave_clicked();

examples/ui/formwithjkqtplotter.h

@@ -17,7 +17,7 @@ class FormWithJKQTPlotter : public QWidget
     public:
         explicit FormWithJKQTPlotter(QWidget *parent = nullptr);
         ~FormWithJKQTPlotter();
-    protected slots:
+    protected Q_SLOTS:
         void on_chkLogX_toggled(bool checked);
         void on_chkLogY_toggled(bool checked);
         void on_btnReplot_clicked();

examples/user_interaction/test_user_interaction.h

@@ -18,9 +18,9 @@ class TestUserInteraction : public QMainWindow
     public:
         explicit TestUserInteraction(QWidget *parent = nullptr);
 
-    signals:
+    Q_SIGNALS:
 
-    public slots:
+    public Q_SLOTS:
         void setMouseMoveAction(int index);
         void setLeftMouseAction(int index);
         void setLeftCtrlMouseAction(int index);

lib/jkqtfastplotter/jkqtfastplotter.h

@@ -948,7 +948,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFastPlotter :
         /** \brief draw the contents onto any <a href="http://doc.qt.io/qt-5/qpainter.html">QPainter</a>, starting at (0,0), returns the size of the whole plot in \a size, if supplied with the supplied\a background color */
         void draw(QPainter* painter, QColor background, QSize* size);
 
-    signals:
+    Q_SIGNALS:
         /** \brief emitted whenever the graph sizes (borders, plotWidth, plotHeight) change*/
         void plotterSizesChanged();
         /** \brief emitted whenever the graph is replotted */
@@ -967,7 +967,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFastPlotter :
         void mouseDragged(double x_start, double y_start, double x_end, double y_end, Qt::KeyboardModifiers modifiers);
         /** \brief emitted after the mouse has been dragged with the left button clicked */
         void mouseDragFinished(double x_start, double y_start, double x_end, double y_end, Qt::KeyboardModifiers modifiers);
-    public slots:
+    public Q_SLOTS:
         /** \brief copy the current plot image to the clipboard */
         void copyImage();
         /** \brief replot everything (slowest possible plotting) */
@@ -1031,7 +1031,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPPlot: public QObject {
 
         /** \brief start a replot of the parent widget */
         void replot();
-    public slots:
+    public Q_SLOTS:
         void setVisible(bool visible) { this->visible=visible; replot(); }
 
 };
@@ -1487,7 +1487,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPXRangePlot: public JKQTFPPlot {
         {
             return this->showCenterline; 
         }
-    public slots:
+    public Q_SLOTS:
         void setCenterline(int centerline) {
             if (this->centerline!=centerline) {
                 this->centerline=centerline;
@@ -1651,7 +1651,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPYRangePlot: public JKQTFPPlot {
         {
             return this->showCenterline; 
         }
-    public slots:
+    public Q_SLOTS:
         void setCenterline(int centerline) {
             if (this->centerline!=centerline) {
                 this->centerline=centerline;
@@ -2570,7 +2570,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPimagePlot: public JKQTFPPlot {
             this->height=height;
             replot();
         }
-    public slots:
+    public Q_SLOTS:
         void setRotation(int rotation) {
             if (this->rotation!=rotation) {
                 this->rotation=rotation;
@@ -2977,7 +2977,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPRGBImageOverlayPlot: public JKQTFPPlot {
         void setImage(void* imageRed, JKQTFPImageFormat imageFormatRed, int width, int height, double xmin, double xmax, double ymin, double ymax);
         void setImage(void* imageRed, JKQTFPImageFormat imageFormatRed, void* imageGreen, JKQTFPImageFormat imageFormatGreen, int width, int height, double xmin, double xmax, double ymin, double ymax);
         void setImage(void* imageRed, JKQTFPImageFormat imageFormatRed, void* imageGreen, JKQTFPImageFormat imageFormatGreen, void* imageBlue, JKQTFPImageFormat imageFormatBlue, int width, int height, double xmin, double xmax, double ymin, double ymax);
-    public slots:
+    public Q_SLOTS:
         inline void setRotation(int rotation) {
             if (this->rotation!=rotation) {
                 this->rotation=rotation;
@@ -3238,7 +3238,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPimageOverlayPlot: public JKQTFPPlot {
         inline QColor getColor() const { 
             return this->color; 
         }
-    public slots:
+    public Q_SLOTS:
         inline void setRotation(int rotation) {
             if (this->rotation!=rotation) {
                 this->rotation=rotation;
@@ -3370,7 +3370,7 @@ class JKQTFASTPLOTTER_LIB_EXPORT JKQTFPQScaleBarXPlot: public JKQTFPPlot {
         {
             return this->position; 
         }
-    public slots:
+    public Q_SLOTS:
         void setPosition(int pos) {
             setPosition(static_cast<Position>(pos));
         }

lib/jkqtplotter/graphs/jkqtpbarchart.h

@@ -115,7 +115,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarVerticalGraph: public JKQTPBarGraphBase {
          */
         virtual bool getYMinMax(double& miny, double& maxy, double& smallestGreaterZero) override;
 
-    public slots:
+    public Q_SLOTS:
 
     protected:
 	
@@ -159,7 +159,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarVerticalErrorGraph: public JKQTPBarVertical
         /** \brief returns whether the errors of the bars are symmetric */
         bool getBarErrorSymmetric() const;
 
-    public slots:
+    public Q_SLOTS:
         /** \brief sets whether the errors of the bars are symmetric */
         void setBarErrorSymmetric(bool __value);
         /** \brief sets the error style of the bar */
@@ -256,7 +256,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarHorizontalGraph: public JKQTPBarGraphBase {
         virtual int getKeyColumn() const override;
         /** \brief returns the column used as "value" for the current graph (typically this call getXColumn(), but for horizontal graphs like filled curves or barcharts it may call getYColumn() ) */
         virtual int getValueColumn() const override;
-    public slots:
+    public Q_SLOTS:
         /** \brief sets the column used as "key" for the current graph (typically this call setXColumn(), but for horizontal graphs like filled curves or barcharts it may call setYColumn() ) */
         virtual void setKeyColumn(int __value) override;
         /** \brief sets the column used as "value" for the current graph (typically this call setXColumn(), but for horizontal graphs like filled curves or barcharts it may call setYColumn() ) */
@@ -306,7 +306,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarHorizontalErrorGraph: public JKQTPBarHorizo
         /** \brief returns whether the errors of the bars are symmetric */
         bool getBarErrorSymmetric() const;
 
-    public slots:
+    public Q_SLOTS:
         /** \brief sets whether the errors of the bars are symmetric */
         void setBarErrorSymmetric(bool __value);
         /** \brief sets the error style of the bar */

lib/jkqtplotter/graphs/jkqtpbarchartbase.h

@@ -170,7 +170,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarGraphBase: public JKQTPXYBaselineGraph, pub
         /** \copydoc m_baselineStyle */
         const JKQTPGraphLineStyleMixin& baselineStyle() const;
 
-    public slots:
+    public Q_SLOTS:
         /** \copydoc m_fillMode */
         void setFillMode(JKQTPBarGraphBase::FillMode mode);
 

lib/jkqtplotter/graphs/jkqtpboxplotbase.h

@@ -95,7 +95,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotGraphBase: public JKQTPGraph, public JK
 
         /** \copydoc useRelativeBoxWidth */
         bool getUseRelativeBoxWidth() const;
-    public slots:
+    public Q_SLOTS:
         /** \brief set the color of the graph (colors all elements, based on the given color \a c ) */
         virtual void setColor(QColor c);
         /** \copydoc sortData */
@@ -228,7 +228,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotElementBase: public JKQTPPlotElement, p
 
         /** \copydoc medianConfidenceIntervalWidth */
         double getMedianConfidenceIntervalWidth() const;
-    public slots:
+    public Q_SLOTS:
         /** \brief set the color of the graph (colors all elements, based on the given color \a c ) */
         virtual void setColor(QColor c);
 

lib/jkqtplotter/graphs/jkqtpevaluatedfunction.h

@@ -83,7 +83,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPEvaluatedFunctionWithErrorsGraphDrawingBase: p
 
 
 
-    public slots:
+    public Q_SLOTS:
         /** \brief set color, fill color and error color at the same time  */
         void setColor(QColor c);
 

lib/jkqtplotter/graphs/jkqtpevaluatedfunctionbase.h

@@ -122,7 +122,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPEvaluatedFunctionGraphBase: public JKQTPGraph
         double getDataCleanupMaxAllowedAngleDegree() const;
         /** \copydoc displaySamplePoints */
         bool getDisplaySamplePoints() const;
-	public slots:
+	public Q_SLOTS:
         /** \copydoc minSamples */
         void setMinSamples(const unsigned int & __value);
         /** \copydoc maxRefinementDegree */
@@ -254,7 +254,7 @@ public:
 
     /** \copydoc JKQTPGraph::usesColumn() */
     virtual bool usesColumn(int c) const override;
-public slots:
+public Q_SLOTS:
     /** \brief sets the error params as a pointer to an internal COPY of the given vector (not the data of the vector, as then the size would be unknown!!!) */
     void setErrorParams(const QVector<double>& errorParams);
     /** \copydoc errorParameterColumn */

lib/jkqtplotter/graphs/jkqtpevaluatedparametriccurve.h

@@ -86,7 +86,7 @@ public:
     /** \copydoc tmax */
     double getTMax() const;
 
-public slots:
+public Q_SLOTS:
     /** \copydoc tmin */
     void setTMin(double val);
     /** \copydoc tmax */

lib/jkqtplotter/graphs/jkqtpfilledcurve.h

@@ -65,7 +65,7 @@ public:
     /** \copydoc m_fillMode */
     FillMode getFillMode() const;
 
-public slots:
+public Q_SLOTS:
     /** \brief set line-color, fill color and symbol color */
     void setColor(QColor c);
     /** \copydoc m_fillMode */
@@ -227,7 +227,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPFilledCurveYGraph: public JKQTPFilledCurveGrap
         virtual int getKeyColumn() const override;
         /** \brief returns the column used as "value" for the current graph (typically this call getXColumn(), but for horizontal graphs like filled curves or barcharts it may call getYColumn() ) */
         virtual int getValueColumn() const override;
-    public slots:
+    public Q_SLOTS:
         /** \brief sets the column used as "key" for the current graph (typically this call setXColumn(), but for horizontal graphs like filled curves or barcharts it may call setYColumn() ) */
         virtual void setKeyColumn(int __value) override;
         /** \brief sets the column used as "value" for the current graph (typically this call setXColumn(), but for horizontal graphs like filled curves or barcharts it may call setYColumn() ) */

lib/jkqtplotter/graphs/jkqtpgeoannotations.h

@@ -156,7 +156,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPGeoSymbol: public JKQTPPlotAnnotationElement,
         virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
         /** \brief returns the color to be used for the key label */
         virtual QColor getKeyLabelColor() const override;
-    public slots:
+    public Q_SLOTS:
         /** set the symbol color and symbol fill color  */
         virtual void setColor(QColor c);
 
@@ -265,7 +265,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPGeoText: public JKQTPPlotAnnotationElement, pu
         virtual void drawKeyMarker(JKQTPEnhancedPainter& painter, QRectF& rect) override;
         /** \brief returns the color to be used for the key label */
         virtual QColor getKeyLabelColor() const override;
-	public slots:
+	public Q_SLOTS:
         /** \brief set line and fill color */
         virtual void setColor(QColor c) ;
 		

lib/jkqtplotter/graphs/jkqtpimage.h

@@ -94,7 +94,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImageBase: public JKQTPGraph {
         double getWidth() const;
         /** \copydoc height */
         double getHeight() const;
-    public slots:
+    public Q_SLOTS:
 
         /** \copydoc x */
         void setX(double __value);
@@ -407,7 +407,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImage: public JKQTPImageBase {
         virtual void setParent(JKQTBasePlotter* parent) override;
         /** \copydoc JKQTPImageBase::setTitle() */
         virtual void setTitle(const QString& title) override;
-    public slots:
+    public Q_SLOTS:
         /** \brief saves the image (asking the user for a filename, if \a filename is empty)
          *
          * \param filename name of the file that should be create (if empty, a file save dialog is shown)
@@ -564,7 +564,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPMathImage: public JKQTPMathImageBase, public J
     public:
         /** \copydoc JKQTPImageBase::setTitle() */
         virtual void setTitle(const QString& title) override;
-    public slots:
+    public Q_SLOTS:
         /** \brief saves the image (asking the user for a filename, if \a filename is empty)
          *
          * \param filename name of the file that should be create (if empty, a file save dialog is shown)

lib/jkqtplotter/graphs/jkqtpimageoverlays.h

@@ -118,7 +118,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPOverlayImage: public JKQTPImageBase {
         virtual void setTitle(const QString& title) override;
         /** \copydoc JKQTPImageBase::setParent() */
         virtual void setParent(JKQTBasePlotter* parent) override;
-    public slots:
+    public Q_SLOTS:
         /** \brief save the plotted image as a file with \a filename and format \a outputFormat */
         void saveImagePlotAsImage(const QString &filename=QString(""), const QByteArray &outputFormat=QByteArray());
         /** \brief copy the plotted image as an image into the clipboard */

lib/jkqtplotter/graphs/jkqtpimagergb.h

@@ -466,7 +466,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPRGBMathImage: public JKQTPMathImageBase {
     public:
         /** \copydoc JKQTPImageBase::setTitle() */
         virtual void setTitle(const QString& title) override;
-    public slots:
+    public Q_SLOTS:
         /** \brief save the plotted image as a file with \a filename and format \a outputFormat */
         void saveImagePlotAsImage(const QString &filename=QString(""), const QByteArray &outputFormat=QByteArray());
         /** \brief copy the plotted image as an image into the clipboard */

lib/jkqtplotter/graphs/jkqtpimpulses.h

@@ -57,7 +57,7 @@ public:
     const JKQTPGraphLineStyleMixin& baselineStyle() const;
 
 
-public slots:
+public Q_SLOTS:
     /** \brief color of symbols and impulses in one call  */
     virtual void setColor(QColor c);
 
@@ -131,7 +131,7 @@ public:
     /** \copydoc JKQTPXYGraph::getYMinMax() */
     virtual bool getYMinMax(double& miny, double& maxy, double& smallestGreaterZero) override;
 
-public slots:
+public Q_SLOTS:
     /** \brief sets the column used as "key" for the current graph (typically this call setXColumn(), but for horizontal graphs like filled curves or barcharts it may call setYColumn() ) */
     virtual void setKeyColumn(int __value) override;
     /** \brief sets the column used as "value" for the current graph (typically this call setXColumn(), but for horizontal graphs like filled curves or barcharts it may call setYColumn() ) */
@@ -170,7 +170,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImpulsesHorizontalErrorGraph: public JKQTPImpu
         /** \brief returns whether the errors of the bars are symmetric */
         bool getErrorSymmetric() const;
 
-    public slots:
+    public Q_SLOTS:
         /** \brief sets whether the errors of the bars are symmetric */
         void setErrorSymmetric(bool __value);
         /** \brief sets the error style of the bar */
@@ -250,7 +250,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImpulsesVerticalErrorGraph: public JKQTPImpuls
         /** \brief returns whether the errors of the bars are symmetric */
         bool getErrorSymmetric() const;
 
-    public slots:
+    public Q_SLOTS:
         /** \brief sets whether the errors of the bars are symmetric */
         void setErrorSymmetric(bool __value);
         /** \brief sets the error style of the bar */

lib/jkqtplotter/graphs/jkqtpparsedfunction.h

@@ -67,7 +67,7 @@ public:
     /** \copydoc dependentVariableName */
     QString getDependentVariableName() const;
 
-public slots:
+public Q_SLOTS:
     /** \copydoc errorFunction */
     void setErrorFunction(const QString & __value);
     /** \copydoc function */

lib/jkqtplotter/graphs/jkqtprange.h

@@ -98,7 +98,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPRangeBase: public JKQTPPlotElement, public JKQ
         bool getFillRange() const;
         /** \copydoc plotRangeLines */
         bool getPlotRangeLines() const;
-    public slots:
+    public Q_SLOTS:
         /** \brief set the color of the graph (all lines and filling)  */
         virtual void setColor(QColor c);
 

lib/jkqtplotter/graphs/jkqtpspecialline.h

@@ -69,7 +69,7 @@ public:
 
     Q_PROPERTY(bool drawSymbols READ getDrawSymbols WRITE setDrawSymbols)
     Q_PROPERTY(JKQTPSpecialLineType specialLineType READ getSpecialLineType WRITE setSpecialLineType)
-public slots:
+public Q_SLOTS:
     /** \brief set line-color, fill color and symbol color */
     void setColor(QColor c);
     /** \copydoc m_drawSymbols */
@@ -132,7 +132,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPSpecialLineVerticalGraph: public JKQTPSpecialL
         virtual int getKeyColumn() const override;
         /** \brief returns the column used as "value" for the current graph (typically this call getXColumn(), but for horizontal graphs like filled curves or barcharts it may call getYColumn() ) */
         virtual int getValueColumn() const override;
-    public slots:
+    public Q_SLOTS:
         /** \brief sets the column used as "key" for the current graph (typically this call setXColumn(), but for horizontal graphs like filled curves or barcharts it may call setYColumn() ) */
         virtual void setKeyColumn(int __value) override;
         /** \brief sets the column used as "value" for the current graph (typically this call setXColumn(), but for horizontal graphs like filled curves or barcharts it may call setYColumn() ) */

lib/jkqtplotter/graphs/jkqtpviolinplot.h

@@ -86,7 +86,7 @@ public:
 
     /** \copydoc violinFrequencyColumn */
     int getViolinFrequencyColumn() const;
-public slots:
+public Q_SLOTS:
     /** \brief set the color of the graph (colors all elements, based on the given color \a c ) */
     virtual void setColor(QColor c);
     /** \copydoc violinFrequencyColumn */

lib/jkqtplotter/gui/jkqtpcomboboxes.h

@@ -45,9 +45,9 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPMathImageColorPaletteComboBox: public QComboBo
         JKQTPMathImageColorPalette getColorPalette() const;
         void setColorPalette(JKQTPMathImageColorPalette palette);
         void setCurrentColorPalette(JKQTPMathImageColorPalette palette);
-    signals:
+    Q_SIGNALS:
         void currentPaletteChanged(JKQTPMathImageColorPalette palette);
-    protected slots:
+    protected Q_SLOTS:
         void intIndexChanged(int i);
 
 };
@@ -113,11 +113,11 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPKeyPositionComboBox: public QComboBox {
 
         JKQTPKeyPosition getPosition() const;
         void setPosition(JKQTPKeyPosition position);
-    signals:
+    Q_SIGNALS:
         void currentPositionChanged(JKQTPKeyPosition pos);
     protected:
         void addPosition(JKQTPKeyPosition position, const QString& name, const QIcon& icon=QIcon());
-    protected slots:
+    protected Q_SLOTS:
         void posChanged(int index);
 };
 
@@ -135,11 +135,11 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPKeyLayoutComboBox: public QComboBox {
 
         JKQTPKeyLayout getKeyLayout() const;
         void setKeyLayout(JKQTPKeyLayout layout);
-    signals:
+    Q_SIGNALS:
         void currentLayoutChanged(JKQTPKeyLayout layout);
     protected:
         void addKeyLayout(JKQTPKeyLayout layout, const QString& name);
-    protected slots:
+    protected Q_SLOTS:
         void currentIndexChangedP(int index);
 };
 

lib/jkqtplotter/gui/jkqtpenhancedspinboxes.h

@@ -35,9 +35,9 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPEnhancedDoubleSpinBox : public QDoubleSpinBox
     public:
         JKQTPEnhancedDoubleSpinBox(QWidget* parent=nullptr);
         ~JKQTPEnhancedDoubleSpinBox();
-    signals:
+    Q_SIGNALS:
         void editingFinished(double value);
-    protected slots:
+    protected Q_SLOTS:
         void intEditingFinished();
 };
 
@@ -53,9 +53,9 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPEnhancedSpinBox : public QSpinBox {
     public:
         JKQTPEnhancedSpinBox(QWidget* parent=nullptr);
         ~JKQTPEnhancedSpinBox();
-    signals:
+    Q_SIGNALS:
         void editingFinished(int value);
-    protected slots:
+    protected Q_SLOTS:
         void intEditingFinished();
 };
 

lib/jkqtplotter/gui/jkqtpenhancedtableview.h

@@ -83,10 +83,10 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPEnhancedTableView : public QTableView {
         /** \brief return a QAction that prints the table using the methode print() \see print() */
         inline QAction* getActionPrint() { return printAction; }
 #endif
-    signals:
+    Q_SIGNALS:
         /** \brief emitted when a key is pressed in the context of this widget */
         void keyPressed(int key, Qt::KeyboardModifiers modifiers, const QString& text);
-    public slots:
+    public Q_SLOTS:
         /** \brief copy the selected cells' contents to the clipboard, so it can be pasted into Excel */
         void copySelectionToExcel(int copyrole=Qt::EditRole, bool storeHead=true);
         /** \brief copy the selected cells' contents to the clipboard, so it can be pasted into Excel, without header */

lib/jkqtplotter/gui/jkqtpgraphsmodel.h

@@ -47,7 +47,7 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) override;
     Qt::ItemFlags flags(const QModelIndex & index) const override ;
-public slots:
+public Q_SLOTS:
     void plotUpdated();
 private:
     JKQTBasePlotter* m_plotter;

lib/jkqtplotter/gui/jkvanishqtoolbar.h

@@ -44,7 +44,7 @@ class JKQTPLOTTER_LIB_EXPORT JKVanishQToolBar: public QToolBar {
         JKVanishQToolBar(QWidget* parent=nullptr);
         /** \brief is the auto-vanishing feature of this toolbar activated? */
         bool doesToolbarVanish() const;
-    public slots:
+    public Q_SLOTS:
         /** \brief enable or disable the auto-vanishing feature of this toolbar  */
         void setToolbarVanishesEnabled(bool __value);
     protected:

lib/jkqtplotter/jkqtpbaseplotter.h

@@ -624,7 +624,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
         /** \brief sort the graphs, using functor \a compareLess to find whether a first graph shall be before (i.e. less) than a second graph. After completing the operation, the graph is updated */
         void sortGraphs(const std::function<bool(const JKQTPPlotElement* , const JKQTPPlotElement* )>& compareLess);
 
-    public slots:
+    public Q_SLOTS:
         /** \brief remove all plots
          *
          *  \param deleteGraphs if set \c true (default) the graph objects will also be deleted
@@ -1471,7 +1471,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
 
 
 
-    signals:
+    Q_SIGNALS:
         /** \brief signal: emitted whenever the user selects a new x-y zoom range (by mouse) */
         void zoomChangedLocally(double newxmin, double newxmax, double newymin, double newymax, JKQTBasePlotter* sender);
 
@@ -1517,7 +1517,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
         void afterPrinting();
 
 
-    public slots:
+    public Q_SLOTS:
 
 
         /** \brief sets the width of the plot widget
@@ -2132,7 +2132,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject {
         double getPaintMagnification() const;
 
 
-    protected slots:
+    protected Q_SLOTS:
         /** \brief internal function for print/export preview
          * \internal
          */

lib/jkqtplotter/jkqtpcoordinateaxes.h

@@ -468,7 +468,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPCoordinateAxis: public QObject {
         /** \brief calls x2p() of the other axis (or returns \c NAN if the other axis does not exist */
         virtual double parentOtherAxisX2P(double x) const =0;
 
-    public slots:
+    public Q_SLOTS:
         /** \brief set range of plot axis */
         void setRange(double amin, double amax);
         /** \brief set absolute range of plot axis */
@@ -1025,7 +1025,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPVerticalIndependentAxis: public JKQTPVerticalA
         virtual double getParentOtheraxisOffset() const override;
         /** copydoc JKQTPCoordinateAxis::parentOtherAxisX2P() */
         virtual double parentOtherAxisX2P(double x) const override;
-    public slots:
+    public Q_SLOTS:
         /** \brief set the axis offset */
         virtual void setAxisOffset(double __value) ;
         /** \brief set the axis width */
@@ -1206,7 +1206,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPHorizontalIndependentAxis: public JKQTPHorizon
         virtual double getParentOtheraxisOffset() const override;
         /** copydoc JKQTPCoordinateAxis::parentOtherAxisX2P() */
         virtual double parentOtherAxisX2P(double x) const override;
-    public slots:
+    public Q_SLOTS:
         /** \brief set the axis offset */
         virtual void setAxisOffset(double __value);
         /** \brief set the axis width */

lib/jkqtplotter/jkqtpdatastorage.h

@@ -2489,7 +2489,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPDatastoreModel: public QAbstractTableModel {
         virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
         virtual int columnCount(const QModelIndex &parent = QModelIndex()) const  override;
 
-    public slots:
+    public Q_SLOTS:
         void reloadModel();
 
     protected:

lib/jkqtplotter/jkqtpgraphsbase.h

@@ -110,7 +110,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPPlotElement: public QObject {
         Q_PROPERTY(bool visible READ isVisible WRITE setVisible)
         Q_PROPERTY(QString title READ getTitle WRITE setTitle)
         Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted)
-    public slots:
+    public Q_SLOTS:
         /** \brief sets whether the graph is visible in the plot  */
         void setVisible(bool __value);
         /** \brief sets whether the graph is drawn in a highlighted style in the plot  */
@@ -499,7 +499,7 @@ public:
     DrawMode getDrawMode() const;
 
     Q_PROPERTY(DrawMode drawMode READ getDrawMode WRITE setDrawMode)
-public slots:
+public Q_SLOTS:
     /** \copybrief m_drawMode
          *
          *  \param mode the DrawMode to use from now on
@@ -544,7 +544,7 @@ public:
     /** \brief default wirtual destructor */
     virtual ~JKQTPPlotAnnotationElement() ;
 
-public slots:
+public Q_SLOTS:
 
 protected:
 
@@ -630,7 +630,7 @@ public:
      * \see See JKQTPPlotElement::hitTest() for details on the function definition!
      */
     virtual double hitTest(const QPointF &posSystem, QPointF* closestSpotSystem=nullptr, QString* label=nullptr, HitTestMode mode=HitTestXY) const override;
-public slots:
+public Q_SLOTS:
     /** \brief sets xColumn and yColumn at the same time */
     void setXYColumns(size_t xCol, size_t yCol);
     /** \brief sets xColumn and yColumn at the same time */
@@ -713,7 +713,7 @@ public:
     double getBaseline() const;
 
     Q_PROPERTY(double baseline READ getBaseline WRITE setBaseline)
-public slots:
+public Q_SLOTS:
     /** \copydoc m_baseline */
     void setBaseline(double __value);
 
@@ -770,7 +770,7 @@ public:
     virtual double hitTest(const QPointF &posSystem, QPointF* closestSpotSystem=nullptr, QString* label=nullptr, HitTestMode mode=HitTestXY) const override;
 
     Q_PROPERTY(int yColumn2 READ getYColumn2 WRITE setYColumn2)
-public slots:
+public Q_SLOTS:
     /** \brief sets xColumn, yColumn and yColumn2 at the same time */
     void setXYYColumns(size_t xCol, size_t yCol, size_t y2Col);
     /** \brief sets xColumn, yColumn and yColumn2 at the same time */
@@ -831,7 +831,7 @@ public:
     virtual double hitTest(const QPointF &posSystem, QPointF* closestSpotSystem=nullptr, QString* label=nullptr, HitTestMode mode=HitTestXY) const override;
 
     Q_PROPERTY(int xColumn2 READ getXColumn2 WRITE setXColumn2)
-public slots:
+public Q_SLOTS:
     /** \brief sets xColumn, yColumn and xColumn2 at the same time */
     void setXXYColumns(size_t xCol, size_t x2Col, size_t yCol);
     /** \brief sets xColumn, yColumn and xColumn2 at the same time */
@@ -913,7 +913,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPSingleColumnGraph: public JKQTPGraph {
         Q_PROPERTY(int dataColumn READ getDataColumn WRITE setDataColumn)
         Q_PROPERTY(DataDirection dataDirection READ getDataDirection WRITE setDataDirection)
 
-    public slots:
+    public Q_SLOTS:
         /** \copydoc dataColumn */
         void setDataColumn(int __value);
         /** \copydoc dataColumn */

lib/jkqtplotter/jkqtplotter.h

@@ -912,7 +912,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
             plotter->copyPixelImage(showPreview);
         }
 
-    public slots:
+    public Q_SLOTS:
         /** \brief set the current plot magnification */
         void setMagnification(double m);
         /** \brief sets x/ymin and x/ymax to the supplied values and replots the graph (zoom operation!) */
@@ -1226,7 +1226,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
          * \see setX(), setX(), zoomToFit(), setAbsoluteXY(), JKQTBasePlotter::setXY()
          */
          inline void setXY(double xminn, double xmaxx, double yminn, double ymaxx, bool affectsSecondaryAxes=false) { plotter->setXY(xminn, xmaxx, yminn, ymaxx, affectsSecondaryAxes); }
-    signals:
+    Q_SIGNALS:
         /** \brief emitted whenever the mouse moves
          *
          * \param x x-position of the mouse (in plot coordinates)
@@ -1317,7 +1317,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
          * \param newymax end of the selected x-range (in plot coordinates)
          * \param sender JKQTPlotter sending this event
          *
-         * This signal is designed to be connected to these slots: synchronizeXAxis(), synchronizeYAxis(), synchronizeXYAxis()
+         * This signal is designed to be connected to these Q_SLOTS: synchronizeXAxis(), synchronizeYAxis(), synchronizeXYAxis()
          */
         void zoomChangedLocally(double newxmin, double newxmax, double newymin, double newymax, JKQTPlotter* sender);
 
@@ -1327,7 +1327,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
          * \param new_height new height of the widget (in pixels)
          * \param sender JKQTPlotter sending this event
          *
-         * This signal is designed to be connected to these slots: synchronizeXAxis(), synchronizeYAxis(), synchronizeXYAxis()
+         * This signal is designed to be connected to these Q_SLOTS: synchronizeXAxis(), synchronizeYAxis(), synchronizeXYAxis()
          */
         void widgetResized(int new_width, int new_height, JKQTPlotter* sender);
 
@@ -1732,7 +1732,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
         QAction* actMouseLeftAsPanView;
 
         virtual bool event(QEvent *event) override;
-    protected slots:
+    protected Q_SLOTS:
         /** \brief while the window is resized, the plot is only redrawn after a restartable delay, implemented by this function and resizeTimer
         * \internal
         * \see resizeTimer