[beast: 42/57] SFI: use Bse namespace elements instead of Rapicorn where possible

[Tim Janik <timj src gnome org>]

commit 68a5452b5e1aa431a95f33d0007b595685795da1
Author: Tim Janik <timj gnu org>
Date:   Mon Jul 17 23:23:37 2017 +0200

    SFI: use Bse namespace elements instead of Rapicorn where possible
    
    Signed-off-by: Tim Janik <timj gnu org>

 sfi/sfifilecrawler.cc |    2 +-
 sfi/sfiglue.cc        |    2 +-
 sfi/sfiserial.cc      |    2 +-
 sfi/sfistore.cc       |   14 +++++++-------
 sfi/sfistore.hh       |    2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/sfi/sfifilecrawler.cc b/sfi/sfifilecrawler.cc
index b6b36e1..c4ed8f4 100644
--- a/sfi/sfifilecrawler.cc
+++ b/sfi/sfifilecrawler.cc
@@ -556,7 +556,7 @@ sfi_path_get_filename (const gchar  *filename,
  *
  * This is the AND version of g_file_test(). That is, all file tests
  * specified in the @a test bits have to succed for this function to
- * return TRUE. This function is implemented via Rapicorn::Path::check(),
+ * return TRUE. This function is implemented via Bse::Path::check(),
  * which allowes for more detailed mode tests and is recommended
  * over use of this function.
  * Here is the list of possible GFileTest flags:
diff --git a/sfi/sfiglue.cc b/sfi/sfiglue.cc
index 3a2413a..1377ace 100644
--- a/sfi/sfiglue.cc
+++ b/sfi/sfiglue.cc
@@ -46,7 +46,7 @@ sfi_glue_fetch_context (const gchar *floc)
   return context;
 }
 
-class RingPtrDataKey : public Rapicorn::DataKey<SfiRing*> {
+class RingPtrDataKey : public Bse::DataKey<SfiRing*> {
   virtual void destroy (SfiRing *ring) override
   {
     if (ring)
diff --git a/sfi/sfiserial.cc b/sfi/sfiserial.cc
index 346a167..1745bef 100644
--- a/sfi/sfiserial.cc
+++ b/sfi/sfiserial.cc
@@ -103,7 +103,7 @@ string_to_cescape (const String &str)   // FIXME: move
 /* --- storage helpers --- */
 #define        gstring_puts(gstring, string)   g_string_append (gstring, string)
 #define        gstring_putc(gstring, vchar)    g_string_append_c (gstring, vchar)
-#define        gstring_format(gstring, ...)    g_string_append (gstring, Rapicorn::string_format 
(__VA_ARGS__).c_str())
+#define        gstring_format(gstring, ...)    g_string_append (gstring, Bse::string_format 
(__VA_ARGS__).c_str())
 
 static void
 gstring_break (GString  *gstring,
diff --git a/sfi/sfistore.cc b/sfi/sfistore.cc
index 40485bc..dd7d7bb 100644
--- a/sfi/sfistore.cc
+++ b/sfi/sfistore.cc
@@ -587,13 +587,13 @@ sfi_rstore_parse_param (SfiRStore  *rstore,
            {
              if (G_VALUE_TYPE (&pvalue) != G_VALUE_TYPE (value))
                sfi_rstore_warn (rstore,
-                                 Rapicorn::string_format ("fixing up value for \"%s\" of type `%s' 
(converted from `%s')",
-                                                          pspec->name, g_type_name (G_VALUE_TYPE (value)),
-                                                          g_type_name (G_VALUE_TYPE (&pvalue))));
+                                 Bse::string_format ("fixing up value for \"%s\" of type `%s' (converted 
from `%s')",
+                                                     pspec->name, g_type_name (G_VALUE_TYPE (value)),
+                                                     g_type_name (G_VALUE_TYPE (&pvalue))));
              else
                sfi_rstore_warn (rstore,
-                                 Rapicorn::string_format ("fixing up value for \"%s\" of type `%s'",
-                                                          pspec->name, g_type_name (G_VALUE_TYPE (value))));
+                                 Bse::string_format ("fixing up value for \"%s\" of type `%s'",
+                                                     pspec->name, g_type_name (G_VALUE_TYPE (value))));
            }
        }
       else
@@ -770,8 +770,8 @@ sfi_rstore_parse_until (SfiRStore     *rstore,
               return G_TOKEN_ERROR;
             }
           expected_token = sfi_rstore_warn_skip (rstore,
-                                                 Rapicorn::string_format ("unknown identifier: %s",
-                                                                          scanner->next_value.v_identifier));
+                                                 Bse::string_format ("unknown identifier: %s",
+                                                                     scanner->next_value.v_identifier));
         }
       /* bail out on errors */
       if (expected_token != G_TOKEN_NONE)
diff --git a/sfi/sfistore.hh b/sfi/sfistore.hh
index 2dc9cc6..c103f71 100644
--- a/sfi/sfistore.hh
+++ b/sfi/sfistore.hh
@@ -45,7 +45,7 @@ void            sfi_wstore_puts               (SfiWStore      *wstore,
                                                const gchar    *string);
 void            sfi_wstore_putc               (SfiWStore      *wstore,
                                                gchar           character);
-#define         sfi_wstore_printf(wstore, ...)  sfi_wstore_puts (wstore, Rapicorn::string_format 
(__VA_ARGS__).c_str())
+#define         sfi_wstore_printf(wstore, ...)  sfi_wstore_puts (wstore, Bse::string_format 
(__VA_ARGS__).c_str())
 void            sfi_wstore_putf               (SfiWStore      *wstore,
                                                gfloat          vfloat);
 void            sfi_wstore_putd               (SfiWStore      *wstore,