forked from teamnwah/openmw-tes3coop
renamed namespace TranslationData to Translation
This commit is contained in:
parent
206c613b52
commit
afc2e840ae
5 changed files with 12 additions and 7 deletions
|
@ -82,7 +82,7 @@ namespace OMW
|
||||||
|
|
||||||
Files::Collections mFileCollections;
|
Files::Collections mFileCollections;
|
||||||
bool mFSStrict;
|
bool mFSStrict;
|
||||||
TranslationData::Storage mTranslationDataStorage;
|
Translation::Storage mTranslationDataStorage;
|
||||||
|
|
||||||
// not implemented
|
// not implemented
|
||||||
Engine (const Engine&);
|
Engine (const Engine&);
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include <openengine/gui/manager.hpp>
|
#include <openengine/gui/manager.hpp>
|
||||||
|
|
||||||
#include <components/settings/settings.hpp>
|
#include <components/settings/settings.hpp>
|
||||||
|
#include <components/translation/translation.hpp>
|
||||||
|
|
||||||
#include "../mwbase/environment.hpp"
|
#include "../mwbase/environment.hpp"
|
||||||
#include "../mwbase/mechanicsmanager.hpp"
|
#include "../mwbase/mechanicsmanager.hpp"
|
||||||
|
@ -56,7 +57,7 @@ using namespace MWGui;
|
||||||
WindowManager::WindowManager(
|
WindowManager::WindowManager(
|
||||||
const Compiler::Extensions& extensions, int fpsLevel, bool newGame, OEngine::Render::OgreRenderer *mOgre,
|
const Compiler::Extensions& extensions, int fpsLevel, bool newGame, OEngine::Render::OgreRenderer *mOgre,
|
||||||
const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts,
|
const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts,
|
||||||
TranslationData::Storage& translationDataStorage)
|
Translation::Storage& translationDataStorage)
|
||||||
: mGuiManager(NULL)
|
: mGuiManager(NULL)
|
||||||
, mHud(NULL)
|
, mHud(NULL)
|
||||||
, mMap(NULL)
|
, mMap(NULL)
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include <components/esm/loadclas.hpp>
|
#include <components/esm/loadclas.hpp>
|
||||||
#include <components/translation/translation.hpp>
|
|
||||||
|
|
||||||
#include "../mwbase/windowmanager.hpp"
|
#include "../mwbase/windowmanager.hpp"
|
||||||
|
|
||||||
|
@ -30,6 +29,11 @@ namespace Compiler
|
||||||
class Extensions;
|
class Extensions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace Translation
|
||||||
|
{
|
||||||
|
class Storage;
|
||||||
|
}
|
||||||
|
|
||||||
namespace OEngine
|
namespace OEngine
|
||||||
{
|
{
|
||||||
namespace GUI
|
namespace GUI
|
||||||
|
@ -78,7 +82,7 @@ namespace MWGui
|
||||||
WindowManager(const Compiler::Extensions& extensions, int fpsLevel, bool newGame,
|
WindowManager(const Compiler::Extensions& extensions, int fpsLevel, bool newGame,
|
||||||
OEngine::Render::OgreRenderer *mOgre, const std::string& logpath,
|
OEngine::Render::OgreRenderer *mOgre, const std::string& logpath,
|
||||||
const std::string& cacheDir, bool consoleOnlyScripts,
|
const std::string& cacheDir, bool consoleOnlyScripts,
|
||||||
TranslationData::Storage& translationDataStorage);
|
Translation::Storage& translationDataStorage);
|
||||||
virtual ~WindowManager();
|
virtual ~WindowManager();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -252,7 +256,7 @@ namespace MWGui
|
||||||
SpellCreationDialog* mSpellCreationDialog;
|
SpellCreationDialog* mSpellCreationDialog;
|
||||||
EnchantingDialog* mEnchantingDialog;
|
EnchantingDialog* mEnchantingDialog;
|
||||||
TrainingWindow* mTrainingWindow;
|
TrainingWindow* mTrainingWindow;
|
||||||
TranslationData::Storage& mTranslationDataStorage;
|
Translation::Storage& mTranslationDataStorage;
|
||||||
|
|
||||||
CharacterCreation* mCharGen;
|
CharacterCreation* mCharGen;
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
namespace TranslationData
|
namespace Translation
|
||||||
{
|
{
|
||||||
void Storage::loadTranslationData(const Files::Collections& dataFileCollections,
|
void Storage::loadTranslationData(const Files::Collections& dataFileCollections,
|
||||||
const std::string& esmFileName)
|
const std::string& esmFileName)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <components/to_utf8/to_utf8.hpp>
|
#include <components/to_utf8/to_utf8.hpp>
|
||||||
#include <components/files/collections.hpp>
|
#include <components/files/collections.hpp>
|
||||||
|
|
||||||
namespace TranslationData
|
namespace Translation
|
||||||
{
|
{
|
||||||
class Storage
|
class Storage
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue