Rename libsigrok.hpp to libsigrokcxx.hpp.

This avoids confusion of libsigrok.h vs. libsigrok.hpp and makes it
clearer that this is the main libsigrokcxx header.

Makefile.am

@@ -445,7 +445,7 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
 library_include_HEADERS += \
-	bindings/cxx/include/libsigrok/libsigrok.hpp \
+	bindings/cxx/include/libsigrok/libsigrokcxx.hpp \
 	bindings/cxx/include/libsigrok/enums.hpp
 
 pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
@@ -478,7 +478,7 @@ endif
 
 CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
 
-$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrok.hpp \
+$(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrokcxx.hpp \
 		bindings/cxx/enums.timestamp
 	$(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
 

bindings/cxx/Doxyfile

@@ -743,7 +743,7 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = include/libsigrok/libsigrok.hpp
+INPUT                  = include/libsigrok/libsigrokcxx.hpp
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

bindings/cxx/classes.cpp

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok/libsigrok.hpp"
+#include "libsigrok/libsigrokcxx.hpp"
 
 #include <sstream>
 #include <cmath>

bindings/cxx/include/libsigrok/libsigrokcxx.hpp

@@ -67,8 +67,8 @@ raised, which provides access to the error code and description.
 
 */
 
-#ifndef LIBSIGROK_HPP
-#define LIBSIGROK_HPP
+#ifndef LIBSIGROKCXX_HPP
+#define LIBSIGROKCXX_HPP
 
 #include "libsigrok/libsigrok.h"
 #include <glibmm.h>
@@ -1025,4 +1025,4 @@ protected:
 
 }
 
-#endif // LIBSIGROK_HPP
+#endif

bindings/python/sigrok/core/classes.i

@@ -353,7 +353,7 @@ typedef guint pyg_flags_type;
 
 %{
 
-#include "libsigrok/libsigrok.hpp"
+#include "libsigrok/libsigrokcxx.hpp"
 
 /* Convert from a Python dict to a std::map<std::string, std::string> */
 std::map<std::string, std::string> dict_to_map_string(PyObject *dict)

bindings/swig/classes.i

@@ -20,7 +20,7 @@
 #pragma SWIG nowarn=325,401
 
 %{
-#include "libsigrok/libsigrok.hpp"
+#include "libsigrok/libsigrokcxx.hpp"
 using namespace std;
 %}
 
@@ -271,7 +271,7 @@ typedef std::map<const sigrok::ConfigKey *, Glib::VariantBase>
 %attribute(sigrok::Analog, const sigrok::Unit *, unit, unit);
 %attributevector(Analog, std::vector<const sigrok::QuantityFlag *>, mq_flags, mq_flags);
 
-%include "libsigrok/libsigrok.hpp"
+%include "libsigrok/libsigrokcxx.hpp"
 
 %include "enums.i"