java: changed some C types to C++ types

Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

Conflicts:
	src/mma7455/mma7455.cxx
	src/mma7455/mma7455.h
	src/sm130/sm130.cxx
	src/sm130/sm130.h

src/nrf24l01/nrf24l01.h

@@ -25,9 +25,19 @@
 #pragma once
 
 #include <string>
-#include <mraa/aio.h>
-#include <mraa/gpio.h>
-#include <mraa/spi.h>
+#include <mraa/aio.hpp>
+#include <mraa/common.hpp>
+
+#ifdef SWIGJAVA
+#undef SWIGJAVA
+#include <mraa/gpio.hpp>
+#define SWIGJAVA
+
+#else
+#include <mraa/gpio.hpp>
+#endif
+
+#include <mraa/spi.hpp>
 #include <cstring>
 
 /* Memory Map */
@@ -164,6 +174,7 @@ typedef enum {
  * @web http://www.seeedstudio.com/depot/nRF24L01Module-p-1394.html
  * @con spi
  *
+ * id
  * @brief API for the NRF24L01 Transceiver Module
  *
  * This module defines the NRF24L01 interface for libnrf24l01
@@ -317,22 +328,22 @@ class NRF24L01 {
         /**
          * Sets the chip enable pin to HIGH
          */
-        mraa_result_t ceHigh ();
+        mraa::Result ceHigh ();
 
         /**
          * Sets the chip enable pin to LOW
          */
-        mraa_result_t ceLow ();
+        mraa::Result ceLow ();
 
         /**
          * Sets the chip select pin to LOW
          */
-        mraa_result_t csOn ();
+        mraa::Result csOn ();
 
         /**
          * Sets the chip select pin to HIGH
          */
-        mraa_result_t csOff ();
+        mraa::Result csOff ();
 
         /**
          * Configures the NRF24L01 transceiver to behave as a BLE
@@ -386,7 +397,7 @@ class NRF24L01 {
 
         uint8_t swapbits (uint8_t a);
 
-        mraa_spi_context        m_spi;
+        mraa::Spi        m_spi;
         uint8_t                 m_ce;
         uint8_t                 m_csn;
         uint8_t                 m_channel;
@@ -395,8 +406,8 @@ class NRF24L01 {
         uint8_t                 m_payload;
         uint8_t                 m_localAddress[5];
 
-        mraa_gpio_context       m_csnPinCtx;
-        mraa_gpio_context       m_cePinCtx;
+        mraa::Gpio       m_csnPinCtx;
+        mraa::Gpio       m_cePinCtx;
 
         std::string             m_name;
 };