krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

renamed namespace TranslationData to Translation

Browse source
This commit is contained in:
Marc Zinnschlag 2012-12-26 17:06:33 +01:00
parent 206c613b52
commit afc2e840ae
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/engine.hpp
View file

@ -82,7 +82,7 @@ namespace OMW
Files::Collections mFileCollections;
bool mFSStrict;
TranslationData::Storage mTranslationDataStorage;
Translation::Storage mTranslationDataStorage;
// not implemented
Engine (const Engine&);

3
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -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)

10
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -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;

2
components/translation/translation.cpp
View file

@ -3,7 +3,7 @@
#include <fstream>
namespace TranslationData
namespace Translation
{
void Storage::loadTranslationData(const Files::Collections& dataFileCollections,
const std::string& esmFileName)

2
components/translation/translation.hpp
View file

@ -4,7 +4,7 @@
#include <components/to_utf8/to_utf8.hpp>
#include <components/files/collections.hpp>
namespace TranslationData
namespace Translation
{
class Storage
{