BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Uwe Hermann 2015-01-17 20:05:15 +01:00
parent e0e6aecc20
commit 1b40fdb881
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

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

2
bindings/cxx/Doxyfile
View File

@ -743,7 +743,7 @@ WARN_LOGFILE =
# spaces. # spaces.
# Note: If this tag is empty the current directory is searched. # 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 # 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 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

2
bindings/cxx/classes.cpp
View File

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

6
bindings/cxx/include/libsigrok/libsigrok.hpp → bindings/cxx/include/libsigrok/libsigrokcxx.hpp
View File

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

2
bindings/python/sigrok/core/classes.i
View File

@ -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> */ /* 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) std::map<std::string, std::string> dict_to_map_string(PyObject *dict)

4
bindings/swig/classes.i
View File

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