Diff: public/GattAttribute.h

Revision:

144:c025c8839682

Parent:

140:407d134c179d

Child:

260:ea7f9f14cc15

diff -r 8bdf577b1598 -r c025c8839682 public/GattAttribute.h
--- a/public/GattAttribute.h	Fri Nov 21 09:23:24 2014 +0000
+++ b/public/GattAttribute.h	Fri Nov 21 09:23:24 2014 +0000
@@ -14,22 +14,10 @@
  * limitations under the License.
  */
 
-
 #ifndef __GATT_ATTRIBUTE_H__
 #define __GATT_ATTRIBUTE_H__
 
-#include <stddef.h>
-
-#include "blecommon.h"
-#include "UUID.h"
-
-/**************************************************************************/
-/*!
-    \brief  GATT attribute
-*/
-/**************************************************************************/
-class GattAttribute
-{
+class GattAttribute {
 public:
     typedef uint16_t Handle_t;
 
@@ -58,41 +46,29 @@
      */
     /**************************************************************************/
     GattAttribute(const UUID &uuid, uint8_t *valuePtr = NULL, uint16_t initialLen = 0, uint16_t maxLen = 0) :
-        _uuid(uuid), _valuePtr(valuePtr), _initialLen(initialLen), _lenMax(maxLen), _handle(){
+        _uuid(uuid), _valuePtr(valuePtr), _initialLen(initialLen), _lenMax(maxLen), _handle() {
         /* empty */
     }
 
 public:
-    Handle_t getHandle(void) const {
-        return _handle;
-    }
-
-    void setHandle(Handle_t id) {
-        _handle = id;
-    }
-
-    const UUID &getUUID(void) const {
-        return _uuid;
-    }
+    Handle_t    getHandle(void)        const {return _handle;    }
+    const UUID &getUUID(void)          const {return _uuid;      }
+    uint16_t    getInitialLength(void) const {return _initialLen;}
+    uint16_t    getMaxLength(void)     const {return _lenMax;    }
+    void        setHandle(Handle_t id)       {_handle = id;      }
+    uint8_t    *getValuePtr(void)            {return _valuePtr;  }
 
-    uint16_t getInitialLength(void) const {
-        return _initialLen;
-    }
-
-    uint16_t getMaxLength(void) const {
-        return _lenMax;
-    }
-
-    uint8_t *getValuePtr(void) {
-        return _valuePtr;
-    }
-
-protected:
+private:
     UUID      _uuid;        /* Characteristic UUID */
     uint8_t  *_valuePtr;
     uint16_t  _initialLen;  /* Initial length of the value */
     uint16_t  _lenMax;      /* Maximum length of the value */
     Handle_t  _handle;
+
+private:
+    /* disallow copy and assignment */
+    GattAttribute(const GattAttribute &);
+    GattAttribute& operator=(const GattAttribute &);
 };
 
 #endif // ifndef __GATT_ATTRIBUTE_H__
\ No newline at end of file