diff --git a/src/PlatformUtils.cc b/src/PlatformUtils.cc index 1615878e..b2162c8b 100644 --- a/src/PlatformUtils.cc +++ b/src/PlatformUtils.cc @@ -23,7 +23,7 @@ const char *PlatformUtils::OPENSCAD_FOLDER_NAME = "OpenSCAD"; static std::string lookupResourcesPath() { fs::path resourcedir(applicationpath); - PRINTDB("Looking up resource folder with application path '%s'", resourcedir.c_str()); + PRINTDB("Looking up resource folder with application path '%s'", boosty::stringy(resourcedir).c_str()); #ifdef __APPLE__ const char *searchpath[] = { @@ -57,11 +57,11 @@ static std::string lookupResourcesPath() tmpdir = resourcedir / searchpath[a]; const fs::path checkdir = tmpdir / "libraries"; - PRINTDB("Checking '%s'", checkdir.c_str()); + PRINTDB("Checking '%s'", boosty::stringy(checkdir).c_str()); if (is_directory(checkdir)) { resourcedir = tmpdir; - PRINTDB("Found resource folder '%s'", tmpdir.c_str()); + PRINTDB("Found resource folder '%s'", boosty::stringy(tmpdir).c_str()); break; } } diff --git a/src/colormap.cc b/src/colormap.cc index 51868815..5196b481 100644 --- a/src/colormap.cc +++ b/src/colormap.cc @@ -67,7 +67,7 @@ RenderColorScheme::RenderColorScheme(fs::path path) : _path(path) addColor(CGAL_EDGE_2D_COLOR, "cgal-edge-2d"); addColor(CROSSHAIR_COLOR, "crosshair"); } catch (const std::exception & e) { - PRINTB("Error reading color scheme file '%s': %s", path.c_str() % e.what()); + PRINTB("Error reading color scheme file '%s': %s", boosty::stringy(path).c_str() % e.what()); _error = e.what(); _name = ""; _index = 0; @@ -261,7 +261,7 @@ void ColorMap::enumerateColorSchemesInPath(colorscheme_set_t &result_set, const { const fs::path color_schemes = basePath / "color-schemes" / "render"; - PRINTDB("Enumerating color schemes from '%s'", color_schemes.string().c_str()); + PRINTDB("Enumerating color schemes from '%s'", boosty::stringy(color_schemes).c_str()); fs::directory_iterator end_iter; @@ -272,7 +272,7 @@ void ColorMap::enumerateColorSchemesInPath(colorscheme_set_t &result_set, const } const fs::path path = (*dir_iter).path(); - if (!(path.extension().string() == ".json")) { + if (!(path.extension() == ".json")) { continue; } diff --git a/src/scintillaeditor.cpp b/src/scintillaeditor.cpp index 656465f1..b904123a 100644 --- a/src/scintillaeditor.cpp +++ b/src/scintillaeditor.cpp @@ -76,7 +76,7 @@ EditorColorScheme::EditorColorScheme(fs::path path) : path(path) _name = QString(pt.get("name").c_str()); _index = pt.get("index"); } catch (const std::exception & e) { - PRINTB("Error reading color scheme file '%s': %s", path.c_str() % e.what()); + PRINTB("Error reading color scheme file '%s': %s", boosty::stringy(path).c_str() % e.what()); _name = ""; _index = 0; } @@ -369,7 +369,7 @@ void ScintillaEditor::enumerateColorSchemesInPath(ScintillaEditor::colorscheme_s } const fs::path path = (*dir_iter).path(); - if (!(path.extension().string() == ".json")) { + if (!(path.extension() == ".json")) { continue; }