From d4849811d3731de86c0c5d0bf8de4b7dad5f781b Mon Sep 17 00:00:00 2001
From: Jens Geudens <jensgeudens@hotmail.com>
Date: Thu, 17 Apr 2025 21:36:17 +0200
Subject: [PATCH 1/2] Limit include paths

---
 CMakeLists.txt                      | 2 --
 src/customwidgets/connectionform.ui | 2 +-
 src/dialogs/connectiondialog.ui     | 2 +-
 src/dialogs/mainwindow.ui           | 8 ++++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38eb1041..5104a737 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,8 +50,6 @@ set(QT_LIB
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/customwidgets
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/graphview
     ${CMAKE_CURRENT_SOURCE_DIR}/libraries/qcustomplot
     ${CMAKE_CURRENT_SOURCE_DIR}/libraries/muparser/include
 )
diff --git a/src/customwidgets/connectionform.ui b/src/customwidgets/connectionform.ui
index e7dc40bb..c487917a 100644
--- a/src/customwidgets/connectionform.ui
+++ b/src/customwidgets/connectionform.ui
@@ -263,7 +263,7 @@
   <customwidget>
    <class>SerialPortCombo</class>
    <extends>QComboBox</extends>
-   <header>serialportcombo.h</header>
+   <header>customwidgets/serialportcombo.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/dialogs/connectiondialog.ui b/src/dialogs/connectiondialog.ui
index a0fbe940..416f3594 100644
--- a/src/dialogs/connectiondialog.ui
+++ b/src/dialogs/connectiondialog.ui
@@ -81,7 +81,7 @@
   <customwidget>
    <class>ConnectionForm</class>
    <extends>QWidget</extends>
-   <header>connectionform.h</header>
+   <header>customwidgets/connectionform.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/dialogs/mainwindow.ui b/src/dialogs/mainwindow.ui
index 888dcc4a..2ad6187d 100755
--- a/src/dialogs/mainwindow.ui
+++ b/src/dialogs/mainwindow.ui
@@ -523,25 +523,25 @@
   <customwidget>
    <class>ScopePlot</class>
    <extends>QWidget</extends>
-   <header>scopeplot.h</header>
+   <header>graphview/scopeplot.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>Legend</class>
    <extends>QFrame</extends>
-   <header>legend.h</header>
+   <header>customwidgets/legend.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>MarkerInfo</class>
    <extends>QFrame</extends>
-   <header>markerinfo.h</header>
+   <header>customwidgets/markerinfo.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>ScaleDock</class>
    <extends>QWidget</extends>
-   <header>scaledock.h</header>
+   <header>customwidgets/scaledock.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

From 3af2f872bf5809eb64c34f20a5675c7fee367bd4 Mon Sep 17 00:00:00 2001
From: Jens Geudens <jensgeudens@hotmail.com>
Date: Thu, 17 Apr 2025 21:59:09 +0200
Subject: [PATCH 2/2] Explicit library includes

---
 CMakeLists.txt                        |  3 +-
 src/dialogs/aboutdialog.cpp           |  2 +-
 src/dialogs/mainwindow.cpp            |  2 +-
 src/graphview/axistickertime.h        |  2 +-
 src/graphview/noteitem.cpp            |  2 +-
 src/graphview/scopeplot.h             |  2 +-
 src/graphview/valueaxis.h             |  2 +-
 src/importexport/datafileexporter.cpp |  2 +-
 src/models/graphdata.h                |  2 +-
 src/util/muparserregister.h           | 40 +++++++++++++--------------
 10 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5104a737..ed0ef0af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,8 +50,7 @@ set(QT_LIB
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/libraries/qcustomplot
-    ${CMAKE_CURRENT_SOURCE_DIR}/libraries/muparser/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/libraries
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
diff --git a/src/dialogs/aboutdialog.cpp b/src/dialogs/aboutdialog.cpp
index 64ae66d6..d93191b0 100644
--- a/src/dialogs/aboutdialog.cpp
+++ b/src/dialogs/aboutdialog.cpp
@@ -1,8 +1,8 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 
-#include "qcustomplot.h"
 #include "muParserDef.h"
+#include "qcustomplot/qcustomplot.h"
 
 #include "util/updatenotify.h"
 #include "util/util.h"
diff --git a/src/dialogs/mainwindow.cpp b/src/dialogs/mainwindow.cpp
index 112ce407..e804b9b2 100755
--- a/src/dialogs/mainwindow.cpp
+++ b/src/dialogs/mainwindow.cpp
@@ -24,7 +24,7 @@
 #include "models/mbcregistermodel.h"
 #include "models/notemodel.h"
 #include "models/settingsmodel.h"
-#include "qcustomplot.h"
+#include "qcustomplot/qcustomplot.h"
 #include "util/expressionstatus.h"
 #include "util/fileselectionhelper.h"
 #include "util/scopelogging.h"
diff --git a/src/graphview/axistickertime.h b/src/graphview/axistickertime.h
index ca5bff56..4c6713d2 100644
--- a/src/graphview/axistickertime.h
+++ b/src/graphview/axistickertime.h
@@ -2,7 +2,7 @@
 #define AXISTICKERTIME_H
 
 #include <QObject>
-#include "qcustomplot.h"
+#include "qcustomplot/qcustomplot.h"
 
 class AxisTickerTime : public QCPAxisTickerTime
 {
diff --git a/src/graphview/noteitem.cpp b/src/graphview/noteitem.cpp
index 30df599d..7f6bdb40 100644
--- a/src/graphview/noteitem.cpp
+++ b/src/graphview/noteitem.cpp
@@ -2,7 +2,7 @@
 #include "noteitem.h"
 
 #include "graphview/scopeplot.h"
-#include "qcustomplot.h"
+#include "qcustomplot/qcustomplot.h"
 
 NoteItem::NoteItem(ScopePlot* pPlot,
                    const QString& rText,
diff --git a/src/graphview/scopeplot.h b/src/graphview/scopeplot.h
index 3e5f6bdf..959fa7ba 100644
--- a/src/graphview/scopeplot.h
+++ b/src/graphview/scopeplot.h
@@ -1,8 +1,8 @@
 #ifndef SCOPEPLOT_H
 #define SCOPEPLOT_H
 
+#include "qcustomplot/qcustomplot.h"
 #include <QObject>
-#include "qcustomplot.h"
 
 class ScopePlot : public QCustomPlot
 {
diff --git a/src/graphview/valueaxis.h b/src/graphview/valueaxis.h
index 4623cda6..5821d424 100644
--- a/src/graphview/valueaxis.h
+++ b/src/graphview/valueaxis.h
@@ -2,7 +2,7 @@
 #define VALUEAXIS_H
 
 #include <QObject>
-#include "qcustomplot.h"
+#include "qcustomplot/qcustomplot.h"
 
 class ValueAxis : public QCPAxis
 {
diff --git a/src/importexport/datafileexporter.cpp b/src/importexport/datafileexporter.cpp
index e382550c..814aba71 100755
--- a/src/importexport/datafileexporter.cpp
+++ b/src/importexport/datafileexporter.cpp
@@ -4,7 +4,7 @@
 #include "models/graphdatamodel.h"
 #include "models/notemodel.h"
 #include "models/settingsmodel.h"
-#include "qcustomplot.h"
+#include "qcustomplot/qcustomplot.h"
 #include "util/formatdatetime.h"
 #include "util/util.h"
 
diff --git a/src/models/graphdata.h b/src/models/graphdata.h
index b4b04317..f09ac38a 100755
--- a/src/models/graphdata.h
+++ b/src/models/graphdata.h
@@ -3,7 +3,7 @@
 
 #include <QtGlobal>
 #include <QColor>
-#include "qcustomplot.h"
+#include "qcustomplot/qcustomplot.h"
 
 class GraphData
 {
diff --git a/src/util/muparserregister.h b/src/util/muparserregister.h
index 25ff13ac..53ddd5a2 100644
--- a/src/util/muparserregister.h
+++ b/src/util/muparserregister.h
@@ -33,29 +33,29 @@
 #include <vector>
 
 //--- Parser includes --------------------------------------------------------------------------
-#include "muParserBase.h"
+#include "muparser/include/muParserBase.h"
 
 /** \file
-	\brief Definition of a modbus register expression parser.
+    \brief Definition of a modbus register expression parser.
 */
 
 namespace mu
 {
 	/** \brief Mathematical expressions parser.
 	*/
-	class API_EXPORT_CXX ParserRegister final : public ParserBase
-	{
-	public:
-        ParserRegister();
-        ParserRegister(const ParserRegister& a_Parser);
+class API_EXPORT_CXX ParserRegister final : public ParserBase
+{
+public:
+    ParserRegister();
+    ParserRegister(const ParserRegister& a_Parser);
 
-        typedef void (*registerCb_t)(int, double*, bool*);
+    typedef void (*registerCb_t)(int, double*, bool*);
 
-        static void setRegisterCallback(registerCb_t registerCb);
+    static void setRegisterCallback(registerCb_t registerCb);
 
-        virtual void InitCharSets();
-        virtual void InitFun();
-        virtual void InitConst();
+    virtual void InitCharSets();
+    virtual void InitFun();
+    virtual void InitConst();
         virtual void InitOprt();
 
     private:
@@ -64,14 +64,14 @@ namespace mu
 
         static value_type Shr(value_type v1, value_type v2);
         static value_type Shl(value_type v1, value_type v2);
-        static value_type LogAnd(value_type v1, value_type v2);
-        static value_type LogOr(value_type v1, value_type v2);
-        static value_type Not(value_type v1);
-        static value_type Mod(value_type v1, value_type v2);
-        static value_type RegVal(value_type v1);
-
-        static int IsVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal);
-        static int IsHexVal(const char_type* a_szExpr, int* a_iPos, value_type* a_iVal);
+    static value_type LogAnd(value_type v1, value_type v2);
+    static value_type LogOr(value_type v1, value_type v2);
+    static value_type Not(value_type v1);
+    static value_type Mod(value_type v1, value_type v2);
+    static value_type RegVal(value_type v1);
+
+    static int IsVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal);
+    static int IsHexVal(const char_type* a_szExpr, int* a_iPos, value_type* a_iVal);
         static int IsBinVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal);
 
         static registerCb_t _registerCb;