[beast: 71/73] BSE: fix String and string_format references outside of Bse namespace

[Tim Janik <timj src gnome org>]

commit 9990c8a83ff19eda3b92576561b71230d92d17ab
Author: Tim Janik <timj gnu org>
Date:   Thu Mar 23 21:56:04 2017 +0100

    BSE: fix String and string_format references outside of Bse namespace
    
    Signed-off-by: Tim Janik <timj gnu org>

 bse/bsesoundfont.cc |    8 ++++----
 bse/bsestorage.cc   |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/bse/bsesoundfont.cc b/bse/bsesoundfont.cc
index 040ceb3..8f7a5d1 100644
--- a/bse/bsesoundfont.cc
+++ b/bse/bsesoundfont.cc
@@ -82,16 +82,16 @@ bse_sound_font_finalize (GObject *object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-static String
-use_searchpath (String file_name)
+static std::string
+use_searchpath (std::string file_name)
 {
   /* abolute path: do nothing */
   if (g_path_is_absolute (file_name.c_str()))
     return file_name;
 
   /* resolve relative path using search dir */
-  String sample_path;
-  String found_file;
+  std::string sample_path;
+  std::string found_file;
   SfiRing *files, *walk;
   if (bse_main_args->override_sample_path)
     sample_path = bse_main_args->override_sample_path;
diff --git a/bse/bsestorage.cc b/bse/bsestorage.cc
index 958d989..14795c1 100644
--- a/bse/bsestorage.cc
+++ b/bse/bsestorage.cc
@@ -1817,10 +1817,10 @@ BseStorage::Blob::~Blob()
   bse_id_free (id_);
 }
 
-static String
+static std::string
 bse_storage_blob_tmp_dir()
 {
-  String dirname = Rapicorn::Path::join (Rapicorn::Path::cache_home(), "libbse");
+  std::string dirname = Rapicorn::Path::join (Rapicorn::Path::cache_home(), "libbse");
   if (!Rapicorn::Path::check (dirname, "d"))
     g_mkdir_with_parents (dirname.c_str(), 0755);
   return dirname;
@@ -1832,7 +1832,7 @@ bse_storage_blob_tmp_dir()
 void
 bse_storage_blob_clean_files()
 {
-  String tmp_dir = bse_storage_blob_tmp_dir();
+  std::string tmp_dir = bse_storage_blob_tmp_dir();
 
   GError *error;
   GDir *dir = g_dir_open (tmp_dir.c_str(), 0, &error);
@@ -1942,11 +1942,11 @@ bse_storage_parse_blob (BseStorage             *self,
   GScanner *scanner = bse_storage_get_scanner (self);
   int bse_fd = -1;
   int tmp_fd = -1;
-  String file_name = string_format ("%s/bse-storage-blob-%s-%u", bse_storage_blob_tmp_dir(), 
g_get_user_name(), getpid());
+  std::string file_name = Bse::string_format ("%s/bse-storage-blob-%s-%u", bse_storage_blob_tmp_dir(), 
g_get_user_name(), getpid());
 
   // add enough randomness to ensure that collisions will not happen
   for (int i = 0; i < 5; i++)
-    file_name += string_format ("-%08x", g_random_int());
+    file_name += Bse::string_format ("-%08x", g_random_int());
 
   blob_out = nullptr; /* on error, the resulting blob should be NULL */