projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1c4c23b
)
Update for libsigrokcxx rename.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 17 Jan 2015 18:29:12 +0000
(19:29 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Sat, 17 Jan 2015 19:49:44 +0000
(20:49 +0100)
22 files changed:
CMakeLists.txt
patch
|
blob
|
history
INSTALL
patch
|
blob
|
history
main.cpp
patch
|
blob
|
history
pv/data/decode/decoder.cpp
patch
|
blob
|
history
pv/data/logicsegment.cpp
patch
|
blob
|
history
pv/devicemanager.cpp
patch
|
blob
|
history
pv/dialogs/about.cpp
patch
|
blob
|
history
pv/dialogs/connect.cpp
patch
|
blob
|
history
pv/mainwindow.cpp
patch
|
blob
|
history
pv/popups/channels.cpp
patch
|
blob
|
history
pv/popups/deviceoptions.cpp
patch
|
blob
|
history
pv/prop/binding/deviceoptions.cpp
patch
|
blob
|
history
pv/session.cpp
patch
|
blob
|
history
pv/storesession.cpp
patch
|
blob
|
history
pv/toolbars/mainbar.cpp
patch
|
blob
|
history
pv/view/analogsignal.cpp
patch
|
blob
|
history
pv/view/flag.cpp
patch
|
blob
|
history
pv/view/logicsignal.cpp
patch
|
blob
|
history
pv/view/signal.cpp
patch
|
blob
|
history
pv/view/view.cpp
patch
|
blob
|
history
pv/widgets/devicetoolbutton.cpp
patch
|
blob
|
history
test/data/decoderstack.cpp
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 3f9009abf4e7eca49172d75be855bdb13f01d46a..667574754d9233ae0bd20fa8c69d2f8d7c79cdf5 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-65,7
+65,7
@@
endif()
#= Dependencies
#-------------------------------------------------------------------------------
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS libsigrokxx>=0.3.0)
+list(APPEND PKGDEPS libsigrok
c
xx>=0.3.0)
if(ENABLE_DECODE)
list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
if(ENABLE_DECODE)
list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
diff --git
a/INSTALL
b/INSTALL
index ba494819b6a001c7d304f4c6c472ea3f992549d1..db85f73c6245df908568218f52ca30296c0ffc0e 100644
(file)
--- a/
INSTALL
+++ b/
INSTALL
@@
-22,7
+22,7
@@
Requirements
- libboost-filesystem
- libboost-thread
- libboost-test (optional, only needed to run the unit tests)
- libboost-filesystem
- libboost-thread
- libboost-test (optional, only needed to run the unit tests)
- - libsigrokxx >= 0.3.0 (libsigrok C++ bindings)
+ - libsigrok
c
xx >= 0.3.0 (libsigrok C++ bindings)
- libsigrokdecode >= 0.3.0
- libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
- libsigrokdecode >= 0.3.0
- libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
diff --git
a/main.cpp
b/main.cpp
index 74d13fdc4af1b0eeb9e9b3d3e1d64169597b8dd9..cfaba777d2f26add33a344da7aacf17facc8931d 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-23,7
+23,7
@@
#endif
#include <stdint.h>
#endif
#include <stdint.h>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <getopt.h>
#include <getopt.h>
diff --git
a/pv/data/decode/decoder.cpp
b/pv/data/decode/decoder.cpp
index c5fffa6764385dbe6265f9441b32b312f06fcf70..35840909b9b5b543a20c8e430d9bb6387b514883 100644
(file)
--- a/
pv/data/decode/decoder.cpp
+++ b/
pv/data/decode/decoder.cpp
@@
-20,7
+20,7
@@
#include <cassert>
#include <cassert>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <libsigrokdecode/libsigrokdecode.h>
#include "decoder.hpp"
#include <libsigrokdecode/libsigrokdecode.h>
#include "decoder.hpp"
diff --git
a/pv/data/logicsegment.cpp
b/pv/data/logicsegment.cpp
index 2df64bb2769955e8182050edf63deb86bfb3e1c9..e56a8371093555ef66b5d3804c8c8f4fdf284d0c 100644
(file)
--- a/
pv/data/logicsegment.cpp
+++ b/
pv/data/logicsegment.cpp
@@
-27,7
+27,7
@@
#include "logicsegment.hpp"
#include "logicsegment.hpp"
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::lock_guard;
using std::recursive_mutex;
using std::lock_guard;
using std::recursive_mutex;
diff --git
a/pv/devicemanager.cpp
b/pv/devicemanager.cpp
index 0c6c354fe6f12e14c06a7cfa955464b8049f4088..c7111e865e9f4bc10f5b8f0e83f03a9d47153b21 100644
(file)
--- a/
pv/devicemanager.cpp
+++ b/
pv/devicemanager.cpp
@@
-27,7
+27,7
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/filesystem.hpp>
diff --git
a/pv/dialogs/about.cpp
b/pv/dialogs/about.cpp
index 5517beb3225273330c66214e40dc115aba62f110..693472ee92c4052b7210f22791bd40c212b9a044 100644
(file)
--- a/
pv/dialogs/about.cpp
+++ b/
pv/dialogs/about.cpp
@@
-27,7
+27,7
@@
#include "about.hpp"
#include <ui_about.h>
#include "about.hpp"
#include <ui_about.h>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::shared_ptr;
using sigrok::Context;
using std::shared_ptr;
using sigrok::Context;
diff --git
a/pv/dialogs/connect.cpp
b/pv/dialogs/connect.cpp
index fcb2103bedf77737d23f1c5e48b09f4af8199ef6..e5cc3dd70c088c9ad698229aaac3d3da26e8d9a1 100644
(file)
--- a/
pv/dialogs/connect.cpp
+++ b/
pv/dialogs/connect.cpp
@@
-20,7
+20,7
@@
#include <cassert>
#include <cassert>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include "connect.hpp"
#include "connect.hpp"
diff --git
a/pv/mainwindow.cpp
b/pv/mainwindow.cpp
index 21b66b534f59119b492b6be69bb049c094389768..2652d50be777ecd6dc22b6042bd30766ac5b1866 100644
(file)
--- a/
pv/mainwindow.cpp
+++ b/
pv/mainwindow.cpp
@@
-58,7
+58,7
@@
#include <stdint.h>
#include <stdarg.h>
#include <glib.h>
#include <stdint.h>
#include <stdarg.h>
#include <glib.h>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::list;
using std::map;
using std::list;
using std::map;
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index f30ce627d72f3ae675571506f5eb58b878a57570..7dedb317cf8428043ca9d3701744e04aae71a86b 100644
(file)
--- a/
pv/popups/channels.cpp
+++ b/
pv/popups/channels.cpp
@@
-31,7
+31,7
@@
#include <pv/session.hpp>
#include <pv/view/signal.hpp>
#include <pv/session.hpp>
#include <pv/view/signal.hpp>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using namespace Qt;
using namespace Qt;
diff --git
a/pv/popups/deviceoptions.cpp
b/pv/popups/deviceoptions.cpp
index a92b0aea8058f966a33ad68726c8a2474e61e758..47bb6ca282465666a5e2134f3a11c7f9a678d453 100644
(file)
--- a/
pv/popups/deviceoptions.cpp
+++ b/
pv/popups/deviceoptions.cpp
@@
-25,7
+25,7
@@
#include <pv/prop/property.hpp>
#include <pv/prop/property.hpp>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::shared_ptr;
using std::shared_ptr;
diff --git
a/pv/prop/binding/deviceoptions.cpp
b/pv/prop/binding/deviceoptions.cpp
index c995ea697c01e6980adaefd9c0efa0676b36d35d..8b38505c0bc15b24472366fd0d39c30fe7d19b3a 100644
(file)
--- a/
pv/prop/binding/deviceoptions.cpp
+++ b/
pv/prop/binding/deviceoptions.cpp
@@
-29,7
+29,7
@@
#include <pv/prop/enum.hpp>
#include <pv/prop/int.hpp>
#include <pv/prop/enum.hpp>
#include <pv/prop/int.hpp>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using boost::optional;
using std::function;
using boost::optional;
using std::function;
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 7bb9de8da443fccb6a19d523572d9472b7ef87a9..76bdf683f9dc9b0a2872c4f9f5da8a637837293a 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-45,7
+45,7
@@
#include <QDebug>
#include <QDebug>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using boost::shared_lock;
using boost::shared_mutex;
using boost::shared_lock;
using boost::shared_mutex;
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index 6ecde13aff92a5594eb3a0f931687e5fa7170d9d..2168cdc78b4d4f56c5f5a6e28cb8e3344a4b5e1c 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-27,7
+27,7
@@
#include <pv/data/logicsegment.hpp>
#include <pv/view/signal.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/view/signal.hpp>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using boost::shared_lock;
using boost::shared_mutex;
using boost::shared_lock;
using boost::shared_mutex;
diff --git
a/pv/toolbars/mainbar.cpp
b/pv/toolbars/mainbar.cpp
index 7a3640135671a08333941934bb295f4922511427..67cfa4c64d2dbdad9d221614c5da868d4a1a56b8 100644
(file)
--- a/
pv/toolbars/mainbar.cpp
+++ b/
pv/toolbars/mainbar.cpp
@@
-37,7
+37,7
@@
#include <pv/popups/channels.hpp>
#include <pv/util.hpp>
#include <pv/popups/channels.hpp>
#include <pv/util.hpp>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::back_inserter;
using std::copy;
using std::back_inserter;
using std::copy;
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 303227eb37fed6b2931ed7b7259a03ec816044b6..fe2979b0be8ac36efe3f520bda5d59a9e0abf9a5 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-28,7
+28,7
@@
#include "pv/data/analogsegment.hpp"
#include "pv/view/view.hpp"
#include "pv/data/analogsegment.hpp"
#include "pv/view/view.hpp"
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::max;
using std::make_pair;
using std::max;
using std::make_pair;
diff --git
a/pv/view/flag.cpp
b/pv/view/flag.cpp
index 01d13670a70b87fbbb2042dcbb70c9278724e749..1dc38a5741b0cafd357b6c965caa504217fae707 100644
(file)
--- a/
pv/view/flag.cpp
+++ b/
pv/view/flag.cpp
@@
-26,7
+26,7
@@
#include <QLineEdit>
#include <QMenu>
#include <QLineEdit>
#include <QMenu>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <pv/widgets/popup.hpp>
#include <pv/widgets/popup.hpp>
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 08a5225fa41f2f35cb4d7406ded8f96fc8727ec2..3bd885970413716f0989f9749d1f0e82e316efb0 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-37,7
+37,7
@@
#include <pv/data/logicsegment.hpp>
#include <pv/view/view.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/view/view.hpp>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::deque;
using std::max;
using std::deque;
using std::max;
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 7348d25b2d44bea1d974d05bda84d181102dfdbf..bbabcc1b7709d62818a280d76c5f5ee887f95e4f 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-29,7
+29,7
@@
#include <QLineEdit>
#include <QMenu>
#include <QLineEdit>
#include <QMenu>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include "signal.hpp"
#include "view.hpp"
#include "signal.hpp"
#include "view.hpp"
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index c09609ac65d49daa9a9ad8988ff805f84cc39a6f..4d823a02b204c32daade5e96a586b44709b4d2eb 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-36,7
+36,7
@@
#include <QMouseEvent>
#include <QScrollBar>
#include <QMouseEvent>
#include <QScrollBar>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include "decodetrace.hpp"
#include "header.hpp"
#include "decodetrace.hpp"
#include "header.hpp"
diff --git
a/pv/widgets/devicetoolbutton.cpp
b/pv/widgets/devicetoolbutton.cpp
index ffa1cc6546561f74ceebba4b198e5a85d702cd71..9f1cc80280fb33dc2944b3c243e522884b3f330b 100644
(file)
--- a/
pv/widgets/devicetoolbutton.cpp
+++ b/
pv/widgets/devicetoolbutton.cpp
@@
-23,7
+23,7
@@
#include <QTimer>
#include <QToolTip>
#include <QTimer>
#include <QToolTip>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include <pv/devicemanager.hpp>
#include <pv/devicemanager.hpp>
diff --git
a/test/data/decoderstack.cpp
b/test/data/decoderstack.cpp
index c169e1ff2271f1d779665486ab23cdc43b94089f..96f8b4a0ee4ebf6bb41200a269bf871ead274d3c 100644
(file)
--- a/
test/data/decoderstack.cpp
+++ b/
test/data/decoderstack.cpp
@@
-21,7
+21,7
@@
#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <boost/test/unit_test.hpp>
#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include <boost/test/unit_test.hpp>
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
#include "../../pv/data/decoderstack.hpp"
#include "../../pv/devicemanager.hpp"
#include "../../pv/data/decoderstack.hpp"
#include "../../pv/devicemanager.hpp"