Changeset 8699

Timestamp:

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

Author:

mcarrick

Message:

reducing ambiguity in member functions, cleaning up calls

Location:

ossiedev/branches/mcarrick/DPD

Files:

• DeviceClass.cpp (modified) (1 diff)
• DeviceClass.h (modified) (1 diff)
• DevicePkg.cpp (modified) (3 diffs)
• DevicePkg.h (modified) (1 diff)
• HWDeviceRegistration.cpp (modified) (5 diffs)
• HWDeviceRegistration.h (modified) (2 diffs)
• PropertyFile.cpp (modified) (2 diffs)
• PropertyFile.h (modified) (1 diff)
• testApp.cpp (modified) (3 diffs)

ossiedev/branches/mcarrick/DPD/DeviceClass.cpp

@@ -12 +12 @@
 DeviceClass::~DeviceClass()
 {
-        std::cout << "dev class deconstruct ... " << std::endl;
 }
 

ossiedev/branches/mcarrick/DPD/DeviceClass.h

@@ -15 +15 @@
                 DeviceClass(TiXmlElement *elem);
                 ~DeviceClass();
+
                 std::vector <std::string> getDeviceClass();
 

ossiedev/branches/mcarrick/DPD/DevicePkg.cpp

@@ -12 +12 @@
 DevicePkg::~DevicePkg()
 {
-        std::cout << "dev pkg deconstruct ... " << std::endl;
 }
 
@@ -20 +19 @@
 
         // get attributes from devicepkg
+        parseAttributes(elem);
+
+        // parse info from author, title and description tags
+        parseChildElements(elem);
+}
+
+void DevicePkg::parseAttributes(TiXmlElement *elem)
+{
         id = elem->Attribute("id");
         name = elem->Attribute("name");
         version = elem->Attribute("version");
+}
 
-        // parse info from author, title and description tags
+void DevicePkg::parseChildElements(TiXmlElement *elem)
+{
         TiXmlElement *auth = elem->FirstChildElement("author");
         author = auth->GetText();
@@ -33 +42 @@
         TiXmlElement *descrip = elem->FirstChildElement("description");
         description = descrip->GetText();
-
 }
 
-std::string DevicePkg::getIDDevPkg()
+std::string DevicePkg::getDevPkgID()
 {
         return id;
 }
 
-std::string DevicePkg::getNameDevPkg()
+std::string DevicePkg::getDevPkgName()
 {
         return name;
 }
 
-std::string DevicePkg::getVersionDevPkg()
+std::string DevicePkg::getDevPkgVersion()
 {
         return version;
 }
 
-std::string DevicePkg::getTitle()
+std::string DevicePkg::getDevPkgTitle()
 {
         return title;
 }
 
-std::string DevicePkg::getAuthor()
+std::string DevicePkg::getDevPkgAuthor()
 {
         return author;
 }
 
-std::string DevicePkg::getDescription()
+std::string DevicePkg::getDevPkgDescription()
 {
         return description;

ossiedev/branches/mcarrick/DPD/DevicePkg.h

@@ -18 +18 @@
                 ~DevicePkg();
 
-                std::string getIDDevPkg();
-                std::string getNameDevPkg();
-                std::string getVersionDevPkg();
+                std::string getDevPkgID();
+                std::string getDevPkgName();
+                std::string getDevPkgVersion();
 
-                std::string getTitle();
-                std::string getAuthor();
-                std::string getDescription();
+                std::string getDevPkgTitle();
+                std::string getDevPkgAuthor();
+                std::string getDevPkgDescription();
 
         protected:
                 void parseElement(TiXmlElement *elem);
+                void parseAttributes(TiXmlElement *elem);
+                void parseChildElements(TiXmlElement *elem);
 
         private:

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 @@
 
 
-

ossiedev/branches/mcarrick/DPD/HWDeviceRegistration.h

@@ -23 +23 @@
                 ~HWDeviceRegistration();
 
-                std::string getIDHWDevReg();
-                std::string getVersionHWDevReg();
-                std::string getNameHWDevReg();
-                std::string getDescription();
-                std::string getManufacturer();
-                std::string getModelNumber();
+                std::string getHWDevRegID();
+                std::string getHWDevRegVersion();
+                std::string getHWDevRegName();
+                std::string getHWDevRegDescription();
+                std::string getHWDevRegManufacturer();
+                std::string getHWDevRegModelNumber();
 
                 std::vector <ChildHWDevice*> getChildHWDevice();
@@ -57 +57 @@
                 ~ChildHWDevice();
 
-        //      HWDeviceRegistration getHWDeviceRegistration();
+                HWDeviceRegistration getHWDeviceRegistration();
 
         protected:

ossiedev/branches/mcarrick/DPD/PropertyFile.cpp

@@ -12 +12 @@
 PropertyFile::~PropertyFile()
 {
-        std::cout << "prop file deconstruct ... " << std::endl;
 }
 
@@ -19 +18 @@
         std::cout << "DEBUG: parsing property file..." << std::endl;
 
-        type = elem->Attribute("type"); // get type from propertyfile tag
-
-        TiXmlElement *local = elem->FirstChildElement("localfile"); // get link to localfile tag
-        localfile = local->Attribute("name"); // store path
+        parseAttributes(elem); // get type from propertyfile tag
+        parseChildElements(elem); // parse localfile tag
 }
 
-std::string PropertyFile::getTypePropFile()
+void PropertyFile::parseAttributes(TiXmlElement *elem)
+{
+        type = elem->Attribute("type");
+}
+
+void PropertyFile::parseChildElements(TiXmlElement *elem)
+{
+        TiXmlElement *local = elem->FirstChildElement("localfile");
+        localfile = local->Attribute("name");
+}
+
+std::string PropertyFile::getPropFileType()
 {
         return type;
 }
 
-std::string PropertyFile::getLocalFilePropFile()
+std::string PropertyFile::getPropFileLocalFile()
 {
         return localfile;

ossiedev/branches/mcarrick/DPD/PropertyFile.h

@@ -15 +15 @@
                 PropertyFile(TiXmlElement *elem);
                 ~PropertyFile();
-                std::string getTypePropFile();
-                std::string getLocalFilePropFile();
+                std::string getPropFileType();
+                std::string getPropFileLocalFile();
 
         protected:
                 void parseElement(TiXmlElement *elem);
+                void parseAttributes(TiXmlElement *elem);
+                void parseChildElements(TiXmlElement *elem);
 
         private:

ossiedev/branches/mcarrick/DPD/testApp.cpp

@@ -42 +42 @@
                 DevicePkg parse(devpkg);
 
-
+                // print xml tags ...
                 std::cout << "******************************" << std::endl;
                 std::cout << "DevicePkg: " << std::endl;
-                std::cout << "<devicepkg id=" << parse.getIDDevPkg() << " version=" << parse.getVersionDevPkg() << " name=" << parse.getNameDevPkg() << ">" << std::endl;
-                std::cout << "  <title>" << parse.getTitle() << "</title>" << std::endl;
-                std::cout << "  <author>" << parse.getAuthor() << "</author>" << std::endl;
-                std::cout << "  <description>" << parse.getDescription() << "</description>" << std::endl;
-                std::cout << "          <hwdeviceregistration id=" << parse.getIDHWDevReg() << std::endl;
+                std::cout << "<devicepkg id=" << parse.getDevPkgID() << " version=" << parse.getDevPkgVersion() << " name=" << parse.getDevPkgName() << ">" << std::endl;
+                std::cout << "  <title>" << parse.getDevPkgTitle() << "</title>" << std::endl;
+                std::cout << "  <author>" << parse.getDevPkgAuthor() << "</author>" << std::endl;
+                std::cout << "  <description>" << parse.getDevPkgDescription() << "</description>" << std::endl;
+                std::cout << "          <hwdeviceregistration id=" << parse.getHWDevRegID() << " version=" << parse.getHWDevRegVersion();
+                        std::cout << " name=" << parse.getHWDevRegName() << ">" << std::endl;
+                std::cout << "                  <propertyfile type=" << parse.getPropFileType() << ">" << std::endl;
+                std::cout << "                          <localfile name=" << parse.getPropFileLocalFile() << "/>" << std::endl;
+                std::cout << "                  </propertyfile>" << std::endl;
+                std::cout << "                  <description>" << parse.getHWDevRegDescription() << "</description>" << std::endl;
+                std::cout << "                  <manufacturer>" << parse.getHWDevRegManufacturer() << "</manufacturer>" << std::endl;
+                std::cout << "                  <modelnumber>" << parse.getHWDevRegModelNumber() << "</modelnumber>" << std::endl;
+                std::cout << "                  <deviceclass>" << std::endl;
+                for (int i = 0; i < parse.getDeviceClass().size(); i++)
+                {
+                std::cout << "                          <class>" << parse.getDeviceClass()[i] << "</class>" << std::endl;
+                }
+                std::cout << "                  </deviceclass>" << std::endl;
+
+
                 std::cout << "</devicepkg>" << std::endl;
         }
@@ -73 +88 @@
 
                 PropertyFile parse(propFile);
-
-                std::cout << "******************" << std::endl;
-                std::cout << "PropertyFile: " << std::endl;
-                std::cout << "Type: " << parse.getTypePropFile() << std::endl;
-                std::cout << "Localfile: " << parse.getLocalFilePropFile() << std::endl;
-                std::cout << "******************" << std::endl;
         }
         else
@@ -101 +110 @@
 
                 HWDeviceRegistration parse(devReg);
-
-                std::cout << std::endl << std::endl;
-
-                std::cout << "<hwdeviceregistration id=" << parse.getIDHWDevReg() << " version=" << parse.getVersionHWDevReg();
-                        std::cout << " name=" << parse.getNameHWDevReg() << ">" << std::endl;
-                std::cout << "  <propertyfile type=" << parse.getTypePropFile() << ">" << std::endl;
-                std::cout << "          <localfile name=" << parse.getLocalFilePropFile() << ">" << std::endl;
-                std::cout << "  </propertyfile>" << std::endl;
-                std::cout << "  <description>" << parse.getDescription() << "</description" << std::endl;
-                std::cout << "  <manufacturer>" << parse.getManufacturer() << "</manufacturer>" << std::endl;
-                std::cout << "  <modelnumber>" << parse.getModelNumber() << "</modelnumber>" << std::endl;
-                std::cout << "  <deviceclass>" << std::endl;
-
-                for (int i = 0; i < parse.getDeviceClass().size(); i++)
-                {
-                        std::cout << "          <class>" << parse.getDeviceClass()[i] << "</class>" << std::endl;
-                }
-                std::cout << "  </deviceclass>" << std::endl;
-
-                std::cout << "  <childhwdevice>" << std::endl;
-                std::cout << "          <hwdeviceregistration id=" << parse.getChildHWDevice()[0]->getIDHWDevReg();
-                        std::cout << " version=" << parse.getChildHWDevice()[0]->getVersionHWDevReg();
-                        std::cout << " name=" << parse.getChildHWDevice()[0]->getNameHWDevReg() << " >" << std::endl;
-                std::cout << "                  <propertyfile " << parse.getChildHWDevice()[0]->getTypePropFile() << "> " << std::endl;
-                std::cout << "                          <localfile name=" << parse.getChildHWDevice()[0]->getLocalFilePropFile() << "/> " << std::endl;
-                std::cout << "                  </propertyfile>" << std::endl;
-                std::cout << "                  <description>" << parse.getChildHWDevice()[0]->getDescription() << "</description>" << std::endl;
-                std::cout << "                  <manufacturer>" << parse.getChildHWDevice()[0]->getManufacturer() << "</manufacturer>" << std::endl;
-                std::cout << "                  <modelnumber>" << parse.getChildHWDevice()[0]->getModelNumber() << "</modelnumber>" << std::endl;
-                std::cout << "                  <deviceclass>" << std::endl;
-                std::cout << "                          <class>" << parse.getChildHWDevice()[0]->getDeviceClass()[0] << "</class>" << std::endl;
-                std::cout << "                  </deviceclass>" << std::endl;
-                std::cout << "                  <childhwdevice>" << std::endl;
-                std::cout << "                          <hwdeviceregistration id=";
-                        std::cout << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getIDHWDevReg(); 
-                        std::cout << " version=" << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getVersionHWDevReg();
-                        std::cout << " name=" << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getNameHWDevReg() << ">" << std::endl;
-                std::cout << "                                  <propertyfile type=";
-                        std::cout << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getTypePropFile() << ">" << std::endl;
-                std::cout << "                                          <localfile name=";
-                        std::cout << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getLocalFilePropFile() << "/>" << std::endl;
-                        std::cout << "                                  </propertyfile>" << std::endl;
-                std::cout << "                                  <description>";
-                        std::cout << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getDescription();
-                        std::cout << "</description>" << std::endl;
-                std::cout << "                                  <manufacturer>";
-                        std::cout << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getManufacturer();
-                        std::cout << "</manufacturer>" << std::endl;
-                std::cout << "                                  <modelnumber>";
-                        std::cout << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getModelNumber();
-                        std::cout << "</modelnumber>" << std::endl;
-                std::cout << "                                  <deviceclass>" << std::endl;
-                        std::cout << "                                          <class>";
-                        std::cout << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getDeviceClass()[0];
-                        std::cout << "</class>" << std::endl;
-                        std::cout << "                                  </deviceclass>" << std::endl;
-                std::cout << "                          </hwdeviceregistration>" << std::endl;
-                std::cout << "                          <devicepkgref name=" << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getTypeDevPkgRef();
-                        std::cout << std::endl;
-                std::cout << "                                  <localfile name=";
-                        std::cout << parse.getChildHWDevice()[0]->getChildHWDevice()[0]->getLocalFileDevPkgRef() << "/>" << std::endl;
-                        std::cout << "                          </devicepkgref>" << std::endl;
-                std::cout << "                  </childhwdevice>" << std::endl;
-                std::cout << "          </hwdeviceregistration>" << std::endl;
-                std::cout << "          <devicepkgref>" << std::endl;
-                std::cout << "                  <localfile name=" << parse.getChildHWDevice()[0]->getLocalFileDevPkgRef() << "/>" << std::endl;
-                std::cout << "          </devicepkgref>" << std::endl;
-                std::cout << "  </childhwdevice>" << std::endl;
-
-
-                std::cout << "  <childhwdevice>" << std::endl;
-                std::cout << "          <hwdeviceregistration id=" << parse.getChildHWDevice()[1]->getIDHWDevReg();
-                        std::cout << " version=" << parse.getChildHWDevice()[1]->getVersionHWDevReg();
-                        std::cout << " name=" << parse.getChildHWDevice()[1]->getNameHWDevReg() << ">" << std::endl;
-                std::cout << "                  <propertyfile type=" << parse.getChildHWDevice()[1]->getTypePropFile() << ">" << std::endl;
-                std::cout << "                          <localfile name=" << parse.getChildHWDevice()[1]->getLocalFilePropFile() << "/>" << std::endl;
-                std::cout << "                  </propertyfile>" << std::endl;
-                std::cout << "                  <description>" << parse.getChildHWDevice()[1]->getDescription() << "</description>" << std::endl;
-                std::cout << "                  <manufacturer>" << parse.getChildHWDevice()[1]->getManufacturer() << "</manufacturer>" << std::endl;
-                std::cout << "                  <modelnumber>" << parse.getChildHWDevice()[1]->getModelNumber() << "</modelnumber>" << std::endl;
-                std::cout << "                  <deviceclass>" << std::endl;
-                std::cout << "                          <class>" << parse.getChildHWDevice()[1]->getDeviceClass()[0] << "</class>" << std::endl;
-                std::cout << "                          <class>" << parse.getChildHWDevice()[1]->getDeviceClass()[1] << "</class>" << std::endl;
-                std::cout << "                  </deviceclass>" << std::endl;
-                std::cout << "          </hwdeviceregistration>" << std::endl;
-                std::cout << "          <devicepkgref type=" << parse.getChildHWDevice()[1]->getTypeDevPkgRef() << ">" << std::endl;
-                std::cout << "                  <localfile name=" << parse.getChildHWDevice()[1]->getLocalFileDevPkgRef() << "/>" << std::endl;
-                std::cout << "          </devicepkgref>" << std::endl;
-
-
-
-                std::cout << "</hwdeviceregistration>" << std::endl;
-
 
                 std::cout << std::endl << std::endl;