X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FDeviceData.hh;h=fdc3c7982a2b1f232385d3b332ab7c5e086ec44a;hb=c4af0ad507372ce0a9c1310e21979d083de0e757;hp=ce0f89a3889fd3c1dc503445b73f06af87bc6f44;hpb=063ec715601bf9662797725cb39732bea0572d26;p=libplp.git

diff --git a/src/DeviceData.hh b/src/DeviceData.hh
index ce0f89a..fdc3c79 100644
--- a/src/DeviceData.hh
+++ b/src/DeviceData.hh
@@ -1,37 +1,31 @@
 /*
  * 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_ */