Changeset 673 for code/branches/FICN/src/loader

Timestamp:

Dec 22, 2007, 10:15:06 PM (17 years ago)

Author:

rgrieder

Message:

• deleted obsolete classes: BaseEntity, Entity, Light and SceneNode (please complain if not agreed)
• improved include guard naming consistency

Location:

code/branches/FICN/src/loader

Files:

• LevelLoader.h (modified) (5 diffs)
• loader_platform.h (modified) (2 diffs)

code/branches/FICN/src/loader/LevelLoader.h

@@ -5 +5 @@
 * @author Nicolas Perrenoud <nicolape@ee.ethz.ch>
 */
+
+#ifndef _LevelLoader_H__
+#define _LevelLoader_H__
 
 #include <string>
@@ -15 +18 @@
 //#include "xml/xmlParser.h"
 
-#ifndef __MODULE_LEVELLOADER__
-#define __MODULE_LEVELLOADER__
-
-using namespace std;
 
 namespace loader
@@ -26 +25 @@
   public:
     // Constructors, loads the level file and some information data
-    LevelLoader(string file, string dir="levels");
+    LevelLoader(std::string file, std::string dir="levels");
     // Destructor
     ~LevelLoader();
@@ -33 +32 @@
 
     // Getters
-    inline string name() {return name_; };
-    inline string description() {return description_; };
-    inline string image() {return image_; };
+    inline std::string name() {return name_; };
+    inline std::string description() {return description_; };
+    inline std::string image() {return image_; };
   private:
     //! Level information
@@ -56 +55 @@
     TiXmlElement* rootElement;
 
-
   };
 }
-#endif
+
+#endif /* _LevelLoader_H__ */

code/branches/FICN/src/loader/loader_platform.h

@@ -27 +27 @@
 
 
-#ifndef LOADER_PLATFORM_H
-#define LOADER_PLATFORM_H
+#ifndef _LoaderPlatform_H__
+#define _LoaderPlatform_H__
 
 
@@ -44 +44 @@
 
 
-#endif /* LOADER_PLATFORM_H */
+#endif /* _LoaderPlatform_H__ */