From afc2e840aeff2dc43a4020a2c333a22c4ef6d6fd Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 26 Dec 2012 17:06:33 +0100
Subject: [PATCH] renamed namespace TranslationData to Translation

---
 apps/openmw/engine.hpp                 |  2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp |  3 ++-
 apps/openmw/mwgui/windowmanagerimp.hpp | 10 +++++++---
 components/translation/translation.cpp |  2 +-
 components/translation/translation.hpp |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index cbc627b83..00889197e 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -82,7 +82,7 @@ namespace OMW
 
             Files::Collections mFileCollections;
             bool mFSStrict;
-            TranslationData::Storage mTranslationDataStorage;
+            Translation::Storage mTranslationDataStorage;
 
             // not implemented
             Engine (const Engine&);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index cdcb615dc..caf6a4ab0 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -9,6 +9,7 @@
 #include <openengine/gui/manager.hpp>
 
 #include <components/settings/settings.hpp>
+#include <components/translation/translation.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -56,7 +57,7 @@ using namespace MWGui;
 WindowManager::WindowManager(
     const Compiler::Extensions& extensions, int fpsLevel, bool newGame, OEngine::Render::OgreRenderer *mOgre,
         const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts,
-        TranslationData::Storage& translationDataStorage)
+        Translation::Storage& translationDataStorage)
   : mGuiManager(NULL)
   , mHud(NULL)
   , mMap(NULL)
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index b252254a0..aaa856aef 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -14,7 +14,6 @@
 #include <string>
 
 #include <components/esm/loadclas.hpp>
-#include <components/translation/translation.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 
@@ -30,6 +29,11 @@ namespace Compiler
     class Extensions;
 }
 
+namespace Translation
+{
+    class Storage;
+}
+
 namespace OEngine
 {
     namespace GUI
@@ -78,7 +82,7 @@ namespace MWGui
     WindowManager(const Compiler::Extensions& extensions, int fpsLevel, bool newGame,
                   OEngine::Render::OgreRenderer *mOgre, const std::string& logpath,
                   const std::string& cacheDir, bool consoleOnlyScripts,
-                  TranslationData::Storage& translationDataStorage);
+                  Translation::Storage& translationDataStorage);
     virtual ~WindowManager();
 
     /**
@@ -252,7 +256,7 @@ namespace MWGui
     SpellCreationDialog* mSpellCreationDialog;
     EnchantingDialog* mEnchantingDialog;
     TrainingWindow* mTrainingWindow;
-    TranslationData::Storage& mTranslationDataStorage;
+    Translation::Storage& mTranslationDataStorage;
 
     CharacterCreation* mCharGen;
 
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index e6c6a0233..feda76f6f 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -3,7 +3,7 @@
 
 #include <fstream>
 
-namespace TranslationData
+namespace Translation
 {
     void Storage::loadTranslationData(const Files::Collections& dataFileCollections,
                                       const std::string& esmFileName)
diff --git a/components/translation/translation.hpp b/components/translation/translation.hpp
index 0160bc48a..668d4c067 100644
--- a/components/translation/translation.hpp
+++ b/components/translation/translation.hpp
@@ -4,7 +4,7 @@
 #include <components/to_utf8/to_utf8.hpp>
 #include <components/files/collections.hpp>
 
-namespace TranslationData
+namespace Translation
 {
     class Storage
     {