corrections to namespaces

svn-id: r13362

10 files changed, 16 insertions, 8 deletions

diff --git a/saga/binread.cpp b/saga/binread.cpp
index 906ce3d2e0..71d0ed83ba 100644
--- a/saga/binread.cpp
+++ b/saga/binread.cpp
@@ -148,4 +148,4 @@ int32 BinReader::readSint32BE() {
 	return u32_be;
 }
 
-}
+} // End of namespace Saga
diff --git a/saga/binread.h b/saga/binread.h
index abc1a294bc..7a4567df9b 100644
--- a/saga/binread.h
+++ b/saga/binread.h
@@ -25,6 +25,8 @@
 #include <stddef.h>
 #include "common/scummsys.h"
 
+namespace Saga {
+
 class BinReader {
 
 protected:
@@ -60,6 +62,7 @@ public:
 	int32        readSint32BE();
 };
 
+} // End of namespace Saga
 
 #endif
 
diff --git a/saga/gamedesc.cpp b/saga/gamedesc.cpp
index 2a02779921..7464ad6d2f 100644
--- a/saga/gamedesc.cpp
+++ b/saga/gamedesc.cpp
@@ -446,4 +446,4 @@ bool verifyIHNMCD() {
 	return true;
 }
 
-}
+} // End of namespace Saga
diff --git a/saga/gamedesc.h b/saga/gamedesc.h
index 4cc6952afc..8a7cfbf3d3 100644
--- a/saga/gamedesc.h
+++ b/saga/gamedesc.h
@@ -118,7 +118,7 @@ typedef struct R_GAME_RESOURCEINFO_tag {
 	int detectGame();
 	bool openGame();
 
-} // end namespace 
+} // End of namespace Saga
 
 #endif
 
diff --git a/saga/gamedesc_priv.h b/saga/gamedesc_priv.h
index eebf3ba942..b017ba7a90 100644
--- a/saga/gamedesc_priv.h
+++ b/saga/gamedesc_priv.h
@@ -111,7 +111,7 @@ bool verifyITECD();
 bool verifyIHNMDEMO();
 bool verifyIHNMCD();
 
-}
+} // End of namespace Saga
 
 #endif // SAGA_GAMEDESC_PRIV_H
 
diff --git a/saga/resfile.cpp b/saga/resfile.cpp
index e8d4d5687b..5b3a345644 100644
--- a/saga/resfile.cpp
+++ b/saga/resfile.cpp
@@ -159,4 +159,4 @@ void ResourceFile::freeResource(byte *res) {
 	delete[] res;
 }
 
-}
+} // End of namespace Saga
diff --git a/saga/resfile.h b/saga/resfile.h
index a636aa549a..40ad8f7898 100644
--- a/saga/resfile.h
+++ b/saga/resfile.h
@@ -33,6 +33,8 @@
  
 #include "common/file.h"
 
+namespace Saga {
+
 class ResourceFile : public File {
 
 public:
@@ -94,6 +96,7 @@ public:
 
 };
 
+} // End of namespace Saga
 
 
 #endif
diff --git a/saga/resnames.h b/saga/resnames.h
index 820b0e6759..596e1cefaf 100644
--- a/saga/resnames.h
+++ b/saga/resnames.h
@@ -22,6 +22,8 @@
 #ifndef SAGA_RESNAMES_H
 #define SAGA_RESNAMES_H
 
+namespace Saga {
+
 /* Lookup tables
 \*-----------------------------------------------------------------*/
 #define ITE_SCENE_LUT  1806
@@ -120,6 +122,7 @@
 #define MUSIC_25 33
 #define MUSIC_26 34
 
+} // End of namespace Saga
 
 #endif
 
diff --git a/saga/saga.cpp b/saga/saga.cpp
index 5fe672cfda..9d3e11296b 100644
--- a/saga/saga.cpp
+++ b/saga/saga.cpp
@@ -33,7 +33,6 @@
 
 #include "gamedesc.h"
 
-
 struct SAGAGameSettings {
 	const char *name;
 	const char *description;
@@ -132,4 +131,4 @@ void SagaEngine::shutdown() {
 	_system->quit();
 }
 
-}
+} // End of namespace Saga
diff --git a/saga/saga.h b/saga/saga.h
index ffb72b5a24..edaa24c979 100644
--- a/saga/saga.h
+++ b/saga/saga.h
@@ -54,6 +54,6 @@ public:
 
 };
 
-}
+} // End of namespace Saga
 
 #endif