diff --git a/src/Main/fg_scene_commands.cxx b/src/Main/fg_scene_commands.cxx index beb907584..4f942a245 100644 --- a/src/Main/fg_scene_commands.cxx +++ b/src/Main/fg_scene_commands.cxx @@ -247,8 +247,8 @@ do_materials_reload (const SGPropertyNode * arg, SGPropertyNode * root) SGMaterialLib* new_matlib = new SGMaterialLib; SGPath mpath( globals->get_fg_root() ); mpath.append( fgGetString("/sim/rendering/materials-file") ); - bool loaded = new_matlib->load(globals->get_fg_root().local8BitStr(), - mpath.local8BitStr(), + bool loaded = new_matlib->load(globals->get_fg_root(), + mpath, globals->get_props()); if ( ! loaded ) { diff --git a/src/Main/main.cxx b/src/Main/main.cxx index c856b4c33..ec7842878 100644 --- a/src/Main/main.cxx +++ b/src/Main/main.cxx @@ -359,7 +359,7 @@ static void fgIdleFunction ( void ) { flightgear::initPosition(); flightgear::initTowerLocationListener(); - simgear::SGModelLib::init(globals->get_fg_root().local8BitStr(), globals->get_props()); + simgear::SGModelLib::init(globals->get_fg_root().utf8Str(), globals->get_props()); auto timeManager = globals->get_subsystem(); timeManager->init(); diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx index 5f2d59717..bff3d8d0d 100644 --- a/src/Model/acmodel.cxx +++ b/src/Model/acmodel.cxx @@ -33,7 +33,7 @@ static osg::Node * fgLoad3DModelPanel(const SGPath &path, SGPropertyNode *prop_root) { bool loadPanels = true; - osg::Node* node = simgear::SGModelLib::loadModel(path.local8BitStr(), prop_root, NULL, loadPanels); + osg::Node* node = simgear::SGModelLib::loadModel(path.utf8Str(), prop_root, NULL, loadPanels); if (node) node->setNodeMask(~SG_NODEMASK_TERRAIN_BIT); return node; diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx index e6049a613..a29a6aa4b 100644 --- a/src/Scenery/tilemgr.cxx +++ b/src/Scenery/tilemgr.cxx @@ -168,9 +168,8 @@ void FGTileMgr::reinit() osgDB::FilePathList &fp = _options->getDatabasePathList(); const PathList &sc = globals->get_fg_scenery(); fp.clear(); - PathList::const_iterator it; - for (it = sc.begin(); it != sc.end(); ++it) { - fp.push_back(it->local8BitStr()); + for (auto it = sc.begin(); it != sc.end(); ++it) { + fp.push_back(it->utf8Str()); } _options->setPluginStringData("SimGear::FG_ROOT", globals->get_fg_root().utf8Str()); diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx index 5a407c190..836987835 100644 --- a/src/Scripting/NasalSys.cxx +++ b/src/Scripting/NasalSys.cxx @@ -774,7 +774,7 @@ static naRef f_open(naContext c, naRef me, int argc, naRef* args) std::wstring wmodestr = simgear::strutils::convertUtf8ToWString(modestr); f = _wfopen(fp.c_str(), wmodestr.c_str()); #else - std::string fp = filename.local8BitStr(); + std::string fp = filename.utf8Str(); f = fopen(fp.c_str(), modestr); #endif if(!f) naRuntimeError(c, strerror(errno)); diff --git a/src/Sound/VoiceSynthesizer.cxx b/src/Sound/VoiceSynthesizer.cxx index ef51c3b5b..c67068eee 100644 --- a/src/Sound/VoiceSynthesizer.cxx +++ b/src/Sound/VoiceSynthesizer.cxx @@ -76,7 +76,7 @@ string FLITEVoiceSynthesizer::getVoicePath( voice_t voice ) { if( voice < 0 || voice >= VOICE_UNKNOWN ) return string(""); SGPath voicePath = globals->get_fg_root() / "ATC" / VOICE_FILES[voice]; - return voicePath.local8BitStr(); + return voicePath.utf8Str(); } string FLITEVoiceSynthesizer::getVoicePath( const string & voice ) diff --git a/src/Sound/flitevoice.cxx b/src/Sound/flitevoice.cxx index 9cf0e4687..235f03e26 100644 --- a/src/Sound/flitevoice.cxx +++ b/src/Sound/flitevoice.cxx @@ -41,7 +41,7 @@ FGFLITEVoice::FGFLITEVoice(FGVoiceMgr * mgr, const SGPropertyNode_ptr node, cons SGPath voice = globals->get_fg_root() / "ATC" / node->getStringValue("htsvoice", "cmu_us_arctic_slt.htsvoice"); - _synthesizer = new FLITEVoiceSynthesizer(voice.local8BitStr()); + _synthesizer = new FLITEVoiceSynthesizer(voice.utf8Str()); SGSoundMgr *smgr = globals->get_subsystem(); _sgr = smgr->find(sampleGroupRefName, true); diff --git a/src/Viewer/CameraGroup_compositor.cxx b/src/Viewer/CameraGroup_compositor.cxx index 5631e8950..98c190b39 100644 --- a/src/Viewer/CameraGroup_compositor.cxx +++ b/src/Viewer/CameraGroup_compositor.cxx @@ -690,7 +690,7 @@ void CameraGroup::buildCamera(SGPropertyNode* cameraNode) std::string compositor_path = cameraNode->getStringValue("compositor", default_compositor.c_str()); osg::ref_ptr options = - SGReaderWriterOptions::fromPath(globals->get_fg_root().local8BitStr()); + SGReaderWriterOptions::fromPath(globals->get_fg_root()); options->setPropertyNode(globals->get_props()); Compositor *compositor = Compositor::create(_viewer, window->gc, diff --git a/src/Viewer/renderer_compositor.cxx b/src/Viewer/renderer_compositor.cxx index 151d894b2..032b58748 100644 --- a/src/Viewer/renderer_compositor.cxx +++ b/src/Viewer/renderer_compositor.cxx @@ -529,7 +529,7 @@ FGRenderer::setupView( void ) // Moon diameter: 3,476 kilometers // Sun diameter: 1,390,000 kilometers osg::ref_ptr opt; - opt = simgear::SGReaderWriterOptions::fromPath(globals->get_fg_root().local8BitStr()); + opt = simgear::SGReaderWriterOptions::fromPath(globals->get_fg_root()); opt->setPropertyNode(globals->get_props()); _sky->build( 80000.0, 80000.0, 463.3, 361.8, diff --git a/src/Viewer/renderer_legacy.cxx b/src/Viewer/renderer_legacy.cxx index b4dfbd68f..8d4c01db8 100644 --- a/src/Viewer/renderer_legacy.cxx +++ b/src/Viewer/renderer_legacy.cxx @@ -1136,7 +1136,7 @@ FGRenderer::buildDeferredFullscreenCamera( flightgear::CameraInfo* info, const F g->setUseDisplayList(false); simgear::EffectGeode* eg = new simgear::EffectGeode; osg::ref_ptr opt; - opt = SGReaderWriterOptions::fromPath(globals->get_fg_root().local8BitStr()); + opt = SGReaderWriterOptions::fromPath(globals->get_fg_root()); opt->setPropertyNode(globals->get_props()); simgear::Effect* effect = simgear::makeEffect(pass->effect, true, opt.get()); if (effect) { @@ -1189,7 +1189,7 @@ FGRenderer::buildDeferredDisplayCamera( osg::Camera* camera, flightgear::CameraI g->setUseDisplayList(false); //DEBUG simgear::EffectGeode* eg = new simgear::EffectGeode; osg::ref_ptr opt; - opt = SGReaderWriterOptions::fromPath(globals->get_fg_root().local8BitStr()); + opt = SGReaderWriterOptions::fromPath(globals->get_fg_root()); opt->setPropertyNode(globals->get_props()); simgear::Effect* effect = simgear::makeEffect(stage->effect, true, opt.get()); if (!effect) { @@ -1422,7 +1422,7 @@ FGRenderer::setupView( void ) // Moon diameter: 3,476 kilometers // Sun diameter: 1,390,000 kilometers osg::ref_ptr opt; - opt = SGReaderWriterOptions::fromPath(globals->get_fg_root().local8BitStr()); + opt = SGReaderWriterOptions::fromPath(globals->get_fg_root()); opt->setPropertyNode(globals->get_props()); _sky->build( 80000.0, 80000.0, 463.3, 361.8,