From 2386dc7ede0a133193905b4bf23dcf64c0a85648 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Wed, 21 Sep 2016 12:17:19 +1000 Subject: Use PBD::string_to/to_string in ARDOUR::user_config_directory_name() The numeric formatting is equivalent without requiring a LocaleGuard or the global C++ locale is "C". --- libs/ardour/filesystem_paths.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/ardour/filesystem_paths.cc') diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index 94ebc2830e..ee5fc97ad7 100644 --- a/libs/ardour/filesystem_paths.cc +++ b/libs/ardour/filesystem_paths.cc @@ -20,8 +20,8 @@ #include #include "pbd/compose.h" -#include "pbd/convert.h" #include "pbd/error.h" +#include "pbd/string_convert.h" #include #include @@ -46,7 +46,7 @@ static std::string user_config_directory_name (int version = -1) { if (version < 0) { - version = atoi (X_(PROGRAM_VERSION)); + version = string_to(X_(PROGRAM_VERSION)); } /* ARDOUR::Profile may not be available when this is @@ -313,7 +313,7 @@ been_here_before_path (int version) version = atoi (PROGRAM_VERSION); } - return Glib::build_filename (user_config_directory (version), string (".a") + to_string (version, std::dec)); + return Glib::build_filename (user_config_directory (version), string (".a") + to_string (version)); } -- cgit v1.2.3