cpp_headers: Renamed C++ headers from .h -> .hpp

To make room for UPM C and C++ sensor code to coexist, all UPM
C++ headers have been renamed from h -> hpp.  This commit contains
updates to documentation, includes, cmake collateral, examples, and
swig interface files.

    * Renamed all cxx/cpp header files which contain the string
    'copyright intel' from .h -> .hpp (if not already hpp).

    * Replaced all references to .h with .hpp in documentation,
    source files, cmake collateral, example code, and swig interface
    files.

    * Replaced cmake variable module_h with module_hpp.

    * Intentionally left upm.h since this file currently does not
    contain code (documentation only).

Signed-off-by: Noel Eck <noel.eck@intel.com>

src/CMakeLists.txt

@@ -245,7 +245,7 @@ macro(upm_module_init)
     upm_doxygen()
   endif()
   install(TARGETS ${libname} DESTINATION ${LIB_INSTALL_DIR})
-  install (FILES ${module_h} DESTINATION include/upm COMPONENT ${libname})
+  install (FILES ${module_hpp} DESTINATION include/upm COMPONENT ${libname})
 
   if (IPK)
     cpack_add_component (${libname} DISPLAY_NAME ${libname} REQUIRED INSTALL_TYPES all)

src/a110x/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "a110x")
 set (libdescription "upm a110x sensor module")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/a110x/a110x.cxx

@@ -26,7 +26,7 @@
 #include <string>
 #include <stdexcept>
 
-#include "a110x.h"
+#include "a110x.hpp"
 
 using namespace upm;
 using namespace std;

src/a110x/javaupm_a110x.i

@@ -4,9 +4,9 @@
 %include "typemaps.i"
 
 %{
-    #include "a110x.h"
+    #include "a110x.hpp"
 %}
-%include "a110x.h"
+%include "a110x.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/a110x/jsupm_a110x.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "a110x.h"
+    #include "a110x.hpp"
 %}
 
-%include "a110x.h"
+%include "a110x.hpp"

src/a110x/pyupm_a110x.i

@@ -5,7 +5,7 @@
 
 %feature("autodoc", "3");
 
-%include "a110x.h"
+%include "a110x.hpp"
 %{
-    #include "a110x.h"
+    #include "a110x.hpp"
 %}

src/ad8232/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "ad8232")
 set (libdescription "upm ad8232 heart rate monitor")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/ad8232/ad8232.cxx

@@ -24,7 +24,7 @@
 
 #include <iostream>
 
-#include "ad8232.h"
+#include "ad8232.hpp"
 
 using namespace upm;
 using namespace std;

src/ad8232/javaupm_ad8232.i

@@ -2,10 +2,10 @@
 %include "../upm.i"
 
 %{
-    #include "ad8232.h"
+    #include "ad8232.hpp"
 %}
 
-%include "ad8232.h"
+%include "ad8232.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/ad8232/jsupm_ad8232.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "ad8232.h"
+    #include "ad8232.hpp"
 %}
 
-%include "ad8232.h"
+%include "ad8232.hpp"

src/ad8232/pyupm_ad8232.i

@@ -5,7 +5,7 @@
 
 %feature("autodoc", "3");
 
-%include "ad8232.h"
+%include "ad8232.hpp"
 %{
-    #include "ad8232.h"
+    #include "ad8232.hpp"
 %}

src/adafruitms1438/CMakeLists.txt

@@ -1,7 +1,7 @@
 set (libname "adafruitms1438")
 set (libdescription "upm module for the Adafruit Motor Shield 1438")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 set (reqlibname "upm-pca9685")
 include_directories("../pca9685")
 upm_module_init()

src/adafruitms1438/adafruitms1438.cxx

@@ -27,7 +27,7 @@
 #include <iostream>
 #include <string>
 
-#include "adafruitms1438.h"
+#include "adafruitms1438.hpp"
 
 using namespace upm;
 using namespace std;

src/adafruitms1438/adafruitms1438.hpp

@@ -30,7 +30,7 @@
 #include <mraa/i2c.h>
 #include <mraa/gpio.h>
 
-#include "pca9685.h"
+#include "pca9685.hpp"
 
 #define ADAFRUITMS1438_I2C_BUS 0
 #define ADAFRUITMS1438_DEFAULT_I2C_ADDR 0x60

src/adafruitms1438/javaupm_adafruitms1438.i

@@ -2,10 +2,10 @@
 %include "../upm.i"
 
 %{
-    #include "adafruitms1438.h"
+    #include "adafruitms1438.hpp"
 %}
 
-%include "adafruitms1438.h"
+%include "adafruitms1438.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/adafruitms1438/jsupm_adafruitms1438.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "adafruitms1438.h"
+    #include "adafruitms1438.hpp"
 %}
 
-%include "adafruitms1438.h"
+%include "adafruitms1438.hpp"

src/adafruitms1438/pyupm_adafruitms1438.i

@@ -9,7 +9,7 @@
 %include "adafruitms1438_doc.i"
 #endif
 
-%include "adafruitms1438.h"
+%include "adafruitms1438.hpp"
 %{
-    #include "adafruitms1438.h"
+    #include "adafruitms1438.hpp"
 %}

src/adafruitss/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "adafruitss")
 set (libdescription "upm Adafruit pca9685 based 16-channel servo shield")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/adafruitss/adafruitss.cxx

@@ -25,7 +25,7 @@
 #include <string>
 #include <stdexcept>
 
-#include "adafruitss.h"
+#include "adafruitss.hpp"
 #include <unistd.h>
 #include <math.h>
 

src/adafruitss/javaupm_adafruitss.i

@@ -1,9 +1,9 @@
 %module javaupm_adafruitss
 %include "../upm.i"
 
-%include "adafruitss.h"
+%include "adafruitss.hpp"
 %{
-    #include "adafruitss.h"
+    #include "adafruitss.hpp"
 %}
 
 %pragma(java) jniclasscode=%{

src/adafruitss/jsupm_adafruitss.i

@@ -1,7 +1,7 @@
 %module jsupm_adafruitss
 %include "../upm.i"
 
-%include "adafruitss.h"
+%include "adafruitss.hpp"
 %{
-    #include "adafruitss.h"
+    #include "adafruitss.hpp"
 %}

src/adafruitss/pyupm_adafruitss.i

@@ -5,7 +5,7 @@
 
 %feature("autodoc", "3");
 
-%include "adafruitss.h"
+%include "adafruitss.hpp"
 %{
-    #include "adafruitss.h"
+    #include "adafruitss.hpp"
 %}

src/adc121c021/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "adc121c021")
 set (libdescription "upm adc121c021 I2C ADC converter module")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/adc121c021/adc121c021.cxx

@@ -26,7 +26,7 @@
 #include <string>
 #include <stdexcept>
 
-#include "adc121c021.h"
+#include "adc121c021.hpp"
 
 using namespace upm;
 using namespace std;

src/adc121c021/javaupm_adc121c021.i

@@ -3,10 +3,10 @@
 /*%include "../carrays_uint16_t.i"
 */
 %{
-    #include "adc121c021.h"
+    #include "adc121c021.hpp"
 %}
 
-%include "adc121c021.h"
+%include "adc121c021.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/adc121c021/jsupm_adc121c021.i

@@ -3,7 +3,7 @@
 %include "../carrays_uint16_t.i"
 
 %{
-    #include "adc121c021.h"
+    #include "adc121c021.hpp"
 %}
 
-%include "adc121c021.h"
+%include "adc121c021.hpp"

src/adc121c021/pyupm_adc121c021.i

@@ -9,7 +9,7 @@
 %include "adc121c021_doc.i"
 #endif
 
-%include "adc121c021.h"
+%include "adc121c021.hpp"
 %{
-    #include "adc121c021.h"
+    #include "adc121c021.hpp"
 %}

src/adis16448/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "adis16448")
 set (libdescription "libupm High-Precision IMU")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/adis16448/adis16448.cxx

@@ -44,7 +44,7 @@
 #include <functional>
 #include <string.h>
 
-#include "adis16448.h"
+#include "adis16448.hpp"
 
 using namespace upm;
 

src/adis16448/adis16448.hpp

@@ -6,7 +6,7 @@
 // Copyright (c) 2015 Juan Jose Chong
 //
 //////////////////////////////////////////////////////////////////////////////////////
-// adis16448.h
+// adis16448.hpp
 //////////////////////////////////////////////////////////////////////////////////////
 //
 // This library runs on an Intel Edison and uses mraa to acquire data

src/adis16448/javaupm_adis16448.i

@@ -2,10 +2,10 @@
 %include "../upm.i"
 
 %{
-    #include "adis16448.h"
+    #include "adis16448.hpp"
 %}
 
-%include "adis16448.h"
+%include "adis16448.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/adis16448/jsupm_adis16448.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "adis16448.h"
+    #include "adis16448.hpp"
 %}
 
-%include "adis16448.h"
+%include "adis16448.hpp"

src/adis16448/pyupm_adis16448.i

@@ -4,7 +4,7 @@
 %include "../upm.i"
 
 %{
-    #include "adis16448.h"
+    #include "adis16448.hpp"
 %}
 
-%include "adis16448.h"
+%include "adis16448.hpp"

src/ads1x15/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "ads1x15")
 set (libdescription "analog to digital converter")
 set (module_src ${libname}.cxx ads1115.cxx ads1015.cxx)
-set (module_h ${libname}.h ads1115.h ads1015.h)
+set (module_hpp ${libname}.hpp ads1115.hpp ads1015.hpp)
 upm_module_init()

src/ads1x15/ads1015.cxx

@@ -21,7 +21,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "ads1015.h"
+#include "ads1015.hpp"
 
 using namespace upm;
 

src/ads1x15/ads1015.hpp

@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include "ads1x15.h"
-#include "upm/iADC.h"
+#include "ads1x15.hpp"
+#include "upm/iADC.hpp"
 
 #define ADS1015_VREF 2.048
 

src/ads1x15/ads1115.cxx

@@ -21,7 +21,7 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "ads1115.h"
+#include "ads1115.hpp"
 
 using namespace upm;
 

src/ads1x15/ads1115.hpp

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "ads1x15.h"
+#include "ads1x15.hpp"
 
 
 

src/ads1x15/ads1x15.cxx

@@ -23,7 +23,7 @@
  */
 
 
-#include "ads1x15.h"
+#include "ads1x15.hpp"
 
 #include <unistd.h>
 

src/ads1x15/javaupm_ads1x15.i

@@ -3,14 +3,14 @@
 %include "typemaps.i"
 
 %{
-    #include "ads1x15.h"
-    #include "ads1015.h"
-    #include "ads1115.h"
+    #include "ads1x15.hpp"
+    #include "ads1015.hpp"
+    #include "ads1115.hpp"
 %}
 
-%include "ads1x15.h"
-%include "ads1015.h"
-%include "ads1115.h"
+%include "ads1x15.hpp"
+%include "ads1015.hpp"
+%include "ads1115.hpp"
 
 
 

src/ads1x15/jsupm_ads1x15.i

@@ -1,17 +1,17 @@
 %module jsupm_ads1x15
 %include "../upm.i"
 
-%include "ads1x15.h"
+%include "ads1x15.hpp"
 %{
-    #include "ads1x15.h"
+    #include "ads1x15.hpp"
 %}
 
-%include "ads1015.h"
+%include "ads1015.hpp"
 %{
-    #include "ads1015.h"
+    #include "ads1015.hpp"
 %}
 
-%include "ads1115.h"
+%include "ads1115.hpp"
 %{
-    #include "ads1115.h"
+    #include "ads1115.hpp"
 %}

src/ads1x15/pyupm_ads1x15.i

@@ -5,17 +5,17 @@
 
 %feature("autodoc", "3");
 
-%include "ads1x15.h"
+%include "ads1x15.hpp"
 %{
-    #include "ads1x15.h"
+    #include "ads1x15.hpp"
 %}
 
-%include "ads1015.h"
+%include "ads1015.hpp"
 %{
-    #include "ads1015.h"
+    #include "ads1015.hpp"
 %}
 
-%include "ads1115.h"
+%include "ads1115.hpp"
 %{
-    #include "ads1115.h"
+    #include "ads1115.hpp"
 %}

src/adxl335/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "adxl335")
 set (libdescription "upm adxl335 grove 3-axis anaolog accelerometer")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/adxl335/adxl335.cxx

@@ -29,7 +29,7 @@
 #include <string>
 #include <stdexcept>
 
-#include "adxl335.h"
+#include "adxl335.hpp"
 
 using namespace std;
 using namespace upm;

src/adxl335/javaupm_adxl335.i

@@ -7,7 +7,7 @@
 %apply float *OUTPUT { float *xAccel, float *yAccel, float *zAccel  };
 
 %{
-    #include "adxl335.h"
+    #include "adxl335.hpp"
 %}
 
 %typemap(jni) float* "jfloatArray"
@@ -40,7 +40,7 @@
 %ignore values(int *, int *, int *);
 %ignore acceleration(float *, float *, float *);
 
-%include "adxl335.h"
+%include "adxl335.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/adxl335/jsupm_adxl335.i

@@ -6,7 +6,7 @@
 %pointer_functions(float, floatPointer);
 
 %{
-    #include "adxl335.h"
+    #include "adxl335.hpp"
 %}
 
-%include "adxl335.h"
+%include "adxl335.hpp"

src/adxl335/pyupm_adxl335.i

@@ -9,7 +9,7 @@
 
 %feature("autodoc", "3");
 
-%include "adxl335.h"
+%include "adxl335.hpp"
 %{
-    #include "adxl335.h"
+    #include "adxl335.hpp"
 %}

src/adxl345/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "adxl345")
 set (libdescription "libupm Digital Accelerometer")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/adxl345/adxl345.cxx

@@ -27,7 +27,7 @@
 #include <stdexcept>
 #include <unistd.h>
 #include "math.h"
-#include "adxl345.h"
+#include "adxl345.hpp"
 
 #define READ_BUFFER_LENGTH 6
 

src/adxl345/javaupm_adxl345.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "adxl345.h"
+    #include "adxl345.hpp"
 %}
 
 %typemap(jni) float* "jfloatArray"
@@ -33,7 +33,7 @@
     delete [] $1;
 }
 
-%include "adxl345.h"
+%include "adxl345.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/adxl345/jsupm_adxl345.i

@@ -4,7 +4,7 @@
 %include "../carrays_float.i"
 
 %{
-    #include "adxl345.h"
+    #include "adxl345.hpp"
 %}
 
 %typemap(out) int16_t * {
@@ -15,6 +15,6 @@
     $result = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_floatArray, 0 | 0 );
 }
 
-%include "adxl345.h"
+%include "adxl345.hpp"
 
 %include <carrays.i>

src/adxl345/pyupm_adxl345.i

@@ -19,7 +19,7 @@
 %include "adxl345_doc.i"
 #endif
 
-%include "adxl345.h"
+%include "adxl345.hpp"
 %{
-    #include "adxl345.h"
+    #include "adxl345.hpp"
 %}

src/adxrs610/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "adxrs610")
 set (libdescription "upm ADXRS610 gyroscope")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/adxrs610/adxrs610.cxx

@@ -24,7 +24,7 @@
 
 #include <iostream>
 
-#include "adxrs610.h"
+#include "adxrs610.hpp"
 
 using namespace std;
 using namespace upm;

src/adxrs610/javaupm_adxrs610.i

@@ -2,10 +2,10 @@
 %include "../upm.i"
 
 %{
-    #include "adxrs610.h"
+    #include "adxrs610.hpp"
 %}
 
-%include "adxrs610.h"
+%include "adxrs610.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/adxrs610/jsupm_adxrs610.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "adxrs610.h"
+    #include "adxrs610.hpp"
 %}
 
-%include "adxrs610.h"
+%include "adxrs610.hpp"

src/adxrs610/pyupm_adxrs610.i

@@ -5,7 +5,7 @@
 
 %feature("autodoc", "3");
 
-%include "adxrs610.h"
+%include "adxrs610.hpp"
 %{
-    #include "adxrs610.h"
+    #include "adxrs610.hpp"
 %}

src/am2315/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "am2315")
 set (libdescription "libupm Humidity Sensor")
 set (module_src ${libname}.cpp)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/am2315/am2315.cpp

@@ -30,7 +30,7 @@
 #include <sched.h>
 #include <time.h>
 
-#include "am2315.h"
+#include "am2315.hpp"
 
 using namespace upm;
 

src/am2315/javaupm_am2315.i

@@ -2,10 +2,10 @@
 %include "../upm.i"
 
 %{
-    #include "am2315.h"
+    #include "am2315.hpp"
 %}
 
-%include "am2315.h"
+%include "am2315.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/am2315/jsupm_am2315.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "am2315.h"
+    #include "am2315.hpp"
 %}
 
-%include "am2315.h"
+%include "am2315.hpp"

src/am2315/pyupm_am2315.i

@@ -9,7 +9,7 @@
 %include "am2315_doc.i"
 #endif
 
-%include "am2315.h"
+%include "am2315.hpp"
 %{
-    #include "am2315.h"
+    #include "am2315.hpp"
 %}

src/apa102/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "apa102")
 set (libdescription "upm apa102 led strip spi output module")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/apa102/apa102.cxx

@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "apa102.h"
+#include "apa102.hpp"
 
 using namespace upm;
 

src/apa102/javaupm_apa102.i

@@ -13,10 +13,10 @@
 }
 
 %{
-    #include "apa102.h"
+    #include "apa102.hpp"
 %}
 
-%include "apa102.h"
+%include "apa102.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/apa102/jsupm_apa102.i

@@ -12,8 +12,8 @@
   $1 = (uint8_t*) node::Buffer::Data($input);
 }
 
-%include "apa102.h" 
+%include "apa102.hpp" 
 
 %{
-    #include "apa102.h"
+    #include "apa102.hpp"
 %}

src/apa102/pyupm_apa102.i

@@ -17,9 +17,9 @@
   }
 }
  
-%include "apa102.h"
+%include "apa102.hpp"
  
 %{
  
-    #include "apa102.h"
+    #include "apa102.hpp"
 %}

src/apds9002/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "apds9002")
 set (libdescription "upm apds9002 luminance module")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/apds9002/apds9002.cxx

@@ -26,7 +26,7 @@
 #include <string>
 #include <stdexcept>
 
-#include "apds9002.h"
+#include "apds9002.hpp"
 
 using namespace upm;
 

src/apds9002/javaupm_apds9002.i

@@ -2,10 +2,10 @@
 %include "../upm.i"
 
 %{
-    #include "apds9002.h"
+    #include "apds9002.hpp"
 %}
 
-%include "apds9002.h"
+%include "apds9002.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/apds9002/jsupm_apds9002.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "apds9002.h"
+    #include "apds9002.hpp"
 %}
 
-%include "apds9002.h"
+%include "apds9002.hpp"

src/apds9002/pyupm_apds9002.i

@@ -5,7 +5,7 @@
 
 %feature("autodoc", "3");
 
-%include "apds9002.h"
+%include "apds9002.hpp"
 %{
-    #include "apds9002.h"
+    #include "apds9002.hpp"
 %}

src/apds9930/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "apds9930")
 set (libdescription "upm apds9930 sensor module")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/apds9930/apds9930.cxx

@@ -26,7 +26,7 @@
 #include <string>
 #include <stdexcept>
 
-#include "apds9930.h"
+#include "apds9930.hpp"
 
 using namespace upm;
 

src/apds9930/javaupm_apds9930.i

@@ -2,9 +2,9 @@
 %include "../upm.i"
 
 %{
-    #include "apds9930.h"
+    #include "apds9930.hpp"
 %}
-%include "apds9930.h"
+%include "apds9930.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/apds9930/jsupm_apds9930.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "apds9930.h"
+    #include "apds9930.hpp"
 %}
 
-%include "apds9930.h"
+%include "apds9930.hpp"

src/apds9930/pyupm_apds9930.i

@@ -3,7 +3,7 @@
 
 %feature("autodoc", "3");
 
-%include "apds9930.h"
+%include "apds9930.hpp"
 %{
-    #include "apds9930.h"
+    #include "apds9930.hpp"
 %}

src/at42qt1070/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "at42qt1070")
 set (libdescription "upm module for the Atmel AT42QT1070 QTouch sensor")
 set (module_src ${libname}.cxx)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 upm_module_init()

src/at42qt1070/at42qt1070.cxx

@@ -28,7 +28,7 @@
 #include <string>
 #include <stdexcept>
 
-#include "at42qt1070.h"
+#include "at42qt1070.hpp"
 
 using namespace upm;
 using namespace std;

src/at42qt1070/javaupm_at42qt1070.i

@@ -2,10 +2,10 @@
 %include "../upm.i"
 
 %{
-    #include "at42qt1070.h"
+    #include "at42qt1070.hpp"
 %}
 
-%include "at42qt1070.h"
+%include "at42qt1070.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/at42qt1070/jsupm_at42qt1070.i

@@ -2,7 +2,7 @@
 %include "../upm.i"
 
 %{
-    #include "at42qt1070.h"
+    #include "at42qt1070.hpp"
 %}
 
-%include "at42qt1070.h"
+%include "at42qt1070.hpp"

src/at42qt1070/pyupm_at42qt1070.i

@@ -9,7 +9,7 @@
 %include "at42qt1070_doc.i"
 #endif
 
-%include "at42qt1070.h"
+%include "at42qt1070.hpp"
 %{
-    #include "at42qt1070.h"
+    #include "at42qt1070.hpp"
 %}

src/bacnetmstp/CMakeLists.txt

@@ -1,7 +1,7 @@
 set (libname "bacnetmstp")
 set (libdescription "upm driver module for BACnet MS/TP devices")
 set (module_src ${libname}.cxx device-client.c)
-set (module_h ${libname}.h)
+set (module_hpp ${libname}.hpp)
 
 pkg_search_module(BACNET libbacnet)
 if (BACNET_FOUND)

src/bacnetmstp/bacnetmstp.cxx

@@ -28,7 +28,7 @@
 #include <string>
 #include <sstream>
 
-#include "bacnetmstp.h"
+#include "bacnetmstp.hpp"
 #include "handlers.h"
 #include "client.h"
 #include "txbuf.h"

src/bacnetmstp/javaupm_bacnetmstp.i

@@ -6,10 +6,10 @@
 %include "../java_buffer.i"
 
 %{
-    #include "bacnetmstp.h"
+    #include "bacnetmstp.hpp"
 %}
 
-%include "bacnetmstp.h"
+%include "bacnetmstp.hpp"
 
 %pragma(java) jniclasscode=%{
     static {

src/bacnetmstp/jsupm_bacnetmstp.i

@@ -5,7 +5,7 @@
 
 %pointer_functions(float, floatp);
 
-%include "bacnetmstp.h"
+%include "bacnetmstp.hpp"
 %{
-    #include "bacnetmstp.h"
+    #include "bacnetmstp.hpp"
 %}