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

3 files changed, 47 insertions, 61 deletions

diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc
index 4112c146..42f36a63 100644
--- a/examples/network/resolver.cc
+++ b/examples/network/resolver.cc
@@ -91,14 +91,13 @@ print_resolved_name (const Glib::ustring& phys,
 
 static void
 print_resolved_addresses (const Glib::ustring& name,
-                          const std::list<Glib::RefPtr<Gio::InetAddress> >& addresses)
+                          const std::list<Glib::RefPtr<Gio::InetAddress>>& addresses)
 {
     G_LOCK (response);
     std::cout << Glib::ustring::compose ("Name:    %1\n", name);
-    for (std::list<Glib::RefPtr<Gio::InetAddress> >::const_iterator iter = addresses.begin ();
-         iter != addresses.end (); ++iter)
+    for (const auto& i : addresses)
     {
-        std::cout << Glib::ustring::compose ("Address: %1\n", (*iter)->to_string ());
+        std::cout << Glib::ustring::compose ("Address: %1\n", i->to_string ());
     }
     std::cout << std::endl;
 
@@ -112,15 +111,14 @@ print_resolved_service (const Glib::ustring& service,
 {
     G_LOCK (response);
     std::cout << Glib::ustring::compose ("Service: %1\n", service);
-    for (std::list<Gio::SrvTarget>::const_iterator iter = targets.begin ();
-         iter != targets.end (); ++iter)
+    for (const auto& i : targets)
     {
         std::cout <<
             Glib::ustring::compose ("%1:%2 (pri %3, weight %4)\n",
-                                    iter->get_hostname (),
-                                    iter->get_port (),
-                                    iter->get_priority (),
-                                    iter->get_weight ());
+                                    i.get_hostname (),
+                                    i.get_port (),
+                                    i.get_priority (),
+                                    i.get_weight ());
     }
     std::cout << std::endl;
 
@@ -152,9 +150,8 @@ lookup_one_sync (const Glib::ustring& arg)
 {
     if (arg.find ('/') != std::string::npos)
     {
-        std::list<Gio::SrvTarget> targets;
         /* service/protocol/domain */
-        std::vector<Glib::ustring> parts = split_service_parts (arg);
+        const auto parts = split_service_parts (arg);
         if (parts.size () != 3) {
             usage ();
             return;
@@ -162,7 +159,7 @@ lookup_one_sync (const Glib::ustring& arg)
 
         try
         {
-            targets = resolver->lookup_service (parts[0], parts[1], parts[2],
+            const auto targets = resolver->lookup_service (parts[0], parts[1], parts[2],
                                                 cancellable);
             print_resolved_service (arg, targets);
         }
@@ -173,7 +170,7 @@ lookup_one_sync (const Glib::ustring& arg)
     }
     else if (Gio::hostname_is_ip_address (arg))
     {
-        Glib::RefPtr<Gio::InetAddress> addr = Gio::InetAddress::create (arg);
+        auto addr = Gio::InetAddress::create (arg);
         try
         {
             Glib::ustring name = resolver->lookup_by_address (addr, cancellable);
@@ -209,13 +206,11 @@ lookup_thread (const Glib::ustring& arg)
 static void
 start_threaded_lookups (char **argv, int argc)
 {
-    int i;
-
-    for (i = 0; i < argc; i++)
-    {
-        Glib::Threads::Thread::create (sigc::bind (sigc::ptr_fun (lookup_thread),
-                                          argv[i]));
-    }
+  for (auto i = 0; i < argc; i++)
+  {
+    Glib::Threads::Thread::create (sigc::bind (sigc::ptr_fun (lookup_thread),
+      argv[i]));
+   }
 }
 
 static void
@@ -265,13 +260,13 @@ lookup_service_callback (Glib::RefPtr<Gio::AsyncResult> result,
 static void
 start_async_lookups (char **argv, int argc)
 {
-    for (int i = 0; i < argc; i++)
+    for (auto i = 0; i < argc; i++)
     {
         Glib::ustring arg (argv[i]);
         if (arg.find ('/') != std::string::npos)
         {
             /* service/protocol/domain */
-            std::vector<Glib::ustring> parts = split_service_parts (arg);
+            auto parts = split_service_parts (arg);
             if (parts.size () != 3) {
                 usage ();
                 return;
@@ -286,7 +281,7 @@ start_async_lookups (char **argv, int argc)
         }
         else if (Gio::hostname_is_ip_address (argv[i]))
         {
-            Glib::RefPtr<Gio::InetAddress> addr = Gio::InetAddress::create (argv[i]);
+            auto addr = Gio::InetAddress::create (argv[i]);
 
             resolver->lookup_by_address_async (addr,
                                                sigc::bind (sigc::ptr_fun
@@ -312,7 +307,7 @@ static void
 print_connectable_sockaddr (Glib::RefPtr<Gio::SocketAddress> sockaddr)
 {
     Glib::ustring phys;
-    Glib::RefPtr<Gio::InetSocketAddress> isa =
+    auto isa =
         Glib::RefPtr<Gio::InetSocketAddress>::cast_dynamic (sockaddr);
 
     if (!isa)
@@ -351,7 +346,7 @@ got_next_async (Glib::RefPtr<Gio::AsyncResult> result,
 {
     try
     {
-        Glib::RefPtr<Gio::SocketAddress> sockaddr = enumerator->next_finish (result);
+        const auto sockaddr = enumerator->next_finish (result);
         if (sockaddr)
         {
             print_connectable_sockaddr (sockaddr);
@@ -384,7 +379,6 @@ do_connectable (const std::string& arg, gboolean synchronous)
 {
     std::vector<Glib::ustring> parts;
     Glib::RefPtr<Gio::SocketConnectable> connectable;
-    Glib::RefPtr<Gio::SocketAddressEnumerator> enumerator;
 
     if (arg.find ('/') != std::string::npos)
     {
@@ -402,27 +396,26 @@ do_connectable (const std::string& arg, gboolean synchronous)
         std::string host, port_str;
         guint16 port;
 
-        std::size_t pos = arg.find (':');
+        const auto pos = arg.find (':');
         if (pos != std::string::npos)
         {
             host = arg.substr (0, pos);
             port_str = arg.substr(pos);
-            port = strtoul (port_str.c_str (), NULL, 10);
+            port = strtoul (port_str.c_str (), nullptr, 10);
         }
         else
             port = 0;
 
         if (Gio::hostname_is_ip_address (host))
         {
-            Glib::RefPtr<Gio::InetAddress> addr = Gio::InetAddress::create (host);
+            const auto addr = Gio::InetAddress::create (host);
             connectable = Gio::InetSocketAddress::create (addr, port);
         }
         else
             connectable = Gio::NetworkAddress::create (arg, port);
     }
 
-    enumerator = connectable->enumerate ();
-
+    const auto enumerator = connectable->enumerate ();
     if (synchronous)
         do_sync_connectable (enumerator);
     else
@@ -442,9 +435,9 @@ interrupted (int /*sig*/)
 }
 
 static bool
-async_cancel (Glib::IOCondition /*cond*/, Glib::RefPtr<Gio::Cancellable> cancellable)
+async_cancel (Glib::IOCondition /*cond*/, Glib::RefPtr<Gio::Cancellable> the_cancellable)
 {
-    cancellable->cancel ();
+    the_cancellable->cancel ();
     return false;
 }
 #endif
@@ -452,8 +445,8 @@ async_cancel (Glib::IOCondition /*cond*/, Glib::RefPtr<Gio::Cancellable> cancell
 int
 main (int argc, char **argv)
 {
-    bool synchronous = false;
-    bool use_connectable = false;
+    auto synchronous = false;
+    auto use_connectable = false;
 #ifdef G_OS_UNIX
     Glib::RefPtr<Glib::IOChannel> chan;
     sigc::connection watch_conn;
@@ -497,7 +490,7 @@ main (int argc, char **argv)
     signal (SIGINT, interrupted);
 
     chan = Glib::IOChannel::create_from_fd (cancel_fds[0]);
-    Glib::RefPtr<Glib::IOSource> source = chan->create_watch (Glib::IO_IN);
+    const auto source = chan->create_watch (Glib::IO_IN);
     watch_conn = source->connect (sigc::bind (sigc::ptr_fun (async_cancel), cancellable));
 #endif
 
diff --git a/examples/network/socket-client.cc b/examples/network/socket-client.cc
index c7df51e8..44fd94ce 100644
--- a/examples/network/socket-client.cc
+++ b/examples/network/socket-client.cc
@@ -61,7 +61,7 @@ socket_address_to_string (const Glib::RefPtr<Gio::SocketAddress>& address)
     Glib::ustring str, res;
     int port;
 
-    Glib::RefPtr<Gio::InetSocketAddress> isockaddr =
+    auto isockaddr =
         Glib::RefPtr<Gio::InetSocketAddress>::cast_dynamic (address);
     if (!isockaddr)
         return Glib::ustring ();
@@ -90,7 +90,7 @@ ensure_condition (const Glib::RefPtr<Gio::Socket>& socket,
 
     if (use_source)
     {
-      Glib::RefPtr<Gio::SocketSource> source = socket->create_source(condition, cancellable);
+      auto source = socket->create_source(condition, cancellable);
       source->connect(sigc::ptr_fun(&source_ready));
       source->attach();
       loop->run();
@@ -154,7 +154,7 @@ main (int argc,
 
     if (argc != 2)
     {
-        const char* error_message = "Need to specify hostname";
+        const auto error_message = "Need to specify hostname";
         std::cerr << Glib::ustring::compose ("%1: %2\n", argv[0], error_message);
         return 1;
     }
diff --git a/examples/network/socket-server.cc b/examples/network/socket-server.cc
index b9e1a837..897c5d14 100644
--- a/examples/network/socket-server.cc
+++ b/examples/network/socket-server.cc
@@ -68,19 +68,16 @@ public:
 Glib::ustring
 socket_address_to_string (const Glib::RefPtr<Gio::SocketAddress>& address)
 {
-    Glib::RefPtr<Gio::InetAddress> inet_address;
-    Glib::ustring str, res;
-    int port;
-
-    Glib::RefPtr<Gio::InetSocketAddress> isockaddr =
-        Glib::RefPtr<Gio::InetSocketAddress>::cast_dynamic (address);
-    if (!isockaddr)
-        return Glib::ustring ();
-    inet_address = isockaddr->get_address ();
-    str = inet_address->to_string ();
-    port = isockaddr->get_port ();
-    res = Glib::ustring::compose ("%1:%2", str, port);
-    return res;
+  auto isockaddr =
+      Glib::RefPtr<Gio::InetSocketAddress>::cast_dynamic (address);
+  if (!isockaddr)
+      return Glib::ustring ();
+
+  auto inet_address = isockaddr->get_address ();
+  auto str = inet_address->to_string ();
+  auto the_port = isockaddr->get_port ();
+  auto res = Glib::ustring::compose ("%1:%2", str, the_port);
+  return res;
 }
 
 static bool
@@ -132,10 +129,7 @@ main (int argc,
       char *argv[])
 {
     Glib::RefPtr<Gio::Socket> socket, new_socket, recv_socket;
-    Glib::RefPtr<Gio::SocketAddress> src_address;
     Glib::RefPtr<Gio::SocketAddress> address;
-    Gio::SocketType socket_type;
-    Gio::SocketFamily socket_family;
     Glib::RefPtr<Gio::Cancellable> cancellable;
 
     Gio::init ();
@@ -161,8 +155,8 @@ main (int argc,
 
     loop = Glib::MainLoop::create ();
 
-    socket_type = use_udp ? Gio::SOCKET_TYPE_DATAGRAM : Gio::SOCKET_TYPE_STREAM;
-    socket_family = use_ipv6 ? Gio::SOCKET_FAMILY_IPV6 : Gio::SOCKET_FAMILY_IPV4;
+    auto socket_type = use_udp ? Gio::SOCKET_TYPE_DATAGRAM : Gio::SOCKET_TYPE_STREAM;
+    auto socket_family = use_ipv6 ? Gio::SOCKET_FAMILY_IPV6 : Gio::SOCKET_FAMILY_IPV4;
 
     try {
         socket = Gio::Socket::create (socket_family, socket_type, Gio::SOCKET_PROTOCOL_DEFAULT);
@@ -175,7 +169,7 @@ main (int argc,
     if (non_blocking)
         socket->set_blocking (false);
 
-    src_address = Gio::InetSocketAddress::create (Gio::InetAddress::create_any (socket_family), port);
+    auto src_address = Gio::InetSocketAddress::create (Gio::InetAddress::create_any (socket_family), port);
     try {
         socket->bind (src_address, !dont_reuse_address);
     } catch (const Gio::Error& error) {
@@ -234,7 +228,6 @@ main (int argc,
     {
         gchar buffer[4096] = { };
         gssize size;
-        gsize to_send;
 
         ensure_condition (recv_socket, "receive", cancellable, Glib::IO_IN);
         try {
@@ -266,7 +259,7 @@ main (int argc,
                      "-------------------------\n",
                      (int)size, buffer);
 
-        to_send = size;
+        auto to_send = size;
 
         while (to_send > 0)
         {