diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 9bf805845..b24d6e325 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -244,7 +244,7 @@ void OMW::Engine::loadBSA() if (boost::filesystem::extension (iter->path())==".bsa") { std::cout << "Adding " << iter->path().string() << std::endl; - addBSA(iter->path().file_string()); + addBSA(iter->path().string()); } } } @@ -254,7 +254,7 @@ void OMW::Engine::loadBSA() void OMW::Engine::addResourcesDirectory (const boost::filesystem::path& path) { - mOgre.getRoot()->addResourceLocation (path.file_string(), "FileSystem", + mOgre.getRoot()->addResourceLocation (path.string(), "FileSystem", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, true); } diff --git a/apps/openmw/mwsound/soundmanager.cpp b/apps/openmw/mwsound/soundmanager.cpp index ae01bc6c7..564ebe941 100644 --- a/apps/openmw/mwsound/soundmanager.cpp +++ b/apps/openmw/mwsound/soundmanager.cpp @@ -312,7 +312,7 @@ namespace MWSound { MP3Lookup(dataDir / "Music/Explore/"); if(useSound) - mData = new SoundImpl(root, camera, store, (dataDir / "Sound").file_string()); + mData = new SoundImpl(root, camera, store, (dataDir / "Sound").string()); } SoundManager::~SoundManager() @@ -349,7 +349,7 @@ namespace MWSound { fileIter++; } - std::string music = fileIter->file_string(); + std::string music = fileIter->string(); try { std::cout << "Playing " << music << "\n"; diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index 10117d853..c08dc420b 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -419,7 +419,7 @@ namespace MWWorld std::cout << "Loading ESM " << masterPath.string() << "\n"; // This parses the ESM file and loads a sample cell - mEsm.open (masterPath.file_string()); + mEsm.open (masterPath.string()); mStore.load (mEsm); mPlayer = new MWWorld::Player (mScene.getPlayer(), mStore.npcs.find ("player"), *this); diff --git a/components/file_finder/file_finder.hpp b/components/file_finder/file_finder.hpp index 107121278..cfa07dce9 100644 --- a/components/file_finder/file_finder.hpp +++ b/components/file_finder/file_finder.hpp @@ -20,7 +20,7 @@ class FileFinderT void add(const boost::filesystem::path &pth) { - std::string file = pth.file_string(); + std::string file = pth.string(); std::string key = file.substr(cut); owner->table[key] = file; } @@ -35,7 +35,7 @@ public: // Remember the original path length, so we can cut it away from // the relative paths used as keys - std::string pstring = path.file_string(); + std::string pstring = path.string(); inserter.cut = pstring.size(); // If the path does not end in a slash, then boost will add one