memory leak fixes

[libplp.git] / src / DeviceData.hh

diff --git a/src/DeviceData.hh b/src/DeviceData.hh
index ce0f89a3889fd3c1dc503445b73f06af87bc6f44..8e9335ed28dc95e17c8ae292014252480e5304f6 100644 (file)
--- a/src/DeviceData.hh
+++ b/src/DeviceData.hh
@@ -1,37 +1,30 @@
 /*
  * DeviceData.hh
  *
- *  Created on: Mar 4, 2011
+ *  Created on: Mar 10, 2011
  *      Author: lamikr
  */
 
-#ifndef DEVICEINFO_HH_
-#define DEVICEINFO_HH_
+#ifndef DEVICEDATA_HH_
+#define DEVICEDATA_HH_
 
-#include <string>
-
-using namespace std;
+#include "Data.hh"
+#include "Device.hh"
 
 namespace plp {
-       enum EnumDeviceLifeCycleStatus {LIFECYCLE_STATUS__UNAVAILABLE, LIFECYCLE_STATUS__AVAILABLE};
-
-       class DeviceData {
+       class DeviceData : public Device {
                public:
-                       DeviceData(string id_param, string type_param);
-                       DeviceData(string id_param, string type_param, string name_param, EnumDeviceLifeCycleStatus status_param);
+                       DeviceData(std::string id_param, std::string type_param);
+                       DeviceData(std::string id_param,
+                               std::string type_param,
+                               std::string name_param,
+                               plp::EnumDeviceLifeCycleStatus status_param,
+                               Data *latest_data);
                        ~DeviceData();
-                       std::string get_id();
-                       std::string get_name();
-                       std::string get_type();
-                       plp::EnumDeviceLifeCycleStatus get_lifecycle_state();
-                       void set_name(std::string name_param);
                        void printout();
-               protected:
-                       std::string id;
-                       std::string name;
-                       std::string type;
-                       plp::EnumDeviceLifeCycleStatus lifecycle_status;
+               private:
+                       Data *_latest_data;
        };
 }
 
-#endif /* DEVICEINFO_HH_ */
+#endif /* DEVICEDATA_HH_ */