From 050b6023d52ef53a5787b89b97bf5e6a1f51deb8 Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Wed, 24 Nov 2021 17:04:12 +0800 Subject: [PATCH] any head file path ref mode changed --- DSView/pv/data/analogsnapshot.cpp | 4 +--- DSView/pv/data/decodermodel.h | 2 +- DSView/pv/data/dsosnapshot.cpp | 4 +--- DSView/pv/data/groupsnapshot.cpp | 5 ++--- DSView/pv/data/logicsnapshot.cpp | 5 ++--- DSView/pv/data/spectrumstack.cpp | 8 ++++---- DSView/pv/device/devinst.cpp | 2 +- DSView/pv/dialogs/about.h | 3 +-- DSView/pv/dialogs/calibration.h | 2 +- DSView/pv/dialogs/deviceoptions.cpp | 2 +- DSView/pv/dialogs/storeprogress.cpp | 2 +- DSView/pv/dock/triggerdock.cpp | 2 +- DSView/{ => pv}/extdef.h | 0 DSView/pv/mainframe.cpp | 2 +- DSView/pv/mainwindow.cpp | 4 ++-- DSView/pv/prop/binding/binding.cpp | 3 +-- DSView/pv/prop/binding/decoderoptions.cpp | 12 ++++++------ DSView/pv/prop/binding/deviceoptions.cpp | 2 +- DSView/pv/prop/binding/probeoptions.cpp | 8 ++++---- DSView/pv/storesession.cpp | 2 +- DSView/pv/toolbars/samplingbar.cpp | 6 ++---- DSView/pv/view/analogsignal.cpp | 3 ++- DSView/pv/view/cursor.cpp | 2 +- DSView/pv/view/decodetrace.cpp | 2 +- DSView/pv/view/decodetrace.h | 2 +- DSView/pv/view/dsosignal.cpp | 10 ++++------ DSView/pv/view/groupsignal.cpp | 10 +++++----- DSView/pv/view/header.cpp | 2 +- DSView/pv/view/lissajoustrace.cpp | 10 +++++----- DSView/pv/view/logicsignal.cpp | 11 ++++------- DSView/pv/view/mathtrace.cpp | 4 ++-- DSView/pv/view/ruler.cpp | 2 +- DSView/pv/view/signal.cpp | 8 +++----- DSView/pv/view/spectrumtrace.cpp | 3 ++- DSView/pv/view/trace.cpp | 3 ++- DSView/pv/view/view.cpp | 10 +++++----- DSView/pv/view/view.h | 3 ++- DSView/pv/view/viewport.h | 2 +- DSView/pv/view/viewstatus.h | 1 - DSView/test/data/analogsnapshot.cpp | 6 ++---- DSView/test/data/logicsnapshot.cpp | 2 +- libsigrok4DSL/hardware/DSL/command.c | 4 ++-- libsigrok4DSL/hardware/DSL/command.h | 4 ++-- libsigrok4DSL/hardware/DSL/dscope.c | 4 ++-- libsigrok4DSL/hardware/DSL/dsl.c | 4 ++-- libsigrok4DSL/hardware/DSL/dsl.h | 4 ++-- libsigrok4DSL/hardware/DSL/dslogic.c | 4 ++-- libsigrok4DSL/hardware/common/ezusb.c | 4 ++-- libsigrok4DSL/hardware/common/usb.c | 4 ++-- libsigrok4DSL/hardware/demo/demo.h | 4 ++-- libsigrok4DSL/input/in_binary.c | 4 ++-- libsigrok4DSL/input/in_vcd.c | 4 ++-- libsigrok4DSL/input/in_wav.c | 4 ++-- libsigrok4DSL/input/input.c | 4 ++-- libsigrok4DSL/output/csv.c | 6 +++--- libsigrok4DSL/output/gnuplot.c | 4 ++-- libsigrok4DSL/output/output.c | 4 ++-- libsigrok4DSL/output/srzip.c | 4 ++-- libsigrok4DSL/output/vcd.c | 6 +++--- qtpro/DSView.pro | 13 +++++-------- qtpro/DSView.pro.user | 2 +- 61 files changed, 124 insertions(+), 143 deletions(-) rename DSView/{ => pv}/extdef.h (100%) diff --git a/DSView/pv/data/analogsnapshot.cpp b/DSView/pv/data/analogsnapshot.cpp index 0fb067f3..329bafdf 100755 --- a/DSView/pv/data/analogsnapshot.cpp +++ b/DSView/pv/data/analogsnapshot.cpp @@ -20,16 +20,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include - #include #include #include #include - #include #include "analogsnapshot.h" +#include "../extdef.h" using namespace std; diff --git a/DSView/pv/data/decodermodel.h b/DSView/pv/data/decodermodel.h index 3a9d1760..a08fe1bf 100755 --- a/DSView/pv/data/decodermodel.h +++ b/DSView/pv/data/decodermodel.h @@ -23,7 +23,7 @@ #include -#include +#include "decode/rowdata.h" namespace pv { namespace data { diff --git a/DSView/pv/data/dsosnapshot.cpp b/DSView/pv/data/dsosnapshot.cpp index bf389c11..62642a94 100755 --- a/DSView/pv/data/dsosnapshot.cpp +++ b/DSView/pv/data/dsosnapshot.cpp @@ -19,16 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include - #include #include #include #include - #include #include "dsosnapshot.h" +#include "../extdef.h" using namespace std; diff --git a/DSView/pv/data/groupsnapshot.cpp b/DSView/pv/data/groupsnapshot.cpp index 3eae0efb..1e8430a4 100755 --- a/DSView/pv/data/groupsnapshot.cpp +++ b/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 - + #include #include #include @@ -30,6 +28,7 @@ #include "logicsnapshot.h" #include "groupsnapshot.h" +#include "../extdef.h" using namespace std; diff --git a/DSView/pv/data/logicsnapshot.cpp b/DSView/pv/data/logicsnapshot.cpp index 025422ba..f4e42584 100755 --- a/DSView/pv/data/logicsnapshot.cpp +++ b/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 - + #include #include @@ -30,6 +28,7 @@ #include #include "logicsnapshot.h" +#include "../extdef.h" using namespace std; diff --git a/DSView/pv/data/spectrumstack.cpp b/DSView/pv/data/spectrumstack.cpp index 72759c7e..99c34e9b 100755 --- a/DSView/pv/data/spectrumstack.cpp +++ b/DSView/pv/data/spectrumstack.cpp @@ -20,10 +20,10 @@ #include "spectrumstack.h" -#include -#include -#include -#include +#include "dso.h" +#include "dsosnapshot.h" +#include "../sigsession.h" +#include "../view/dsosignal.h" #include #define PI 3.1415 diff --git a/DSView/pv/device/devinst.cpp b/DSView/pv/device/devinst.cpp index 1fe1b2f4..29777872 100755 --- a/DSView/pv/device/devinst.cpp +++ b/DSView/pv/device/devinst.cpp @@ -25,7 +25,7 @@ #include "devinst.h" -#include +#include "../sigsession.h" namespace pv { namespace device { diff --git a/DSView/pv/dialogs/about.h b/DSView/pv/dialogs/about.h index a82377e7..a86ca127 100755 --- a/DSView/pv/dialogs/about.h +++ b/DSView/pv/dialogs/about.h @@ -27,8 +27,7 @@ #include #include "dsdialog.h" -#include - + namespace pv { namespace dialogs { diff --git a/DSView/pv/dialogs/calibration.h b/DSView/pv/dialogs/calibration.h index b5c71e27..6253de04 100755 --- a/DSView/pv/dialogs/calibration.h +++ b/DSView/pv/dialogs/calibration.h @@ -31,7 +31,7 @@ #include -#include +#include "../device/devinst.h" #include "../toolbars/titlebar.h" #include "dsdialog.h" diff --git a/DSView/pv/dialogs/deviceoptions.cpp b/DSView/pv/dialogs/deviceoptions.cpp index 3fa3be2c..b0b6119e 100755 --- a/DSView/pv/dialogs/deviceoptions.cpp +++ b/DSView/pv/dialogs/deviceoptions.cpp @@ -27,7 +27,7 @@ #include #include "dsmessagebox.h" -#include +#include "../prop/property.h" #include "../dsvdef.h" using namespace boost; diff --git a/DSView/pv/dialogs/storeprogress.cpp b/DSView/pv/dialogs/storeprogress.cpp index 7c0b31de..168a4c75 100755 --- a/DSView/pv/dialogs/storeprogress.cpp +++ b/DSView/pv/dialogs/storeprogress.cpp @@ -20,7 +20,7 @@ */ #include "storeprogress.h" -#include "pv/sigsession.h" +#include "../sigsession.h" #include #include #include diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp index 1b869fe0..962f6a9f 100755 --- a/DSView/pv/dock/triggerdock.cpp +++ b/DSView/pv/dock/triggerdock.cpp @@ -35,7 +35,7 @@ #include #include -#include "libsigrok4DSL/libsigrok.h" +#include namespace pv { namespace dock { diff --git a/DSView/extdef.h b/DSView/pv/extdef.h similarity index 100% rename from DSView/extdef.h rename to DSView/pv/extdef.h diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp index cd9b1e71..5f7c3be0 100644 --- a/DSView/pv/mainframe.cpp +++ b/DSView/pv/mainframe.cpp @@ -46,7 +46,7 @@ #include "dsvdef.h" #include "config/appconfig.h" -#include "../ui/msgbox.h" +#include "ui/msgbox.h" #include diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp index 44d528b6..cfd76a37 100644 --- a/DSView/pv/mainwindow.cpp +++ b/DSView/pv/mainwindow.cpp @@ -87,10 +87,10 @@ #include #include #include -#include "../ui/msgbox.h" +#include "ui/msgbox.h" #include "config/appconfig.h" #include "appcontrol.h" -#include "../dsvdef.h" +#include "dsvdef.h" namespace pv { diff --git a/DSView/pv/prop/binding/binding.cpp b/DSView/pv/prop/binding/binding.cpp index 345cae1e..4d861370 100755 --- a/DSView/pv/prop/binding/binding.cpp +++ b/DSView/pv/prop/binding/binding.cpp @@ -23,8 +23,7 @@ #include -#include - +#include "../property.h" #include "binding.h" diff --git a/DSView/pv/prop/binding/decoderoptions.cpp b/DSView/pv/prop/binding/decoderoptions.cpp index cdaca0df..b1ecae3b 100755 --- a/DSView/pv/prop/binding/decoderoptions.cpp +++ b/DSView/pv/prop/binding/decoderoptions.cpp @@ -26,12 +26,12 @@ #include -#include -#include -#include -#include -#include -#include +#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; diff --git a/DSView/pv/prop/binding/deviceoptions.cpp b/DSView/pv/prop/binding/deviceoptions.cpp index 0b25ba33..66a9900f 100755 --- a/DSView/pv/prop/binding/deviceoptions.cpp +++ b/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; diff --git a/DSView/pv/prop/binding/probeoptions.cpp b/DSView/pv/prop/binding/probeoptions.cpp index ec876265..74b18088 100755 --- a/DSView/pv/prop/binding/probeoptions.cpp +++ b/DSView/pv/prop/binding/probeoptions.cpp @@ -26,10 +26,10 @@ #include #include #include -#include -#include -#include -#include +#include "../bool.h" +#include "../double.h" +#include "../enum.h" +#include "../int.h" #include "../../config/appconfig.h" diff --git a/DSView/pv/storesession.cpp b/DSView/pv/storesession.cpp index 322ebd5f..b65b36ed 100755 --- a/DSView/pv/storesession.cpp +++ b/DSView/pv/storesession.cpp @@ -50,7 +50,7 @@ #include #include -#include +#include #include "config/appconfig.h" #include "dsvdef.h" diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp index 49b84f8b..7281bde6 100755 --- a/DSView/pv/toolbars/samplingbar.cpp +++ b/DSView/pv/toolbars/samplingbar.cpp @@ -20,12 +20,10 @@ */ #include "samplingbar.h" +#include "../extdef.h" -#include -#include - +#include #include - #include #include #include diff --git a/DSView/pv/view/analogsignal.cpp b/DSView/pv/view/analogsignal.cpp index 1419046a..498d46f9 100755 --- a/DSView/pv/view/analogsignal.cpp +++ b/DSView/pv/view/analogsignal.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include + #include #include @@ -29,6 +29,7 @@ #include "../data/analogsnapshot.h" #include "../view/view.h" #include "../device/devinst.h" +#include "../extdef.h" using namespace std; diff --git a/DSView/pv/view/cursor.cpp b/DSView/pv/view/cursor.cpp index eca057ca..a4b667a3 100755 --- a/DSView/pv/view/cursor.cpp +++ b/DSView/pv/view/cursor.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include "../extdef.h" namespace pv { namespace view { diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp index aea46fe0..250ca49c 100755 --- a/DSView/pv/view/decodetrace.cpp +++ b/DSView/pv/view/decodetrace.cpp @@ -21,7 +21,7 @@ #include -#include +#include "../extdef.h" #include diff --git a/DSView/pv/view/decodetrace.h b/DSView/pv/view/decodetrace.h index 4f70df85..fde1ff23 100755 --- a/DSView/pv/view/decodetrace.h +++ b/DSView/pv/view/decodetrace.h @@ -30,7 +30,7 @@ #include #include -#include +#include "../prop/binding/decoderoptions.h" #include "../dialogs/dsdialog.h" struct srd_channel; diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp index 24b69243..65e5fb59 100755 --- a/DSView/pv/view/dsosignal.cpp +++ b/DSView/pv/view/dsosignal.cpp @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include - -#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 #include #include +#include using namespace std; diff --git a/DSView/pv/view/groupsignal.cpp b/DSView/pv/view/groupsignal.cpp index 898d455c..b33ae478 100755 --- a/DSView/pv/view/groupsignal.cpp +++ b/DSView/pv/view/groupsignal.cpp @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include - +#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 using namespace std; diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp index b3aed97f..58563dd3 100755 --- a/DSView/pv/view/header.cpp +++ b/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" diff --git a/DSView/pv/view/lissajoustrace.cpp b/DSView/pv/view/lissajoustrace.cpp index 81d8d33f..a39a66e7 100755 --- a/DSView/pv/view/lissajoustrace.cpp +++ b/DSView/pv/view/lissajoustrace.cpp @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include + #include -#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" diff --git a/DSView/pv/view/logicsignal.cpp b/DSView/pv/view/logicsignal.cpp index 87f9fb93..dae072a8 100755 --- a/DSView/pv/view/logicsignal.cpp +++ b/DSView/pv/view/logicsignal.cpp @@ -21,18 +21,15 @@ */ #include - -#include - + #include - #include - #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; diff --git a/DSView/pv/view/mathtrace.cpp b/DSView/pv/view/mathtrace.cpp index 78a34280..8ea5d8ff 100755 --- a/DSView/pv/view/mathtrace.cpp +++ b/DSView/pv/view/mathtrace.cpp @@ -19,10 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include + #include -#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 #include diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp index 25c54a95..905d9de7 100755 --- a/DSView/pv/view/ruler.cpp +++ b/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 #include diff --git a/DSView/pv/view/signal.cpp b/DSView/pv/view/signal.cpp index 23011a23..f8146bef 100755 --- a/DSView/pv/view/signal.cpp +++ b/DSView/pv/view/signal.cpp @@ -20,14 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include - -#include - - + +#include #include "signal.h" #include "view.h" #include "../device/devinst.h" +#include "../extdef.h" namespace pv { namespace view { diff --git a/DSView/pv/view/spectrumtrace.cpp b/DSView/pv/view/spectrumtrace.cpp index 3527a013..b55a1325 100755 --- a/DSView/pv/view/spectrumtrace.cpp +++ b/DSView/pv/view/spectrumtrace.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include + #include #include #include @@ -34,6 +34,7 @@ #include "../device/devinst.h" #include "../data/spectrumstack.h" #include "../dsvdef.h" +#include "../extdef.h" using namespace boost; using namespace std; diff --git a/DSView/pv/view/trace.cpp b/DSView/pv/view/trace.cpp index 782dfa85..cf6f17e3 100755 --- a/DSView/pv/view/trace.cpp +++ b/DSView/pv/view/trace.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include + #include #include #include @@ -31,6 +31,7 @@ #include "view.h" #include "../device/devinst.h" #include "../sigsession.h" +#include "../extdef.h" namespace pv { diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp index f0a196f0..3328fb5d 100755 --- a/DSView/pv/view/view.cpp +++ b/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; diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h index a807dd85..6475cd7d 100755 --- a/DSView/pv/view/view.h +++ b/DSView/pv/view/view.h @@ -33,7 +33,7 @@ #include #include -#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 { diff --git a/DSView/pv/view/viewport.h b/DSView/pv/view/viewport.h index 0ba08201..0442645d 100755 --- a/DSView/pv/view/viewport.h +++ b/DSView/pv/view/viewport.h @@ -33,7 +33,7 @@ #include #include "../view/view.h" -#include "../../extdef.h" +#include "../extdef.h" class QPainter; class QPaintEvent; diff --git a/DSView/pv/view/viewstatus.h b/DSView/pv/view/viewstatus.h index c8edf813..c4125ca3 100755 --- a/DSView/pv/view/viewstatus.h +++ b/DSView/pv/view/viewstatus.h @@ -28,7 +28,6 @@ #include #include - #include namespace pv { diff --git a/DSView/test/data/analogsnapshot.cpp b/DSView/test/data/analogsnapshot.cpp index cd1fd773..7cf4f289 100755 --- a/DSView/test/data/analogsnapshot.cpp +++ b/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 - + #define __STDC_LIMIT_MACROS #include #include - #include "../../pv/data/analogsnapshot.h" +#include "../extdef.h" using namespace std; diff --git a/DSView/test/data/logicsnapshot.cpp b/DSView/test/data/logicsnapshot.cpp index bbc74383..2473580e 100755 --- a/DSView/test/data/logicsnapshot.cpp +++ b/DSView/test/data/logicsnapshot.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include "../extdef.h" #define __STDC_LIMIT_MACROS #include diff --git a/libsigrok4DSL/hardware/DSL/command.c b/libsigrok4DSL/hardware/DSL/command.c index 82170f08..b391237d 100755 --- a/libsigrok4DSL/hardware/DSL/command.c +++ b/libsigrok4DSL/hardware/DSL/command.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../../libsigrok.h" +#include "../../libsigrok-internal.h" #include "command.h" #include "dsl.h" diff --git a/libsigrok4DSL/hardware/DSL/command.h b/libsigrok4DSL/hardware/DSL/command.h index 0a541c47..a5647638 100755 --- a/libsigrok4DSL/hardware/DSL/command.h +++ b/libsigrok4DSL/hardware/DSL/command.h @@ -21,8 +21,8 @@ #define LIBDSL_HARDWARE_COMMAND_H #include -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../../libsigrok.h" +#include "../../libsigrok-internal.h" /* Protocol commands */ #define CMD_CTL_WR 0xb0 diff --git a/libsigrok4DSL/hardware/DSL/dscope.c b/libsigrok4DSL/hardware/DSL/dscope.c index 12652a55..b9bdb446 100755 --- a/libsigrok4DSL/hardware/DSL/dscope.c +++ b/libsigrok4DSL/hardware/DSL/dscope.c @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../../libsigrok.h" +#include "../../libsigrok-internal.h" #include "dsl.h" #include "command.h" diff --git a/libsigrok4DSL/hardware/DSL/dsl.c b/libsigrok4DSL/hardware/DSL/dsl.c index a08452b1..01e2e01c 100755 --- a/libsigrok4DSL/hardware/DSL/dsl.c +++ b/libsigrok4DSL/hardware/DSL/dsl.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../../libsigrok.h" +#include "../../libsigrok-internal.h" #include "command.h" #include "dsl.h" diff --git a/libsigrok4DSL/hardware/DSL/dsl.h b/libsigrok4DSL/hardware/DSL/dsl.h index 4d695380..9f9fe95f 100755 --- a/libsigrok4DSL/hardware/DSL/dsl.h +++ b/libsigrok4DSL/hardware/DSL/dsl.h @@ -22,8 +22,8 @@ #define LIBDSL_HARDWARE_DSL_H #include -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../../libsigrok.h" +#include "../../libsigrok-internal.h" #include "command.h" #include diff --git a/libsigrok4DSL/hardware/DSL/dslogic.c b/libsigrok4DSL/hardware/DSL/dslogic.c index 443c8052..76419965 100755 --- a/libsigrok4DSL/hardware/DSL/dslogic.c +++ b/libsigrok4DSL/hardware/DSL/dslogic.c @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../../libsigrok.h" +#include "../../libsigrok-internal.h" #include "dsl.h" #include "command.h" diff --git a/libsigrok4DSL/hardware/common/ezusb.c b/libsigrok4DSL/hardware/common/ezusb.c index d05d2a79..dce61729 100755 --- a/libsigrok4DSL/hardware/common/ezusb.c +++ b/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 #include #include diff --git a/libsigrok4DSL/hardware/common/usb.c b/libsigrok4DSL/hardware/common/usb.c index 09c287ea..5e11c710 100755 --- a/libsigrok4DSL/hardware/common/usb.c +++ b/libsigrok4DSL/hardware/common/usb.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../../libsigrok.h" +#include "../../libsigrok-internal.h" #include #include //#include diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h index 0a9cb52e..e347401f 100755 --- a/libsigrok4DSL/hardware/demo/demo.h +++ b/libsigrok4DSL/hardware/demo/demo.h @@ -22,8 +22,8 @@ #define LIBDSL_HARDWARE_DEMO_H #include -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../../libsigrok.h" +#include "../../libsigrok-internal.h" #include #include diff --git a/libsigrok4DSL/input/in_binary.c b/libsigrok4DSL/input/in_binary.c index f75e1a1a..e9e3d7e8 100755 --- a/libsigrok4DSL/input/in_binary.c +++ b/libsigrok4DSL/input/in_binary.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../libsigrok.h" +#include "../libsigrok-internal.h" #include #include #include diff --git a/libsigrok4DSL/input/in_vcd.c b/libsigrok4DSL/input/in_vcd.c index 41ff6c0b..a19146a5 100755 --- a/libsigrok4DSL/input/in_vcd.c +++ b/libsigrok4DSL/input/in_vcd.c @@ -57,8 +57,8 @@ /* */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../libsigrok.h" +#include "../libsigrok-internal.h" #include #include #include diff --git a/libsigrok4DSL/input/in_wav.c b/libsigrok4DSL/input/in_wav.c index 33db01d9..a576aa8a 100755 --- a/libsigrok4DSL/input/in_wav.c +++ b/libsigrok4DSL/input/in_wav.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../libsigrok.h" +#include "../libsigrok-internal.h" #include #include #include diff --git a/libsigrok4DSL/input/input.c b/libsigrok4DSL/input/input.c index 68ae49e4..bcfb6576 100755 --- a/libsigrok4DSL/input/input.c +++ b/libsigrok4DSL/input/input.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../libsigrok.h" +#include "../libsigrok-internal.h" /** * @file diff --git a/libsigrok4DSL/output/csv.c b/libsigrok4DSL/output/csv.c index ad95756b..4aa398a5 100755 --- a/libsigrok4DSL/output/csv.c +++ b/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 #include #include -#include "config.h" /* Needed for PACKAGE_STRING and others. */ +#include "../config.h" /* Needed for PACKAGE_STRING and others. */ #define LOG_PREFIX "output/csv" diff --git a/libsigrok4DSL/output/gnuplot.c b/libsigrok4DSL/output/gnuplot.c index 1644fceb..e39c1d4c 100755 --- a/libsigrok4DSL/output/gnuplot.c +++ b/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 #include #include diff --git a/libsigrok4DSL/output/output.c b/libsigrok4DSL/output/output.c index 639bd24b..68292a86 100755 --- a/libsigrok4DSL/output/output.c +++ b/libsigrok4DSL/output/output.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../libsigrok.h" +#include "../libsigrok-internal.h" #include /** @cond PRIVATE */ diff --git a/libsigrok4DSL/output/srzip.c b/libsigrok4DSL/output/srzip.c index 5f19f5ab..f723ce69 100755 --- a/libsigrok4DSL/output/srzip.c +++ b/libsigrok4DSL/output/srzip.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include "libsigrok.h" -#include "libsigrok-internal.h" +#include "../libsigrok.h" +#include "../libsigrok-internal.h" #include #include #include diff --git a/libsigrok4DSL/output/vcd.c b/libsigrok4DSL/output/vcd.c index ce923350..37a5a9af 100755 --- a/libsigrok4DSL/output/vcd.c +++ b/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 #include #include -#include "config.h" /* Needed for PACKAGE and others. */ +#include "../config.h" /* Needed for PACKAGE and others. */ #define LOG_PREFIX "output/vcd" diff --git a/qtpro/DSView.pro b/qtpro/DSView.pro index 5d30bed6..419d9b4a 100644 --- a/qtpro/DSView.pro +++ b/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 \ diff --git a/qtpro/DSView.pro.user b/qtpro/DSView.pro.user index cc096235..2e3a9259 100644 --- a/qtpro/DSView.pro.user +++ b/qtpro/DSView.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId