Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc

1 files changed, 21 insertions, 21 deletions

diff --git a/glib/src/spawn.ccg b/glib/src/spawn.ccg
index 707d5828..5cfbdb7a 100644
--- a/glib/src/spawn.ccg
+++ b/glib/src/spawn.ccg
@@ -34,7 +34,7 @@ static void child_setup_callback(void* user_data)
 {
   try
   {
-    (*reinterpret_cast<sigc::slot<void>*>(user_data))();
+    (*reinterpret_cast<Glib::SlotSpawnChildSetup*>(user_data))();
   }
   catch(...)
   {
@@ -67,15 +67,15 @@ void spawn_async_with_pipes(const std::string& working_directory,
                             const Glib::ArrayHandle<std::string>& argv,
                             const Glib::ArrayHandle<std::string>& envp,
                             SpawnFlags flags,
-                            const sigc::slot<void>& child_setup,
+                            const SlotSpawnChildSetup& child_setup,
                             Pid* child_pid,
                             int* standard_input,
                             int* standard_output,
                             int* standard_error)
 {
   const bool setup_slot = !child_setup.empty();
-  sigc::slot<void> child_setup_ = child_setup;
-  GError* gerror = 0;
+  auto child_setup_ = child_setup;
+  GError* gerror = nullptr;
 
   g_spawn_async_with_pipes(
       (working_directory.empty()) ? 0 : working_directory.c_str(),
@@ -95,15 +95,15 @@ void spawn_async_with_pipes(const std::string& working_directory,
 void spawn_async_with_pipes(const std::string& working_directory,
                             const Glib::ArrayHandle<std::string>& argv,
                             SpawnFlags flags,
-                            const sigc::slot<void>& child_setup,
+                            const SlotSpawnChildSetup& child_setup,
                             Pid* child_pid,
                             int* standard_input,
                             int* standard_output,
                             int* standard_error)
 {
   const bool setup_slot = !child_setup.empty();
-  sigc::slot<void> child_setup_ = child_setup;
-  GError* gerror = 0;
+  auto child_setup_ = child_setup;
+  GError* gerror = nullptr;
 
   g_spawn_async_with_pipes(
       (working_directory.empty()) ? 0 : working_directory.c_str(),
@@ -123,12 +123,12 @@ void spawn_async(const std::string& working_directory,
                  const Glib::ArrayHandle<std::string>& argv,
                  const Glib::ArrayHandle<std::string>& envp,
                  SpawnFlags flags,
-                 const sigc::slot<void>& child_setup,
+                 const SlotSpawnChildSetup& child_setup,
                  Pid* child_pid)
 {
   const bool setup_slot = !child_setup.empty();
-  sigc::slot<void> child_setup_ = child_setup;
-  GError* gerror = 0;
+  auto child_setup_ = child_setup;
+  GError* gerror = nullptr;
 
   g_spawn_async(
       (working_directory.empty()) ? 0 : working_directory.c_str(),
@@ -147,12 +147,12 @@ void spawn_async(const std::string& working_directory,
 void spawn_async(const std::string& working_directory,
                  const Glib::ArrayHandle<std::string>& argv,
                  SpawnFlags flags,
-                 const sigc::slot<void>& child_setup,
+                 const SlotSpawnChildSetup& child_setup,
                  Pid* child_pid)
 {
   const bool setup_slot = !child_setup.empty();
-  sigc::slot<void> child_setup_ = child_setup;
-  GError* gerror = 0;
+  auto child_setup_ = child_setup;
+  GError* gerror = nullptr;
 
   g_spawn_async(
       (working_directory.empty()) ? 0 : working_directory.c_str(),
@@ -171,17 +171,17 @@ void spawn_sync(const std::string& working_directory,
                 const Glib::ArrayHandle<std::string>& argv,
                 const Glib::ArrayHandle<std::string>& envp,
                 SpawnFlags flags,
-                const sigc::slot<void>& child_setup,
+                const SlotSpawnChildSetup& child_setup,
                 std::string* standard_output,
                 std::string* standard_error,
                 int* exit_status)
 {
   const bool setup_slot = !child_setup.empty();
-  sigc::slot<void> child_setup_ = child_setup;
+  auto child_setup_ = child_setup;
 
   Glib::ScopedPtr<char> buf_standard_output;
   Glib::ScopedPtr<char> buf_standard_error;
-  GError* gerror = 0;
+  GError* gerror = nullptr;
 
   g_spawn_sync(
       (working_directory.empty()) ? 0 : working_directory.c_str(),
@@ -205,17 +205,17 @@ void spawn_sync(const std::string& working_directory,
 void spawn_sync(const std::string& working_directory,
                 const Glib::ArrayHandle<std::string>& argv,
                 SpawnFlags flags,
-                const sigc::slot<void>& child_setup,
+                const SlotSpawnChildSetup& child_setup,
                 std::string* standard_output,
                 std::string* standard_error,
                 int* exit_status)
 {
   const bool setup_slot = !child_setup.empty();
-  sigc::slot<void> child_setup_ = child_setup;
+  auto child_setup_ = child_setup;
 
   Glib::ScopedPtr<char> buf_standard_output;
   Glib::ScopedPtr<char> buf_standard_error;
-  GError* gerror = 0;
+  GError* gerror = nullptr;
 
   g_spawn_sync(
       (working_directory.empty()) ? 0 : working_directory.c_str(),
@@ -237,7 +237,7 @@ void spawn_sync(const std::string& working_directory,
 
 void spawn_command_line_async(const std::string& command_line)
 {
-  GError* gerror = 0;
+  GError* gerror = nullptr;
   g_spawn_command_line_async(command_line.c_str(), &gerror);
 
   if(gerror)
@@ -251,7 +251,7 @@ void spawn_command_line_sync(const std::string& command_line,
 {
   Glib::ScopedPtr<char> buf_standard_output;
   Glib::ScopedPtr<char> buf_standard_error;
-  GError* gerror = 0;
+  GError* gerror = nullptr;
 
   g_spawn_command_line_sync(
       command_line.c_str(),