Changeset 6518 for code/branches/pickup3/src/modules/pickup/items/MetaPickup.h

Timestamp:

Mar 12, 2010, 8:56:04 AM (15 years ago)

Author:

dafrick

Message:

Renamed TestPickup to MetaPickup.

File:

• code/branches/pickup3/src/modules/pickup/items/MetaPickup.h (moved) (moved from code/branches/pickup3/src/modules/pickup/items/TestPickup.h) (4 diffs)

code/branches/pickup3/src/modules/pickup/items/MetaPickup.h

@@ -27 +27 @@
 */
 
-#ifndef _TestPickup_H__
-#define _TestPickup_H__
+#ifndef _MetaPickup_H__
+#define _MetaPickup_H__
 
 #include "pickup/PickupPrereqs.h"
@@ -36 +36 @@
 namespace orxonox {
 
-    namespace pickupTestType
+    namespace pickupMetaType
     {
         enum Value
@@ -46 +46 @@
     }
     
-    class _PickupExport TestPickup : public Pickup
+    class _PickupExport MetaPickup : public Pickup
     {
         friend class PickupCarrier;
         
         public:
-            TestPickup(BaseObject* creator);
-            virtual ~TestPickup();
+            MetaPickup(BaseObject* creator);
+            virtual ~MetaPickup();
             
             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
@@ -59 +59 @@
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
             
-            inline pickupTestType::Value getTestTypeDirect(void)
-                { return this->testType_; }
-            const std::string& getTestType(void);
+            inline pickupMetaType::Value getMetaTypeDirect(void)
+                { return this->metaType_; }
+            const std::string& getMetaType(void);
             
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
             
-            inline void setTestTypeDirect(pickupTestType::Value type)
-                { this->testType_ =  type; }
-            void setTestType(const std::string& type);
+            inline void setMetaTypeDirect(pickupMetaType::Value type)
+                { this->metaType_ =  type; }
+            void setMetaType(const std::string& type);
             
         private:
             void initialize(void); //!< Initializes the member variables.
             
-            pickupTestType::Value testType_;
-            static const std::string testTypeNone_s;
-            static const std::string testTypeUse_s;
-            static const std::string testTypeDrop_s;
+            pickupMetaType::Value metaType_;
+            static const std::string metaTypeNone_s;
+            static const std::string metaTypeUse_s;
+            static const std::string metaTypeDrop_s;