Changeset 8703

Timestamp:

02/16/09 17:49:26 (4 years ago)

Author:

mcarrick

Message:

removing ambiguitity in members, cleaning up function calls

Location:

ossiedev/branches/mcarrick/DPD

Files:

• DevicePkgRef.cpp (modified) (2 diffs)
• DevicePkgRef.h (modified) (1 diff)
• HWDeviceRegistration.cpp (modified) (4 diffs)
• HWDeviceRegistration.h (modified) (2 diffs)
• LocalFile.cpp (deleted)
• LocalFile.h (deleted)
• Makefile (modified) (2 diffs)
• testApp.cpp (modified) (2 diffs)

ossiedev/branches/mcarrick/DPD/DevicePkgRef.cpp

@@ -12 +12 @@
 DevicePkgRef::~DevicePkgRef()
 {
-        std::cout << "dev pkg ref deconstruct ... " << std::endl;
 }
 
@@ -19 +18 @@
         std::cout << "DEBUG: parsing device pkg ref..." << std::endl;
 
-        type = elem->Attribute("type"); // store type from devicepkgref tag
+        parseAttributes(elem); // store type from devicepkgref tag
+        parseChildElements(elem);
 
-        TiXmlElement *local = elem->FirstChildElement("localfile"); // get link to localfile tag
-        localfile = local->Attribute("name"); // store path
 }
 
-std::string DevicePkgRef::getTypeDevPkgRef()
+void DevicePkgRef::parseAttributes(TiXmlElement *elem)
+{
+        type = elem->Attribute("type");
+}
+
+void DevicePkgRef::parseChildElements(TiXmlElement *elem)
+{
+        TiXmlElement *local = elem->FirstChildElement("localfile");
+        localfile = local->Attribute("name");
+}
+
+std::string DevicePkgRef::getDevPkgRefType()
 {
         return type;
 }
 
-std::string DevicePkgRef::getLocalFileDevPkgRef()
+std::string DevicePkgRef::getDevPkgRefLocalFile()
 {
         return localfile;

ossiedev/branches/mcarrick/DPD/DevicePkgRef.h

@@ -16 +16 @@
                 ~DevicePkgRef();
 
-                std::string getTypeDevPkgRef();
-                std::string getLocalFileDevPkgRef();
+                std::string getDevPkgRefType();
+                std::string getDevPkgRefLocalFile();
 
         protected:
                 void parseElement(TiXmlElement *elem);
+                void parseAttributes(TiXmlElement *elem);
+                void parseChildElements(TiXmlElement *elem);
 
         private:

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.cpp

@@ -11 +11 @@
 {
         parseElement(elem); // parse tags in hwdeviceregistration, with exception of propertyfile, deviceclass, childhwdevice
-        constructChildHWDevice(elem->FirstChildElement("childhwdevice")); // cannot call constructor on ChildHWDevice, use this function to do it
+        constructChildHWDevice(elem->FirstChildElement("childhwdevice")); 
 }
 
@@ -55 +55 @@
 ChildHWDevice::ChildHWDevice(TiXmlElement *elem):DevicePkgRef(elem->FirstChildElement("devicepkgref"))
 {
+        HWDeviceRegistration hwdev(elem->FirstChildElement("hwdeviceregistration"));
 }
 
@@ -96 +97 @@
 }
 
+/*
+HWDeviceRegistration ChildHWDevice::getHWDeviceRegistration()
+{
+        return hwDeviceReg;
+}
+*/
 
 
@@ -101 +108 @@
 
 
-
-

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.h

@@ -51 +51 @@
 };
 
+// class OSSIEPARSER_API ChildHWDevice:public DevicePkgRef
 class ChildHWDevice:public DevicePkgRef
 {
@@ -57 +58 @@
                 ~ChildHWDevice();
 
-                HWDeviceRegistration getHWDeviceRegistration();
+        //      HWDeviceRegistration getHWDeviceRegistration();
 
         protected:

ossiedev/branches/mcarrick/DPD/Makefile

@@ -1 +1 @@
 all: testApp
 
-testApp: DevicePkg.o testApp.o LocalFile.o HWDeviceRegistration.o PropertyFile.o DevicePkgRef.o DeviceClass.o tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o
-        g++ DevicePkg.o LocalFile.o HWDeviceRegistration.o PropertyFile.o DevicePkgRef.o DeviceClass.o testApp.o tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o -o testApp
+testApp: DevicePkg.o testApp.o HWDeviceRegistration.o PropertyFile.o DevicePkgRef.o DeviceClass.o tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o
+        g++ DevicePkg.o HWDeviceRegistration.o PropertyFile.o DevicePkgRef.o DeviceClass.o testApp.o tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o -o testApp
 
 
@@ -29 +29 @@
         g++ -c HWDeviceRegistration.cpp
 
-LocalFile.o: LocalFile.cpp
-        g++ -c LocalFile.cpp
-
 PropertyFile.o: PropertyFile.cpp
         g++ -c PropertyFile.cpp

ossiedev/branches/mcarrick/DPD/testApp.cpp

@@ -63 +63 @@
                 }
                 std::cout << "                  </deviceclass>" << std::endl;
+
+                for (int i = 0; i < parse.getChildHWDevice().size(); i++)
+                {
+                std::cout << "                  <childhwdevice>" << std::endl;
+//              std::cout << "                          <hwdeviceregistration id=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration().getHWDevRegID() << std::endl;
+                }
+
+
 
 
@@ -134 +142 @@
 
                 DevicePkgRef parse(devPkgRef);
-
-                std::cout << "********************" << std::endl;
-                std::cout << "DevicePkgRef:" << std::endl;
-                std::cout << "type: " << parse.getTypeDevPkgRef() << std::endl;
-                std::cout << "localfile: " << parse.getLocalFileDevPkgRef() << std::endl;
-                std::cout << "********************" << std::endl;
-
         }
         else