Changeset 9313 for code/branches/presentation2012merge/src/modules/pickup/Pickup.cc

Timestamp:

Jul 8, 2012, 5:33:03 PM (13 years ago)

Author:

landauf

Message:

found some more functions to rename

File:

• code/branches/presentation2012merge/src/modules/pickup/Pickup.cc (modified) (6 diffs)

code/branches/presentation2012merge/src/modules/pickup/Pickup.cc

@@ -102 +102 @@
         SUPER(Pickup, XMLPort, xmlelement, mode);
 
-        XMLPortParam(Pickup, "activationType", setActivationType, getActivationType, xmlelement, mode);
-        XMLPortParam(Pickup, "durationType", setDurationType, getDurationType, xmlelement, mode);
+        XMLPortParam(Pickup, "activationType", setActivationTypeAsString, getActivationTypeAsString, xmlelement, mode);
+        XMLPortParam(Pickup, "durationType", setDurationTypeAsString, getDurationTypeAsString, xmlelement, mode);
 
         this->initializeIdentifier();
@@ -114 +114 @@
         Returns a string containing the activation type.
     */
-    const std::string& Pickup::getActivationType(void) const
-    {
-        switch(this->activationType_)
+    const std::string& Pickup::getActivationTypeAsString(void) const
+    {
+        switch(this->getActivationType())
         {
             case pickupActivationType::immediate:
@@ -133 +133 @@
         Returns a string containing the duration type.
     */
-    const std::string& Pickup::getDurationType(void) const
-    {
-        switch(this->durationType_)
+    const std::string& Pickup::getDurationTypeAsString(void) const
+    {
+        switch(this->getDurationType())
         {
             case pickupDurationType::once:
@@ -152 +152 @@
         The activation type of the Pickup as a string.
     */
-    void Pickup::setActivationType(const std::string& type)
+    void Pickup::setActivationTypeAsString(const std::string& type)
     {
         if(type == Pickup::activationTypeImmediate_s)
-            this->activationType_ = pickupActivationType::immediate;
+            this->setActivationType(pickupActivationType::immediate);
         else if(type == Pickup::activationTypeOnUse_s)
-            this->activationType_ = pickupActivationType::onUse;
+            this->setActivationType(pickupActivationType::onUse);
         else
             orxout(internal_error, context::pickups) << "Invalid activationType '" << type << "' in " << this->getIdentifier()->getName() << "." << endl;
@@ -168 +168 @@
         The duration type of the Pickup as a string.
     */
-    void Pickup::setDurationType(const std::string& type)
+    void Pickup::setDurationTypeAsString(const std::string& type)
     {
         if(type == Pickup::durationTypeOnce_s)
-            this->durationType_ = pickupDurationType::once;
+            this->setDurationType(pickupDurationType::once);
         else if(type == Pickup::durationTypeContinuous_s)
-            this->durationType_ = pickupDurationType::continuous;
+            this->setDurationType(pickupDurationType::continuous);
         else
             orxout(internal_error, context::pickups) << "Invalid durationType '" << type << "' in " << this->getIdentifier()->getName() << "." << endl;
@@ -206 +206 @@
 
         Pickup* pickup = orxonox_cast<Pickup*>(item);
-        pickup->setActivationTypeDirect(this->getActivationTypeDirect());
-        pickup->setDurationTypeDirect(this->getDurationTypeDirect());
+        pickup->setActivationType(this->getActivationType());
+        pickup->setDurationType(this->getDurationType());
 
         pickup->initializeIdentifier();