Changeset 8699 for ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.cpp

Timestamp:

02/16/09 15:29:09 (4 years ago)

Author:

mcarrick

Message:

reducing ambiguity in member functions, cleaning up calls

Files:

• ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.cpp (modified) (5 diffs)

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.cpp

@@ -16 +16 @@
 HWDeviceRegistration::~HWDeviceRegistration()
 {
-/*
-        std::cout << "hw device reg deconstruct ... " << std::endl;
-
-        for (int i = 0; i < childHWDevices.size(); i++)
-        {
-                std::cout << "i: " << i << std::endl;
-                delete [] childHWDevices[i];
-                std::cout << "deleted, i: " << i << std::endl;
-        }
-        std::cout << "exiting hwdev deconstruct ... " << std::endl;
-*/
 }
 
@@ -64 +53 @@
 }
 
-ChildHWDevice::ChildHWDevice(TiXmlElement *elem):DevicePkgRef(elem->FirstChildElement("devicepkgref")),HWDeviceRegistration(elem->FirstChildElement("hwdeviceregistration"))
+ChildHWDevice::ChildHWDevice(TiXmlElement *elem):DevicePkgRef(elem->FirstChildElement("devicepkgref"))
 {
 }
@@ -70 +59 @@
 ChildHWDevice::~ChildHWDevice()
 {
-        std::cout << "child hw dev deconstruct ... " << std::endl;
 }
 
@@ -78 +66 @@
 }
 
-std::string HWDeviceRegistration::getIDHWDevReg()
+std::string HWDeviceRegistration::getHWDevRegID()
 {
         return id;
 }
 
-std::string HWDeviceRegistration::getVersionHWDevReg()
+std::string HWDeviceRegistration::getHWDevRegVersion()
 {
         return version;
 }
 
-std::string HWDeviceRegistration::getNameHWDevReg()
+std::string HWDeviceRegistration::getHWDevRegName()
 {
         return name;
 }
 
-std::string HWDeviceRegistration::getDescription()
+std::string HWDeviceRegistration::getHWDevRegDescription()
 {
         return description;
 }
 
-std::string HWDeviceRegistration::getManufacturer()
+std::string HWDeviceRegistration::getHWDevRegManufacturer()
 {
         return manufacturer;
 }
 
-std::string HWDeviceRegistration::getModelNumber()
+std::string HWDeviceRegistration::getHWDevRegModelNumber()
 {
         return modelnumber;
@@ -115 +103 @@
 
 
-