[DEL] Removed PokeGen namespace

[ADD] general/AudioCache.h completed
[DEL] VERSION removed from subdir .pro files
[DEL] audio/

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@33 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 34 insertions, 37 deletions

diff --git a/pokemod/Object.h b/pokemod/Object.h
index 4f579419..9ac559ad 100644
--- a/pokemod/Object.h
+++ b/pokemod/Object.h
@@ -26,45 +26,42 @@
 #include <QFile>
 #include "../general/Ini.h"
 
-namespace PokeGen
+namespace PokeMod
 {
-    namespace PokeMod
+    class Pokemod;
+    
+    class Object
     {
-        class Pokemod;
-        
-        class Object
-        {
-            public:
-                Object(const Pokemod& par, const unsigned _id) :
-                        id(_id),
-                        pokemod(par)
-                {
-                }
-                virtual ~Object();
-                virtual void load(const QString& fname, const unsigned _id) throw(Exception);
-                
-                unsigned getId() const
-                {
-                    return id;
-                }
-                bool isValid() const
-                {
-                    if (isGood())
-                        return validate();
-                    return false;
-                }
-                bool isGood() const
-                {
-                    return (id != UINT_MAX);
-                }
-            protected:
-                virtual bool validate() const;
-                
-                unsigned id;
-                
-                const Pokemod& pokemod;
-        };
-    }
+        public:
+            Object(const Pokemod& par, const unsigned _id) :
+                    id(_id),
+                    pokemod(par)
+            {
+            }
+            virtual ~Object();
+            virtual void load(const QString& fname, const unsigned _id) throw(Exception);
+            
+            unsigned getId() const
+            {
+                return id;
+            }
+            bool isValid() const
+            {
+                if (isGood())
+                    return validate();
+                return false;
+            }
+            bool isGood() const
+            {
+                return (id != UINT_MAX);
+            }
+        protected:
+            virtual bool validate() const;
+            
+            unsigned id;
+            
+            const Pokemod& pokemod;
+    };
 }
 
 #endif