From: Uwe Hermann <redacted>
Date: Sat, 17 Jan 2015 18:29:12 +0000 (+0100)
Subject: Update for libsigrokcxx rename.
X-Git-Tag: pulseview-0.3.0~261
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=fe3a1c218407f6b8a0d7ac7c454593809212ea9e;p=pulseview.git

Update for libsigrokcxx rename.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f9009ab..66757475 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
 #= Dependencies
 #-------------------------------------------------------------------------------
 
-list(APPEND PKGDEPS libsigrokxx>=0.3.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.3.0)
 
 if(ENABLE_DECODE)
 	list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
diff --git a/INSTALL b/INSTALL
index ba494819..db85f73c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -22,7 +22,7 @@ Requirements
     - libboost-filesystem
     - libboost-thread
     - libboost-test (optional, only needed to run the unit tests)
- - libsigrokxx >= 0.3.0 (libsigrok C++ bindings)
+ - libsigrokcxx >= 0.3.0 (libsigrok C++ bindings)
  - libsigrokdecode >= 0.3.0
  - libsigrokandroidutils >= 0.1.0 (optional, only needed on Android)
 
diff --git a/main.cpp b/main.cpp
index 74d13fdc..cfaba777 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #include <stdint.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <getopt.h>
 
diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index c5fffa67..35840909 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -20,7 +20,7 @@
 
 #include <cassert>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 #include <libsigrokdecode/libsigrokdecode.h>
 
 #include "decoder.hpp"
diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 2df64bb2..e56a8371 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -27,7 +27,7 @@
 
 #include "logicsegment.hpp"
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::lock_guard;
 using std::recursive_mutex;
diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 0c6c354f..c7111e86 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -27,7 +27,7 @@
 #include <string>
 #include <vector>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/filesystem.hpp>
diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp
index 5517beb3..693472ee 100644
--- a/pv/dialogs/about.cpp
+++ b/pv/dialogs/about.cpp
@@ -27,7 +27,7 @@
 #include "about.hpp"
 #include <ui_about.h>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::shared_ptr;
 using sigrok::Context;
diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index fcb2103b..e5cc3dd7 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -20,7 +20,7 @@
 
 #include <cassert>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "connect.hpp"
 
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 21b66b53..2652d50b 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -58,7 +58,7 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <glib.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::list;
 using std::map;
diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index f30ce627..7dedb317 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -31,7 +31,7 @@
 #include <pv/session.hpp>
 #include <pv/view/signal.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using namespace Qt;
 
diff --git a/pv/popups/deviceoptions.cpp b/pv/popups/deviceoptions.cpp
index a92b0aea..47bb6ca2 100644
--- a/pv/popups/deviceoptions.cpp
+++ b/pv/popups/deviceoptions.cpp
@@ -25,7 +25,7 @@
 
 #include <pv/prop/property.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::shared_ptr;
 
diff --git a/pv/prop/binding/deviceoptions.cpp b/pv/prop/binding/deviceoptions.cpp
index c995ea69..8b38505c 100644
--- 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 <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::optional;
 using std::function;
diff --git a/pv/session.cpp b/pv/session.cpp
index 7bb9de8d..76bdf683 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -45,7 +45,7 @@
 
 #include <QDebug>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::shared_lock;
 using boost::shared_mutex;
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 6ecde13a..2168cdc7 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -27,7 +27,7 @@
 #include <pv/data/logicsegment.hpp>
 #include <pv/view/signal.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::shared_lock;
 using boost::shared_mutex;
diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 7a364013..67cfa4c6 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -37,7 +37,7 @@
 #include <pv/popups/channels.hpp>
 #include <pv/util.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::back_inserter;
 using std::copy;
diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 303227eb..fe2979b0 100644
--- 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 <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::max;
 using std::make_pair;
diff --git a/pv/view/flag.cpp b/pv/view/flag.cpp
index 01d13670..1dc38a57 100644
--- a/pv/view/flag.cpp
+++ b/pv/view/flag.cpp
@@ -26,7 +26,7 @@
 #include <QLineEdit>
 #include <QMenu>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <pv/widgets/popup.hpp>
 
diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 08a5225f..3bd88597 100644
--- 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 <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::deque;
 using std::max;
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 7348d25b..bbabcc1b 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -29,7 +29,7 @@
 #include <QLineEdit>
 #include <QMenu>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "signal.hpp"
 #include "view.hpp"
diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index c09609ac..4d823a02 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -36,7 +36,7 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "decodetrace.hpp"
 #include "header.hpp"
diff --git a/pv/widgets/devicetoolbutton.cpp b/pv/widgets/devicetoolbutton.cpp
index ffa1cc65..9f1cc802 100644
--- a/pv/widgets/devicetoolbutton.cpp
+++ b/pv/widgets/devicetoolbutton.cpp
@@ -23,7 +23,7 @@
 #include <QTimer>
 #include <QToolTip>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <pv/devicemanager.hpp>
 
diff --git a/test/data/decoderstack.cpp b/test/data/decoderstack.cpp
index c169e1ff..96f8b4a0 100644
--- 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 <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include "../../pv/data/decoderstack.hpp"
 #include "../../pv/devicemanager.hpp"