From 2cad48817914213f41fd7b85cac0f650b0f9d7ce Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 26 Jun 2013 10:46:22 +0200 Subject: C++11: Use range-based for loops. --- examples/network/resolver.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'examples/network') diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc index 4112c146..ca630d9d 100644 --- a/examples/network/resolver.cc +++ b/examples/network/resolver.cc @@ -95,10 +95,9 @@ print_resolved_addresses (const Glib::ustring& name, { G_LOCK (response); std::cout << Glib::ustring::compose ("Name: %1\n", name); - for (std::list >::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::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; -- cgit v1.2.1 From e0a8d05f0457d157a392303ced2b4237b228901b Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Thu, 27 Jun 2013 09:55:52 +0200 Subject: C++11: examples: No need for > > now. --- examples/network/resolver.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/network') diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc index ca630d9d..4fdf0cfa 100644 --- a/examples/network/resolver.cc +++ b/examples/network/resolver.cc @@ -91,7 +91,7 @@ print_resolved_name (const Glib::ustring& phys, static void print_resolved_addresses (const Glib::ustring& name, - const std::list >& addresses) + const std::list>& addresses) { G_LOCK (response); std::cout << Glib::ustring::compose ("Name: %1\n", name); -- cgit v1.2.1 From 8de5b1c659df65d0cc381a32ef7a7cd84a8e1038 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Thu, 27 Jun 2013 10:25:21 +0200 Subject: C++11: examples: Use nullptr. --- examples/network/resolver.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/network') diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc index 4fdf0cfa..dee1ebf5 100644 --- a/examples/network/resolver.cc +++ b/examples/network/resolver.cc @@ -405,7 +405,7 @@ do_connectable (const std::string& arg, gboolean synchronous) { 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; -- cgit v1.2.1 From f4e15e79601e47b1e56ef7c32d70bb68c2641ed5 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Thu, 4 Jul 2013 10:27:35 +0200 Subject: C++11: examples: more use of auto. --- examples/network/resolver.cc | 35 +++++++++++++++-------------------- examples/network/socket-client.cc | 2 +- examples/network/socket-server.cc | 35 ++++++++++++++--------------------- 3 files changed, 30 insertions(+), 42 deletions(-) (limited to 'examples/network') diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc index dee1ebf5..49ad2a58 100644 --- a/examples/network/resolver.cc +++ b/examples/network/resolver.cc @@ -150,9 +150,8 @@ lookup_one_sync (const Glib::ustring& arg) { if (arg.find ('/') != std::string::npos) { - std::list targets; /* service/protocol/domain */ - std::vector parts = split_service_parts (arg); + const auto parts = split_service_parts (arg); if (parts.size () != 3) { usage (); return; @@ -160,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); } @@ -207,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 @@ -263,7 +260,7 @@ lookup_service_callback (Glib::RefPtr 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) @@ -349,7 +346,7 @@ got_next_async (Glib::RefPtr result, { try { - Glib::RefPtr sockaddr = enumerator->next_finish (result); + const auto sockaddr = enumerator->next_finish (result); if (sockaddr) { print_connectable_sockaddr (sockaddr); @@ -382,7 +379,6 @@ do_connectable (const std::string& arg, gboolean synchronous) { std::vector parts; Glib::RefPtr connectable; - Glib::RefPtr enumerator; if (arg.find ('/') != std::string::npos) { @@ -400,7 +396,7 @@ 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); @@ -412,15 +408,14 @@ do_connectable (const std::string& arg, gboolean synchronous) if (Gio::hostname_is_ip_address (host)) { - Glib::RefPtr 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 @@ -450,8 +445,8 @@ async_cancel (Glib::IOCondition /*cond*/, Glib::RefPtr 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 chan; sigc::connection watch_conn; @@ -495,7 +490,7 @@ main (int argc, char **argv) signal (SIGINT, interrupted); chan = Glib::IOChannel::create_from_fd (cancel_fds[0]); - Glib::RefPtr 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..e6ecaba0 100644 --- a/examples/network/socket-client.cc +++ b/examples/network/socket-client.cc @@ -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..360c90bd 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& address) { - Glib::RefPtr inet_address; - Glib::ustring str, res; - int port; - - Glib::RefPtr isockaddr = - Glib::RefPtr::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::cast_dynamic (address); + if (!isockaddr) + return Glib::ustring (); + + auto inet_address = isockaddr->get_address (); + auto str = inet_address->to_string (); + auto port = isockaddr->get_port (); + auto res = Glib::ustring::compose ("%1:%2", str, port); + return res; } static bool @@ -132,10 +129,7 @@ main (int argc, char *argv[]) { Glib::RefPtr socket, new_socket, recv_socket; - Glib::RefPtr src_address; Glib::RefPtr address; - Gio::SocketType socket_type; - Gio::SocketFamily socket_family; Glib::RefPtr 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) { -- cgit v1.2.1 From d5fbe0d1e69d81aae918834c3a0c561b99f2791f Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 15 Jul 2015 13:16:43 +0200 Subject: examples: Avoid more shadowed variables. --- examples/network/resolver.cc | 4 ++-- examples/network/socket-server.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/network') diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc index 49ad2a58..c9195830 100644 --- a/examples/network/resolver.cc +++ b/examples/network/resolver.cc @@ -435,9 +435,9 @@ interrupted (int /*sig*/) } static bool -async_cancel (Glib::IOCondition /*cond*/, Glib::RefPtr cancellable) +async_cancel (Glib::IOCondition /*cond*/, Glib::RefPtr the_cancellable) { - cancellable->cancel (); + the_cancellable->cancel (); return false; } #endif diff --git a/examples/network/socket-server.cc b/examples/network/socket-server.cc index 360c90bd..897c5d14 100644 --- a/examples/network/socket-server.cc +++ b/examples/network/socket-server.cc @@ -75,8 +75,8 @@ socket_address_to_string (const Glib::RefPtr& address) auto inet_address = isockaddr->get_address (); auto str = inet_address->to_string (); - auto port = isockaddr->get_port (); - auto res = Glib::ustring::compose ("%1:%2", str, port); + auto the_port = isockaddr->get_port (); + auto res = Glib::ustring::compose ("%1:%2", str, the_port); return res; } -- cgit v1.2.1 From b5e068e288a0e9d031c725d5c9423d63daef6a44 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Wed, 15 Jul 2015 14:22:59 +0200 Subject: C++11: examples/tests: More use of auto. --- examples/network/resolver.cc | 8 ++++---- examples/network/socket-client.cc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/network') diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc index c9195830..42f36a63 100644 --- a/examples/network/resolver.cc +++ b/examples/network/resolver.cc @@ -170,7 +170,7 @@ lookup_one_sync (const Glib::ustring& arg) } else if (Gio::hostname_is_ip_address (arg)) { - Glib::RefPtr addr = Gio::InetAddress::create (arg); + auto addr = Gio::InetAddress::create (arg); try { Glib::ustring name = resolver->lookup_by_address (addr, cancellable); @@ -266,7 +266,7 @@ start_async_lookups (char **argv, int argc) if (arg.find ('/') != std::string::npos) { /* service/protocol/domain */ - std::vector parts = split_service_parts (arg); + auto parts = split_service_parts (arg); if (parts.size () != 3) { usage (); return; @@ -281,7 +281,7 @@ start_async_lookups (char **argv, int argc) } else if (Gio::hostname_is_ip_address (argv[i])) { - Glib::RefPtr addr = Gio::InetAddress::create (argv[i]); + auto addr = Gio::InetAddress::create (argv[i]); resolver->lookup_by_address_async (addr, sigc::bind (sigc::ptr_fun @@ -307,7 +307,7 @@ static void print_connectable_sockaddr (Glib::RefPtr sockaddr) { Glib::ustring phys; - Glib::RefPtr isa = + auto isa = Glib::RefPtr::cast_dynamic (sockaddr); if (!isa) diff --git a/examples/network/socket-client.cc b/examples/network/socket-client.cc index e6ecaba0..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& address) Glib::ustring str, res; int port; - Glib::RefPtr isockaddr = + auto isockaddr = Glib::RefPtr::cast_dynamic (address); if (!isockaddr) return Glib::ustring (); @@ -90,7 +90,7 @@ ensure_condition (const Glib::RefPtr& socket, if (use_source) { - Glib::RefPtr source = socket->create_source(condition, cancellable); + auto source = socket->create_source(condition, cancellable); source->connect(sigc::ptr_fun(&source_ready)); source->attach(); loop->run(); -- cgit v1.2.1