any head file path ref mode changed

DSView/pv/data/analogsnapshot.cpp

@@ -20,16 +20,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-
 #include <algorithm>
  
 #include "analogsnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 

DSView/pv/data/decodermodel.h

@@ -23,7 +23,7 @@
 
 #include <QAbstractTableModel>
   
-#include <pv/data/decode/rowdata.h>
+#include "decode/rowdata.h"
 
 namespace pv {
 namespace data {

DSView/pv/data/dsosnapshot.cpp

@@ -19,16 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-
 #include <algorithm>
  
 #include "dsosnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 

DSView/pv/data/groupsnapshot.cpp

@@ -18,9 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <extdef.h>
-
+ 
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ -30,6 +28,7 @@
 
 #include "logicsnapshot.h"
 #include "groupsnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 

DSView/pv/data/logicsnapshot.cpp

@@ -19,9 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <extdef.h>
-
+  
 #include <QDebug>
 
 #include <assert.h>
@@ -30,6 +28,7 @@
 #include <math.h>
  
 #include "logicsnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 

DSView/pv/data/spectrumstack.cpp

@@ -20,10 +20,10 @@
 
 #include "spectrumstack.h"
  
-#include <pv/data/dso.h>
-#include <pv/data/dsosnapshot.h>
-#include <pv/sigsession.h>
-#include <pv/view/dsosignal.h>
+#include "dso.h"
+#include "dsosnapshot.h"
+#include "../sigsession.h"
+#include "../view/dsosignal.h"
 #include <math.h>
 
 #define PI 3.1415

DSView/pv/device/devinst.cpp

@@ -25,7 +25,7 @@
 
 #include "devinst.h"
 
-#include <pv/sigsession.h>
+#include "../sigsession.h"
 
 namespace pv {
 namespace device {

DSView/pv/dialogs/about.h

@@ -27,8 +27,7 @@
 #include <QLabel>
 #include "dsdialog.h"
 
-#include <libsigrok4DSL/libsigrok.h>
-
+  
 namespace pv {
 namespace dialogs {
 

DSView/pv/dialogs/calibration.h

@@ -31,7 +31,7 @@
 
 #include <list> 
 
-#include <pv/device/devinst.h>
+#include "../device/devinst.h"
 #include "../toolbars/titlebar.h"
 #include "dsdialog.h"
 

DSView/pv/dialogs/deviceoptions.cpp

@@ -27,7 +27,7 @@
 #include <QDoubleSpinBox>
 
 #include "dsmessagebox.h"
-#include <pv/prop/property.h>
+#include "../prop/property.h"
 #include "../dsvdef.h"
 
 using namespace boost;

DSView/pv/dialogs/storeprogress.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "storeprogress.h" 
-#include "pv/sigsession.h"
+#include "../sigsession.h"
 #include <QGridLayout>
 #include <QDialogButtonBox>
 #include <QTimer>

DSView/pv/dock/triggerdock.cpp

@@ -35,7 +35,7 @@
 #include <QApplication>
 #include <math.h>
 
-#include "libsigrok4DSL/libsigrok.h"
+#include <libsigrok4DSL/libsigrok.h>
 
 namespace pv {
 namespace dock {

DSView/pv/mainframe.cpp

@@ -46,7 +46,7 @@
 
 #include "dsvdef.h"
 #include "config/appconfig.h"
-#include "../ui/msgbox.h"
+#include "ui/msgbox.h"
 
 #include <algorithm>
 

DSView/pv/mainwindow.cpp

@@ -87,10 +87,10 @@
 #include <glib.h>
 #include <list>
 #include <libusb.h>
-#include "../ui/msgbox.h"
+#include "ui/msgbox.h"
 #include "config/appconfig.h"
 #include "appcontrol.h"
-#include "../dsvdef.h"
+#include "dsvdef.h"
   
 
 namespace pv {

DSView/pv/prop/binding/binding.cpp

@@ -23,8 +23,7 @@
 
 #include <QFormLayout>
 
-#include <pv/prop/property.h>
-
+#include "../property.h"
 #include "binding.h"
  
 

DSView/pv/prop/binding/decoderoptions.cpp

@@ -26,12 +26,12 @@
  
 #include <boost/none_t.hpp>
 
-#include <pv/data/decoderstack.h>
-#include <pv/data/decode/decoder.h>
-#include <pv/prop/double.h>
-#include <pv/prop/enum.h>
-#include <pv/prop/int.h>
-#include <pv/prop/string.h>
+#include "../../data/decoderstack.h"
+#include "../../data/decode/decoder.h"
+#include "../double.h"
+#include "../enum.h"
+#include "../int.h"
+#include "../string.h"
 
 using namespace boost;
 using namespace std;

DSView/pv/prop/binding/deviceoptions.cpp

@@ -31,7 +31,7 @@
 #include "../double.h"
 #include "../enum.h"
 #include "../int.h"
-#include "../config/appconfig.h"
+#include "../../config/appconfig.h"
 
 using namespace boost;
 using namespace std;

DSView/pv/prop/binding/probeoptions.cpp

@@ -26,10 +26,10 @@
 #include <QDebug>
 #include <QObject>
 #include <stdint.h>
-#include <pv/prop/bool.h>
-#include <pv/prop/double.h>
-#include <pv/prop/enum.h>
-#include <pv/prop/int.h>
+#include "../bool.h"
+#include "../double.h"
+#include "../enum.h"
+#include "../int.h"
 
 #include "../../config/appconfig.h"
 

DSView/pv/storesession.cpp

@@ -50,7 +50,7 @@
 #include <QTextStream>
 #include <QDebug>
 
-#include <libsigrokdecode4DSL/libsigrokdecode.h> 
+#include <libsigrokdecode4DSL/libsigrokdecode.h>
 #include "config/appconfig.h"
 #include "dsvdef.h"
  

DSView/pv/toolbars/samplingbar.cpp

@@ -20,12 +20,10 @@
  */
 
 #include "samplingbar.h"
+#include "../extdef.h"
 
-#include <extdef.h>
-#include <assert.h>
- 
+#include <assert.h> 
 #include <libusb.h>
-
 #include <QAction>
 #include <QDebug>
 #include <QLabel>

DSView/pv/view/analogsignal.cpp

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+ 
 #include <QDebug>
 #include <math.h>
 
@@ -29,6 +29,7 @@
 #include "../data/analogsnapshot.h"
 #include "../view/view.h"
 #include "../device/devinst.h"
+#include "../extdef.h"
 
 
 using namespace std;

DSView/pv/view/cursor.cpp

@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <extdef.h>
+#include "../extdef.h"
 
 namespace pv {
 namespace view {

DSView/pv/view/decodetrace.cpp

@@ -21,7 +21,7 @@
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
 
-#include <extdef.h>
+#include "../extdef.h"
 
  
 #include <boost/functional/hash.hpp>

DSView/pv/view/decodetrace.h

@@ -30,7 +30,7 @@
 #include <QSignalMapper>
 #include <QFormLayout>
 
-#include <pv/prop/binding/decoderoptions.h>
+#include "../prop/binding/decoderoptions.h"
 #include "../dialogs/dsdialog.h"
 
 struct srd_channel;

DSView/pv/view/dsosignal.cpp

@@ -19,13 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-#include <math.h>
-
-#include "../../extdef.h"
+#include "../extdef.h"
 #include "dsosignal.h"
-#include "pv/data/dso.h"
-#include "pv/data/dsosnapshot.h"
+#include "../data/dso.h"
+#include "../data/dsosnapshot.h"
 #include "view.h"
 #include "../sigsession.h"
 #include "../device/devinst.h" 
@@ -33,6 +30,7 @@
 #include <QTimer>
 #include <functional>
 #include <QApplication>
+#include <math.h>
  
 using namespace std;
 

DSView/pv/view/groupsignal.cpp

@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-#include <math.h>
-
+#include "../extdef.h"
 #include "groupsignal.h"
-#include "pv/data/group.h"
-#include "pv/data/groupsnapshot.h"
+#include "../data/group.h"
+#include "../data/groupsnapshot.h"
 #include "view.h"
+
+#include <math.h>
  
 using namespace std;
 

DSView/pv/view/header.cpp

@@ -41,7 +41,7 @@
 #include "decodetrace.h"
 #include "../sigsession.h"
 #include "../device/devinst.h"
-#include "../../extdef.h"
+#include "../extdef.h"
 #include "../dsvdef.h"
 
  

DSView/pv/view/lissajoustrace.cpp

@@ -19,14 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+ 
 #include <math.h>
 
-#include "../../extdef.h"
-#include "lissajoustrace.h"
-#include "pv/data/dso.h"
-#include "pv/data/dsosnapshot.h"
 #include "view.h"
+#include "../extdef.h"
+#include "lissajoustrace.h"
+#include "../data/dso.h"
+#include "../data/dsosnapshot.h"
 #include "../sigsession.h"
 #include "../device/devinst.h"
 

DSView/pv/view/logicsignal.cpp

@@ -21,18 +21,15 @@
  */
 
 #include <libsigrokdecode4DSL/libsigrokdecode.h>
-
-#include <extdef.h>
-
+ 
 #include <QDebug>
-
 #include <math.h>
-
 #include "logicsignal.h"
 #include "view.h"
-#include "pv/data/logic.h"
-#include "pv/data/logicsnapshot.h"
+#include "../data/logic.h"
+#include "../data/logicsnapshot.h"
 #include "view.h"
+#include "../extdef.h"
 
 using namespace boost;
 using namespace std;

DSView/pv/view/mathtrace.cpp

@@ -19,10 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+
 #include <math.h>
 
-#include "../../extdef.h"
 #include "mathtrace.h"
 #include "../data/dso.h"
 #include "../data/dsosnapshot.h"
@@ -32,6 +31,7 @@
 #include "../device/devinst.h"
 #include "../view/dsosignal.h"
 #include "../dsvdef.h"
+#include "../extdef.h"
   
 #include <QDebug>
 #include <QTimer>

DSView/pv/view/ruler.cpp

@@ -28,7 +28,7 @@
 #include "../sigsession.h"
 #include "../device/devinst.h"
 #include "dsosignal.h"
-#include "../../extdef.h"
+#include "../extdef.h"
 
 #include <assert.h>
 #include <math.h>

DSView/pv/view/signal.cpp

@@ -20,14 +20,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
-
-#include <math.h>
- 
-
+  
+#include <math.h> 
 #include "signal.h"
 #include "view.h"
 #include "../device/devinst.h"
+#include "../extdef.h"
 
 namespace pv {
 namespace view {

DSView/pv/view/spectrumtrace.cpp

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+ 
 #include <algorithm>
 #include <math.h>
 #include <QTextStream>
@@ -34,6 +34,7 @@
 #include "../device/devinst.h"
 #include "../data/spectrumstack.h"
 #include "../dsvdef.h"
+#include "../extdef.h"
 
 using namespace boost;
 using namespace std;

DSView/pv/view/trace.cpp

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+ 
 #include <assert.h>
 #include <math.h> 
 #include <QFormLayout>
@@ -31,6 +31,7 @@
 #include "view.h"
 #include "../device/devinst.h"
 #include "../sigsession.h"
+#include "../extdef.h"
 
 
 namespace pv {

DSView/pv/view/view.cpp

@@ -42,11 +42,11 @@
 #include "analogsignal.h"
 
 #include "../device/devinst.h"
-#include "pv/sigsession.h"
-#include "pv/data/logic.h"
-#include "pv/data/logicsnapshot.h"
-#include "pv/dialogs/calibration.h"
-#include "pv/dialogs/lissajousoptions.h"
+#include "../sigsession.h"
+#include "../data/logic.h"
+#include "../data/logicsnapshot.h"
+#include "../dialogs/calibration.h"
+#include "../dialogs/lissajousoptions.h"
 
 
 using namespace std;

DSView/pv/view/view.h

@@ -33,7 +33,7 @@
 #include <QDateTime>
 #include <QSplitter>
 
-#include "../../extdef.h"
+ 
 #include "../toolbars/samplingbar.h"
 #include "../data/signaldata.h"
 #include "../view/viewport.h"
@@ -41,6 +41,7 @@
 #include "xcursor.h"
 #include "signal.h"
 #include "viewstatus.h"
+#include "../extdef.h"
 
 namespace pv {
 

DSView/pv/view/viewport.h

@@ -33,7 +33,7 @@
 #include <QElapsedTimer>
 
 #include "../view/view.h"
-#include "../../extdef.h"
+#include "../extdef.h"
 
 class QPainter;
 class QPaintEvent;

DSView/pv/view/viewstatus.h

@@ -28,7 +28,6 @@
 #include <QPushButton>
 #include <QToolButton>
  
-
 #include <libsigrok4DSL/libsigrok.h>
 
 namespace pv {

DSView/test/data/analogsnapshot.cpp

@@ -17,15 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-
-#include <extdef.h>
-
+ 
 #define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
 #include <boost/test/unit_test.hpp>
-
 #include "../../pv/data/analogsnapshot.h"
+#include "../extdef.h"
 
 using namespace std;
 

DSView/test/data/logicsnapshot.cpp

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <extdef.h>
+#include "../extdef.h"
 
 #define __STDC_LIMIT_MACROS
 #include <stdint.h>

libsigrok4DSL/hardware/DSL/command.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 #include "command.h"
 #include "dsl.h"

libsigrok4DSL/hardware/DSL/command.h

@@ -21,8 +21,8 @@
 #define LIBDSL_HARDWARE_COMMAND_H
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 /* Protocol commands */
 #define CMD_CTL_WR              0xb0

libsigrok4DSL/hardware/DSL/dscope.c

@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 #include "dsl.h"
 #include "command.h"

libsigrok4DSL/hardware/DSL/dsl.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 #include "command.h"
 #include "dsl.h"
 

libsigrok4DSL/hardware/DSL/dsl.h

@@ -22,8 +22,8 @@
 #define LIBDSL_HARDWARE_DSL_H
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 #include "command.h"
 
 #include <stdio.h>

libsigrok4DSL/hardware/DSL/dslogic.c

@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 #include "dsl.h"
 #include "command.h"

libsigrok4DSL/hardware/common/ezusb.c

@@ -20,8 +20,8 @@
 /*
  * Helper functions for the Cypress EZ-USB / FX2 series chips.
  */
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 //#include <libusb.h>
 #include <glib.h>
 #include <glib/gstdio.h>

libsigrok4DSL/hardware/common/usb.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 #include <stdlib.h>
 #include <glib.h>
 //#include <libusb.h>

libsigrok4DSL/hardware/demo/demo.h

@@ -22,8 +22,8 @@
 #define LIBDSL_HARDWARE_DEMO_H
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../../libsigrok.h"
+#include "../../libsigrok-internal.h"
 
 #include <stdio.h>
 #include <stdlib.h>

libsigrok4DSL/input/in_binary.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>

libsigrok4DSL/input/in_vcd.c

@@ -57,8 +57,8 @@
 
 /*  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <glib.h>
 #include <stdio.h>

libsigrok4DSL/input/in_wav.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

libsigrok4DSL/input/input.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 
 /**
  * @file

libsigrok4DSL/output/csv.c

@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE_STRING and others. */
+#include "../config.h" /* Needed for PACKAGE_STRING and others. */
 
 #define LOG_PREFIX "output/csv"
  

libsigrok4DSL/output/gnuplot.c

@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

libsigrok4DSL/output/output.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <string.h>
 
 /** @cond PRIVATE */

libsigrok4DSL/output/srzip.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>

libsigrok4DSL/output/vcd.c

@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
+#include "../libsigrok.h"
+#include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE and others. */
+#include "../config.h" /* Needed for PACKAGE and others. */
 
 #define LOG_PREFIX "output/vcd"
 

qtpro/DSView.pro

@@ -27,16 +27,14 @@ CONFIG += decoders
 DEFINES += decoders
 
 unix:!macx {
-INCLUDEPATH += /usr/local/include/
 INCLUDEPATH += /usr/include/glib-2.0
 INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
 INCLUDEPATH += /usr/include/libusb-1.0
 INCLUDEPATH += /usr/include/boost
 INCLUDEPATH += /usr/include/python3.8
 INCLUDEPATH += ..
-INCLUDEPATH += ../libsigrok4DSL
-INCLUDEPATH += ../DSView
-INCLUDEPATH += ../DSView/pv/dialogs
+#INCLUDEPATH += ../libsigrok4DSL
+#INCLUDEPATH += ../DSView
 
 LIBS += /usr/lib/x86_64-linux-gnu/libglib-2.0.so
 LIBS += /usr/lib/x86_64-linux-gnu/libusb-1.0.so
@@ -57,9 +55,8 @@ INCLUDEPATH += /usr/local/include/libusb-1.0
 INCLUDEPATH += /usr/local/include/boost
 INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m
 INCLUDEPATH += ..
-INCLUDEPATH += ../libsigrok4DSL
-INCLUDEPATH += ../DSView
-INCLUDEPATH += ../DSView/pv/dialogs
+#INCLUDEPATH += ../libsigrok4DSL
+#INCLUDEPATH += ../DSView
 
 #LIBS += -framework CoreFoundation
 #LIBS += -framework CoreServices
@@ -176,7 +173,7 @@ SOURCES += \
     ../DSView/pv/dstimer.cpp
 
 HEADERS  += \
-    ../DSView/extdef.h \
+    ../DSView/pv/extdef.h \
     ../DSView/config.h \
     ../DSView/pv/sigsession.h \
     ../DSView/pv/mainwindow.h \

qtpro/DSView.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.0, 2021-11-23T18:40:01. -->
+<!-- Written by QtCreator 4.11.0, 2021-11-24T15:20:06. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>