code reorganization

2025-01-23 22:22:11 +08:00 · 2019-05-18 13:22:46 +02:00 · 2019-05-18 13:22:46 +02:00 · 5f62722d38
commit 5f62722d38
parent 2b1649c7b7
86 changed files with 119 additions and 119 deletions
--- a/examples/jkqtplot_test/TestWidgetBarcharts.h
+++ b/examples/jkqtplot_test/TestWidgetBarcharts.h
@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/jkqtplot_test/TestWidgetContourPlots.h
+++ b/examples/jkqtplot_test/TestWidgetContourPlots.h
@ -18,7 +18,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/jkqtplot_test/TestWidgetEmptyPlot.h
+++ b/examples/jkqtplot_test/TestWidgetEmptyPlot.h
@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/jkqtplot_test/TestWidgetFunctionPlots.h
+++ b/examples/jkqtplot_test/TestWidgetFunctionPlots.h
@ -18,7 +18,7 @@
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
 #include "jkqtplottergui/jkqtpcomboboxes.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/jkqtplot_test/TestWidgetGeometry.h
+++ b/examples/jkqtplot_test/TestWidgetGeometry.h
@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/jkqtplot_test/TestWidgetGraphs.h
+++ b/examples/jkqtplot_test/TestWidgetGraphs.h
@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/jkqtplot_test/TestWidgetImages.h
+++ b/examples/jkqtplot_test/TestWidgetImages.h
@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/jkqtplot_test/TestWidgetLogGraphs.h
+++ b/examples/jkqtplot_test/TestWidgetLogGraphs.h
@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"



--- a/examples/jkqtplot_test/TestWidgetParamScatterPlots.h
+++ b/examples/jkqtplot_test/TestWidgetParamScatterPlots.h
@ -17,7 +17,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/jkqtplot_test/TestWidgetRGBImages.h
+++ b/examples/jkqtplot_test/TestWidgetRGBImages.h
@ -18,7 +18,7 @@
 #include "jkqtplotter/jkqtpgraphsparsedfunction.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplottergui/jkqtpgraphsmodel.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define N1 200
 #define N2 50
--- a/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp
+++ b/examples/simpletest_dateaxes/jkqtplotter_simpletest_dateaxes.cpp
@ -12,7 +12,7 @@
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsgeometric.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsfilledcurve.h"

 void drawWithDateAxis(JKQTPlotter& plot) {
--- a/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp
+++ b/examples/simpletest_errorbarstyles/jkqtplotter_simpletest_errorbarstyles.cpp
@ -7,7 +7,7 @@
 #include <QApplication>
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"


 int main(int argc, char* argv[])
--- a/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp
+++ b/examples/simpletest_logaxes/jkqtplotter_simpletest_logaxes.cpp
@ -8,7 +8,7 @@
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsgeometric.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #define sqr(x) ((x)*(x))

--- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp
+++ b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots.cpp
@ -8,7 +8,7 @@
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsspecialline.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 int main(int argc, char* argv[])
 {
--- a/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp
+++ b/examples/simpletest_stepplots/jkqtplotter_simpletest_stepplots_vertical.cpp
@ -8,7 +8,7 @@
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsspecialline.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 int main(int argc, char* argv[])
 {
--- a/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp
+++ b/examples/simpletest_symbols_and_styles/jkqtplotter_simpletest_symbols_and_styles.cpp
@ -7,7 +7,7 @@
 #include <QApplication>
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"


 int main(int argc, char* argv[])
--- a/lib/common.pri
+++ b/lib/common.pri
@ -11,11 +11,11 @@
    DEFINES += _CRT_NO_VA_START_VALIDATION
 }

-HEADERS += $$PWD/jkqtplottertools/jkqtp_imexport.h \
-           $$PWD/jkqtplottertools/jkqtptools.h
+HEADERS += $$PWD/jkqtcommon/jkqtp_imexport.h \
+           $$PWD/jkqtcommon/jkqtptools.h


-SOURCES += $$PWD/jkqtplottertools/jkqtptools.cpp
+SOURCES += $$PWD/jkqtcommon/jkqtptools.cpp

 INCLUDEPATH += $$PWD 

--- a/lib/jkqtplottertools/jkqtp_imexport.h
+++ b/lib/jkqtplottertools/jkqtp_imexport.h
@ -30,7 +30,7 @@
    This file allows to export functions and classes from this directory in a dynamic/shared lib and to append the
    correct __declspec() declaration on windows. If you want to export one, make sure you have set
    \code
-    #include "jkqtplottertools/jkqtp_imexport.h"
+    #include "jkqtcommon/jkqtp_imexport.h"

    class JKQTP_LIB_EXPORT exportedClassName {
       ...
--- a/lib/jkqtplottertools/jkqtptools.cpp
+++ b/lib/jkqtplottertools/jkqtptools.cpp
@ -21,7 +21,7 @@ Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)



-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include <cmath>
 #include <QDebug>
--- a/lib/jkqtplottertools/jkqtptools.h
+++ b/lib/jkqtplottertools/jkqtptools.h
@ -21,7 +21,7 @@

 #ifndef JKQTPTOOLS_H_INCLUDED
 #define JKQTPTOOLS_H_INCLUDED
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QString>
 #include <QElapsedTimer>
 #include <QLocale>
--- a/lib/jkqtfastplotter/jkqtfastplotter.cpp
+++ b/lib/jkqtfastplotter/jkqtfastplotter.cpp
@ -20,7 +20,7 @@


 #include "jkqtfastplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QLocale>
 #include <QPainter>
 #include <QPaintEvent>
--- a/lib/jkqtfastplotter/jkqtfastplotter.h
+++ b/lib/jkqtfastplotter/jkqtfastplotter.h
@ -28,7 +28,7 @@
 #ifndef JKQTFASTPLOTTER_H
 #define JKQTFASTPLOTTER_H

-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QWidget>
 #include <QVector>
 #include <QSettings>
@ -42,7 +42,7 @@
 #include <QMutex>
 #include <QGLWidget>

-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #ifdef DEBUG_TIMING
 #  include "jkqtplottertools/jkqtphighrestimer.h"
 #endif
--- a/lib/jkqtmathtext/jkqtmathtext.cpp
+++ b/lib/jkqtmathtext/jkqtmathtext.cpp
@ -20,7 +20,7 @@


 #include "jkqtmathtext/jkqtmathtext.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QFontMetricsF>
 #include <QDebug>
 #include <QFontDatabase>
--- a/lib/jkqtmathtext/jkqtmathtext.h
+++ b/lib/jkqtmathtext/jkqtmathtext.h
@ -36,8 +36,8 @@
 #include <QString>
 #include <QSet>
 #include <QFile>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QWidget>
 #include <QLabel>
 #include <QHash>
--- a/lib/jkqtplotter/jkqtpbaseplotter.h
+++ b/lib/jkqtplotter/jkqtpbaseplotter.h
@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpdatastorage.h"
 #include "jkqtplotter/jkqtpbaseplotterstyle.h"
 #include "jkqtmathtext/jkqtmathtext.h"
@ -45,7 +45,7 @@
 #include <vector>
 #include <cmath>
 #include <iostream>
- #include "jkqtplottertools/jkqtp_imexport.h"
+ #include "jkqtcommon/jkqtp_imexport.h"


 #ifndef JKQTPBASEPLOTTER_H
--- a/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
+++ b/lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
@ -1,7 +1,7 @@
 #include "jkqtpbaseplotterstyle.h"
 #include <QPalette>
 #include <QApplication>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 JKQTBasePlotterStyle::JKQTBasePlotterStyle():
    debugShowRegionBoxes(false),
--- a/lib/jkqtplotter/jkqtpbaseplotterstyle.h
+++ b/lib/jkqtplotter/jkqtpbaseplotterstyle.h
@ -20,11 +20,11 @@
 #ifndef JKQTBASEPLOTTERSTYLE_H
 #define JKQTBASEPLOTTERSTYLE_H

-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpcoordinateaxesstyle.h"
 #include "jkqtplotter/jkqtpkeystyle.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QColor>
 #include <QPainter>
 #include <QString>
--- a/lib/jkqtplotter/jkqtpcoordinateaxes.h
+++ b/lib/jkqtplotter/jkqtpcoordinateaxes.h
@ -28,9 +28,9 @@
 #include <QPainter>
 #include <QPair>
 #include <QSettings>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtmathtext/jkqtmathtext.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpcoordinateaxesstyle.h"

 // forward declarations
--- a/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h
+++ b/lib/jkqtplotter/jkqtpcoordinateaxesstyle.h
@ -23,8 +23,8 @@
 #include <QSettings>
 #include <QString>
 #include <QColor>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"

 class JKQTBasePlotterStyle; // forward

--- a/lib/jkqtplotter/jkqtpdatastorage.h
+++ b/lib/jkqtplotter/jkqtpdatastorage.h
@ -19,8 +19,8 @@



-#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <vector>
 #include <cmath>
 #include <iostream>
--- a/lib/jkqtplotter/jkqtpelementsoverlay.cpp
+++ b/lib/jkqtplotter/jkqtpelementsoverlay.cpp
@ -21,7 +21,7 @@

 #include "jkqtplotter/jkqtpelementsoverlay.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 #include <stdlib.h>
 #include <QDebug>
--- a/lib/jkqtplotter/jkqtpelementsoverlay.h
+++ b/lib/jkqtplotter/jkqtpelementsoverlay.h
@ -22,8 +22,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"

 #ifndef jkqtpelementsoverlay_H
--- a/lib/jkqtplotter/jkqtpgraphsbarchart.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsbarchart.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
--- a/lib/jkqtplotter/jkqtpgraphsbarchart.h
+++ b/lib/jkqtplotter/jkqtpgraphsbarchart.h
@ -20,8 +20,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
--- a/lib/jkqtplotter/jkqtpgraphsbase.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsbase.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
--- a/lib/jkqtplotter/jkqtpgraphsbase.h
+++ b/lib/jkqtplotter/jkqtpgraphsbase.h
@ -23,8 +23,8 @@
 #include <QPair>
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"

 #ifndef JKQTPGRAPHSBASE_H
--- a/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsbaseerrors.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
--- a/lib/jkqtplotter/jkqtpgraphsbaseerrors.h
+++ b/lib/jkqtplotter/jkqtpgraphsbaseerrors.h
@ -24,8 +24,8 @@
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"

 #ifndef JKQTPGRAPHSBASEERROR_H
--- a/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h
+++ b/lib/jkqtplotter/jkqtpgraphsbasestylingmixins.h
@ -22,8 +22,8 @@
 #include <QPainter>
 #include <QPen>
 #include <QBrush>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"


--- a/lib/jkqtplotter/jkqtpgraphsboxplot.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsboxplot.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
--- a/lib/jkqtplotter/jkqtpgraphsboxplot.h
+++ b/lib/jkqtplotter/jkqtpgraphsboxplot.h
@ -21,8 +21,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsboxplotstylingmixins.h"
--- a/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
--- a/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h
+++ b/lib/jkqtplotter/jkqtpgraphsboxplotstylingmixins.h
@ -20,8 +20,8 @@

 #include <QString>
 #include <QPainter>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"

--- a/lib/jkqtplotter/jkqtpgraphscontour.cpp
+++ b/lib/jkqtplotter/jkqtpgraphscontour.cpp
@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphscontour.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
--- a/lib/jkqtplotter/jkqtpgraphscontour.h
+++ b/lib/jkqtplotter/jkqtpgraphscontour.h
@ -27,11 +27,11 @@
 #include <QImage>
 #include <QIcon>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"


--- a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
--- a/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h
+++ b/lib/jkqtplotter/jkqtpgraphsevaluatedfunction.h
@ -24,7 +24,7 @@
 #include <QPair>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <functional>

 #ifndef jkqtpgraphsevaluatedfunction_H
--- a/lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsfilledcurve.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
--- a/lib/jkqtplotter/jkqtpgraphsfilledcurve.h
+++ b/lib/jkqtplotter/jkqtpgraphsfilledcurve.h
@ -18,7 +18,7 @@
 */


-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/jkqtpgraphsspecialline.h"
--- a/lib/jkqtplotter/jkqtpgraphsgeometric.h
+++ b/lib/jkqtplotter/jkqtpgraphsgeometric.h
@ -23,8 +23,8 @@
 #include <QPair>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtmathtext/jkqtmathtext.h"

 #ifndef jkqtpgraphsgeometric_H_INCLUDED
--- a/lib/jkqtplotter/jkqtpgraphsimage.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsimage.cpp
@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
--- a/lib/jkqtplotter/jkqtpgraphsimage.h
+++ b/lib/jkqtplotter/jkqtpgraphsimage.h
@ -27,9 +27,9 @@
 #include <QImage>
 #include <QIcon>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"


--- a/lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsimageoverlays.cpp
@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphsimageoverlays.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
--- a/lib/jkqtplotter/jkqtpgraphsimageoverlays.h
+++ b/lib/jkqtplotter/jkqtpgraphsimageoverlays.h
@ -27,10 +27,10 @@
 #include <QImage>
 #include <QIcon>
 #include "jkqtplotter/jkqtpgraphsscatter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"


--- a/lib/jkqtplotter/jkqtpgraphsimagergb.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsimagergb.cpp
@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphsimagergb.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include <QDebug>
--- a/lib/jkqtplotter/jkqtpgraphsimagergb.h
+++ b/lib/jkqtplotter/jkqtpgraphsimagergb.h
@ -27,9 +27,9 @@
 #include <QImage>
 #include <QIcon>
 #include "jkqtplotter/jkqtpgraphsimage.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpimagetools.h"


--- a/lib/jkqtplotter/jkqtpgraphsimpulses.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsimpulses.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
--- a/lib/jkqtplotter/jkqtpgraphsimpulses.h
+++ b/lib/jkqtplotter/jkqtpgraphsimpulses.h
@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplotter/jkqtpgraphsbaseerrors.h"
 #include "jkqtplotter/jkqtpgraphsbasestylingmixins.h"
--- a/lib/jkqtplotter/jkqtpgraphsparsedfunction.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsparsedfunction.cpp
@ -21,7 +21,7 @@
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplotter/jkqtplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <stdlib.h>
 #include <QDebug>
 #include <QElapsedTimer>
--- a/lib/jkqtplotter/jkqtpgraphsparsedfunction.h
+++ b/lib/jkqtplotter/jkqtpgraphsparsedfunction.h
@ -24,9 +24,9 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpmathparser.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsevaluatedfunction.h"

 // forward declarations
--- a/lib/jkqtplotter/jkqtpgraphspeakstream.cpp
+++ b/lib/jkqtplotter/jkqtpgraphspeakstream.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
--- a/lib/jkqtplotter/jkqtpgraphsrange.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsrange.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
--- a/lib/jkqtplotter/jkqtpgraphsrange.h
+++ b/lib/jkqtplotter/jkqtpgraphsrange.h
@ -21,8 +21,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
--- a/lib/jkqtplotter/jkqtpgraphsscatter.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsscatter.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
--- a/lib/jkqtplotter/jkqtpgraphsscatter.h
+++ b/lib/jkqtplotter/jkqtpgraphsscatter.h
@ -22,8 +22,8 @@
 #include <QPainter>
 #include <QPair>
 #include <functional>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
--- a/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp
+++ b/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
 #include "jkqtplotter/jkqtplotter.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
--- a/lib/jkqtplotter/jkqtpgraphsspecialline.cpp
+++ b/lib/jkqtplotter/jkqtpgraphsspecialline.cpp
@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <QDebug>
 #include <iostream>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpimagetools.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include "jkqtplotter/jkqtpbaseelements.h"
--- a/lib/jkqtplotter/jkqtpgraphsspecialline.h
+++ b/lib/jkqtplotter/jkqtpgraphsspecialline.h
@ -21,8 +21,8 @@
 #include <QString>
 #include <QPainter>
 #include <QPair>
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottertools/jkqtpdrawingtools.h"
 #include "jkqtplotter/jkqtpgraphsbase.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"
--- a/lib/jkqtplotter/jkqtpkeystyle.h
+++ b/lib/jkqtplotter/jkqtpkeystyle.h
@ -20,8 +20,8 @@
 #ifndef JKQTPSTYLE_H
 #define JKQTPSTYLE_H

-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QColor>
 #include <QString>
 #include <QSettings>
--- a/lib/jkqtplotter/jkqtplotter.h
+++ b/lib/jkqtplotter/jkqtplotter.h
@ -41,8 +41,8 @@
 #include "jkqtplotter/jkqtpbaseplotter.h"
 #include "jkqtplotter/jkqtplotterstyle.h"
 #include "jkqtplotter/jkqtpbaseplotterstyle.h"
-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplottergui/jkvanishqtoolbar.h"
 #include <QKeyEvent>

--- a/lib/jkqtplotter/jkqtplotterstyle.cpp
+++ b/lib/jkqtplotter/jkqtplotterstyle.cpp
@ -1,7 +1,7 @@
 #include "jkqtplotterstyle.h"
 #include <QApplication>
 #include "jkqtplottertools/jkqttools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 JKQTPlotterStyle::JKQTPlotterStyle():
    maxTooltipDistance(16),
--- a/lib/jkqtplotter/jkqtplotterstyle.h
+++ b/lib/jkqtplotter/jkqtplotterstyle.h
@ -20,8 +20,8 @@
 #ifndef JKQTPLOTTERSTYLE_H
 #define JKQTPLOTTERSTYLE_H

-#include "jkqtplottertools/jkqtptools.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QColor>
 #include <QPainter>
 #include <QString>
--- a/lib/jkqtplotter/jkqtpopencvinterface.h
+++ b/lib/jkqtplotter/jkqtpopencvinterface.h
@ -19,7 +19,7 @@



-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpdatastorage.h"
 #include <opencv2/core.hpp>

--- a/lib/jkqtplottergui/jkqtpcomboboxes.cpp
+++ b/lib/jkqtplottergui/jkqtpcomboboxes.cpp
@ -21,7 +21,7 @@

 #include "jkqtplottergui/jkqtpcomboboxes.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QImage>


--- a/lib/jkqtplottergui/jkqtpcomboboxes.h
+++ b/lib/jkqtplottergui/jkqtpcomboboxes.h
@ -23,11 +23,11 @@
 #define JKQTPCOMBOBOXES_H

 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include "jkqtplotter/jkqtpgraphsimage.h"
 #include <QComboBox>
 #include "jkqtplottertools/jkqtpimagetools.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"



--- a/lib/jkqtplottergui/jkqtpenhancedspinboxes.h
+++ b/lib/jkqtplottergui/jkqtpenhancedspinboxes.h
@ -20,7 +20,7 @@

 #ifndef jkqtpenhancedspinboxes_H_INCLUDED
 #define jkqtpenhancedspinboxes_H_INCLUDED
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"

 #include <QSpinBox>
 #include <QDoubleSpinBox>
--- a/lib/jkqtplottergui/jkqtpenhancedtableview.cpp
+++ b/lib/jkqtplottergui/jkqtpenhancedtableview.cpp
@ -34,7 +34,7 @@ Copyright (c) 2008-2019 Jan W. Krieger (<jan@jkrieger.de>)
 #include <QHeaderView>
 #include <QPrintDialog>
 #include <QLabel>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplottertools/jkqtpenhancedpainter.h"


--- a/lib/jkqtplottergui/jkqtpenhancedtableview.h
+++ b/lib/jkqtplottergui/jkqtpenhancedtableview.h
@ -20,7 +20,7 @@

 #ifndef JKQTPEnhancedTableView_H_INCLUDED
 #define JKQTPEnhancedTableView_H_INCLUDED
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QTableView>
 #include <QPrinter>

--- a/lib/jkqtplottergui/jkqtpgraphsmodel.cpp
+++ b/lib/jkqtplottergui/jkqtpgraphsmodel.cpp
@ -21,7 +21,7 @@

 #include "jkqtplottergui/jkqtpgraphsmodel.h"
 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"
 #include "jkqtplotter/jkqtpgraphsscatter.h"
 #include <QImage>

--- a/lib/jkqtplottergui/jkqtpgraphsmodel.h
+++ b/lib/jkqtplottergui/jkqtpgraphsmodel.h
@ -23,7 +23,7 @@
 #define jkqtpgraphsmodel_H

 #include "jkqtplotter/jkqtpbaseplotter.h"
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"

 #include <QAbstractTableModel>

--- a/lib/jkqtplottergui/jkvanishqtoolbar.h
+++ b/lib/jkqtplottergui/jkvanishqtoolbar.h
@ -21,8 +21,8 @@

 #ifndef jkvanishqtoolbar_H
 #define jkvanishqtoolbar_H
-#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QToolBar>

 /** \brief a modified <a href="http://doc.qt.io/qt-5/qtoolbar.html">QToolBar</a> which vanishes when the mouse leaves the toolbar.
--- a/lib/jkqtplottertools/jkqtpdrawingtools.h
+++ b/lib/jkqtplottertools/jkqtpdrawingtools.h
@ -20,8 +20,8 @@

 #ifndef JKQTPDRAWINGTOOLS_H_INCLUDED
 #define JKQTPDRAWINGTOOLS_H_INCLUDED
-#include "jkqtplottertools/jkqtp_imexport.h"
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtptools.h"
 #include <QPaintDevice>

 class JKQTPEnhancedPainter; // forward
--- a/lib/jkqtplottertools/jkqtpenhancedpainter.h
+++ b/lib/jkqtplottertools/jkqtpenhancedpainter.h
@ -20,7 +20,7 @@

 #ifndef JKQTPENHANCED_PAINTERS_H
 #define JKQTPENHANCED_PAINTERS_H
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QPainter>


--- a/lib/jkqtplottertools/jkqtpimagetools.h
+++ b/lib/jkqtplottertools/jkqtpimagetools.h
@ -24,15 +24,15 @@
 #include <QDebug>
 #include <QImage>
 #include <QStringList>
-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <cmath>
 #include <cfloat>
 #include <stdint.h>
 #include <QColor>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 #ifndef NO_JKQTPLOTTER
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"

 class JKQTPVerticalIndependentAxis; // forward
 class JKQTPHorizontalIndependentAxis; // forward
--- a/lib/jkqtplottertools/jkqtpmathparser.h
+++ b/lib/jkqtplottertools/jkqtpmathparser.h
@ -54,7 +54,7 @@
 #include <ctype.h>
 #include <list>
 #include <utility>
-#include "jkqtplottertools/jkqtptools.h"
+#include "jkqtcommon/jkqtptools.h"


 #ifndef JKQTPMATHPARSER_H
--- a/lib/jkqtplottertools/jkqttools.h
+++ b/lib/jkqtplottertools/jkqttools.h
@ -24,7 +24,7 @@
 #ifndef JKQTTOOLS_H
 #define JKQTTOOLS_H

-#include "jkqtplottertools/jkqtp_imexport.h"
+#include "jkqtcommon/jkqtp_imexport.h"
 #include <QSettings>
 #include <QWidget>
 #include <QSplitter>