Changeset 2533 for code/branches/bugger/src/orxonox/objects/quest/QuestItem.h

Timestamp:

Dec 23, 2008, 11:34:35 PM (17 years ago)

Author:

rgrieder

Message:

Merged revisions 2384-2436 from presentation branch to bugger.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.h (modified) (3 diffs, 1 prop)

code/branches/bugger/src/orxonox/objects/quest/QuestItem.h

@@ -28 +28 @@
  
 /**
-    @file QuestItem.h
-    @brief
-    Definition of the QuestItem class.
-    
-    The QuestItem is the parent class of Quest and QuestHint.
+    @file
+    @brief Definition of the QuestItem class.
+        The QuestItem is the parent class of Quest and QuestHint.
 */
 
@@ -46 +44 @@
 #include "core/XMLPort.h"
 
-namespace orxonox {
-
-
+namespace orxonox
+{
     /**
     @brief
@@ -67 +64 @@
             /**
             @brief Returns the id of this QuestItem.
-        @return Returns the id of the QuestItem.
+            @return Returns the id of the QuestItem.
             */
             inline const std::string & getId(void) const
                 { return this->id_; }
-        /**
-        @brief Returns the QuestDescription of the QuestItem.
-        @return Returns a pointer to the QuestDescription object of the QuestItem.
-        */
+            
+            /**
+            @brief Returns the QuestDescription of the QuestItem.
+            @return Returns a pointer to the QuestDescription object of the QuestItem.
+            */
             inline const QuestDescription* getDescription(void) const
                 { return this->description_; }