[glibmm] Correct some formatting

[Murray Cumming <murrayc src gnome org>]

commit c2160351bdb05967983770bfe9e7f08340e30d1a
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Jan 5 22:50:12 2011 +0100

    Correct some formatting

 gio/src/socketlistener.ccg |   82 ++++++++++++++------------
 gio/src/socketlistener.hg  |  140 +++++++++++++++++++++++++-------------------
 2 files changed, 123 insertions(+), 99 deletions(-)
---
diff --git a/gio/src/socketlistener.ccg b/gio/src/socketlistener.ccg
index 134920f..dd27559 100644
--- a/gio/src/socketlistener.ccg
+++ b/gio/src/socketlistener.ccg
@@ -25,24 +25,24 @@ namespace Gio
 
 bool SocketListener::add_socket(const Glib::RefPtr<Socket>& socket)
 {
-        GError* gerror = 0;
-        bool retval;
-        retval = g_socket_listener_add_socket (gobj(),
-                                               Glib::unwrap(socket),
-                                               0,
-                                               &gerror);
-        if(gerror)
-                ::Glib::Error::throw_exception(gerror);
-        return retval;
+  GError* gerror = 0;
+  const bool retval = g_socket_listener_add_socket(gobj(),
+    Glib::unwrap(socket),
+    0,
+  &gerror);
+  
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+    
+  return retval;
 }
 
 
 bool SocketListener::add_address(const Glib::RefPtr<SocketAddress>& address, SocketType type, SocketProtocol protocol, const Glib::RefPtr<Glib::Object>& source_object, Glib::RefPtr<SocketAddress>& effective_address)
 {
   GError* gerror = 0;
-  bool retval;
   GSocketAddress *retaddr = 0;
-  retval = g_socket_listener_add_address (gobj(),
+  const bool retval = g_socket_listener_add_address (gobj(),
                                           Glib::unwrap(address),
                                           static_cast<GSocketType>(type),
                                           static_cast<GSocketProtocol>(protocol),
@@ -51,17 +51,18 @@ bool SocketListener::add_address(const Glib::RefPtr<SocketAddress>& address, Soc
                                           &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
-  if (retaddr)
+
+  if(retaddr)
     effective_address = Glib::wrap(retaddr);
+
   return retval;
 }
 
 bool SocketListener::add_address(const Glib::RefPtr<SocketAddress>& address, SocketType type, SocketProtocol protocol, Glib::RefPtr<SocketAddress>& effective_address)
 {
   GError* gerror = 0;
-  bool retval;
   GSocketAddress *retaddr = 0;
-  retval = g_socket_listener_add_address (gobj(),
+  const bool retval = g_socket_listener_add_address (gobj(),
                                           Glib::unwrap(address),
                                           static_cast<GSocketType>(type),
                                           static_cast<GSocketProtocol>(protocol),
@@ -70,8 +71,10 @@ bool SocketListener::add_address(const Glib::RefPtr<SocketAddress>& address, Soc
                                           &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
-  if (retaddr)
+
+  if(retaddr)
     effective_address = Glib::wrap(retaddr);
+
   return retval;
 }
 
@@ -79,19 +82,18 @@ bool SocketListener::add_address(const Glib::RefPtr<SocketAddress>& address, Soc
 bool SocketListener::add_inet_port(guint16 port)
 {
   GError* gerror = 0;
-  bool retvalue = g_socket_listener_add_inet_port(gobj(), port, 0, &(gerror));
+  const bool retvalue = g_socket_listener_add_inet_port(gobj(), port, 0, &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
 
   return retvalue;
-
 }
 
 
 guint16 SocketListener::add_any_inet_port()
 {
   GError* gerror = 0;
-  guint16 retvalue = g_socket_listener_add_any_inet_port(gobj(), 0, &(gerror));
+  const guint16 retvalue = g_socket_listener_add_any_inet_port(gobj(), 0, &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
 
@@ -102,14 +104,15 @@ guint16 SocketListener::add_any_inet_port()
 Glib::RefPtr<Socket> SocketListener::accept_socket(Glib::RefPtr<Glib::Object>& source_object, const Glib::RefPtr<Cancellable>& cancellable)
 {
   GError* gerror = 0;
-  GObject *retobj;
+  GObject *retobj = 0;
   GSocket* retvalue = g_socket_listener_accept_socket(gobj(),
                                                       &retobj,
                                                       Glib::unwrap(cancellable),
-                                                      &(gerror));
+                                                      &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
-  if (retobj)
+
+  if(retobj)
     source_object = Glib::wrap(retobj);
 
   return Glib::wrap(retvalue);
@@ -118,14 +121,15 @@ Glib::RefPtr<Socket> SocketListener::accept_socket(Glib::RefPtr<Glib::Object>& s
 Glib::RefPtr<Socket> SocketListener::accept_socket(Glib::RefPtr<Glib::Object>& source_object)
 {
   GError* gerror = 0;
-  GObject *retobj;
+  GObject *retobj = 0;
   GSocket* retvalue = g_socket_listener_accept_socket(gobj(),
                                                       &retobj,
                                                       0,
-                                                      &(gerror));
+                                                      &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
-  if (retobj)
+    
+  if(retobj)
     source_object = Glib::wrap(retobj);
 
   return Glib::wrap(retvalue);
@@ -137,7 +141,7 @@ Glib::RefPtr<Socket> SocketListener::accept_socket(const Glib::RefPtr<Cancellabl
   GSocket* retvalue = g_socket_listener_accept_socket(gobj(),
                                                       0,
                                                       Glib::unwrap(cancellable),
-                                                      &(gerror));
+                                                      &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
 
@@ -150,7 +154,7 @@ Glib::RefPtr<Socket> SocketListener::accept_socket()
   GSocket* retvalue = g_socket_listener_accept_socket(gobj(),
                                                       0,
                                                       0,
-                                                      &(gerror));
+                                                      &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
 
@@ -191,10 +195,10 @@ Glib::RefPtr<Socket> SocketListener::accept_socket_finish(const Glib::RefPtr<Asy
   GSocket* retvalue = g_socket_listener_accept_socket_finish(gobj(),
                                                              Glib::unwrap(result),
                                                              &retobj,
-                                                             &(gerror));
+                                                             &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
-  if (retobj)
+  if(retobj)
     source_object = Glib::wrap(retobj);
 
   return Glib::wrap(retvalue);
@@ -206,7 +210,7 @@ Glib::RefPtr<Socket> SocketListener::accept_socket_finish(const Glib::RefPtr<Asy
   GSocket* retvalue = g_socket_listener_accept_socket_finish(gobj(),
                                                              Glib::unwrap(result),
                                                              0,
-                                                             &(gerror));
+                                                             &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
 
@@ -221,10 +225,11 @@ Glib::RefPtr<SocketConnection> SocketListener::accept(Glib::RefPtr<Object>& sour
   GSocketConnection* retvalue = g_socket_listener_accept(gobj(),
                                                          &retobj,
                                                          Glib::unwrap(cancellable),
-                                                         &(gerror));
+                                                         &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
-  if (retobj)
+
+  if(retobj)
     source_object = Glib::wrap(retobj);
 
   return Glib::wrap(retvalue);
@@ -237,10 +242,11 @@ Glib::RefPtr<SocketConnection> SocketListener::accept(Glib::RefPtr<Object>& sour
   GSocketConnection* retvalue = g_socket_listener_accept(gobj(),
                                                          &retobj,
                                                          0,
-                                                         &(gerror));
+                                                         &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
-  if (retobj)
+
+  if(retobj)
     source_object = Glib::wrap(retobj);
 
   return Glib::wrap(retvalue);
@@ -252,7 +258,7 @@ Glib::RefPtr<SocketConnection> SocketListener::accept(const Glib::RefPtr<Cancell
   GSocketConnection* retvalue = g_socket_listener_accept(gobj(),
                                                          0,
                                                          Glib::unwrap(cancellable),
-                                                         &(gerror));
+                                                         &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
 
@@ -265,7 +271,7 @@ Glib::RefPtr<SocketConnection> SocketListener::accept()
   GSocketConnection* retvalue = g_socket_listener_accept(gobj(),
                                                          0,
                                                          0,
-                                                         &(gerror));
+                                                         &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
 
@@ -306,10 +312,10 @@ Glib::RefPtr<SocketConnection> SocketListener::accept_finish(const Glib::RefPtr<
   GSocketConnection* retvalue = g_socket_listener_accept_finish(gobj(),
                                                                 Glib::unwrap(result),
                                                                 &retobj,
-                                                                &(gerror));
+                                                                &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
-  if (retobj)
+  if(retobj)
     source_object = Glib::wrap(retobj);
 
   return Glib::wrap(retvalue);
@@ -321,7 +327,7 @@ Glib::RefPtr<SocketConnection> SocketListener::accept_finish(const Glib::RefPtr<
   GSocketConnection* retvalue = g_socket_listener_accept_finish(gobj(),
                                                                 Glib::unwrap(result),
                                                                 0,
-                                                                &(gerror));
+                                                                &gerror);
   if(gerror)
     ::Glib::Error::throw_exception(gerror);
 
diff --git a/gio/src/socketlistener.hg b/gio/src/socketlistener.hg
index d55605d..883f10d 100644
--- a/gio/src/socketlistener.hg
+++ b/gio/src/socketlistener.hg
@@ -47,80 +47,98 @@ namespace Gio
  */
 class SocketListener : public Glib::Object
 {
-    _CLASS_GOBJECT(SocketListener, GSocketListener, G_SOCKET_LISTENER, Glib::Object, GObject)
+  _CLASS_GOBJECT(SocketListener, GSocketListener, G_SOCKET_LISTENER, Glib::Object, GObject)
 
 protected:
-    _CTOR_DEFAULT
+  _CTOR_DEFAULT
+
 public:
-    _WRAP_CREATE()
+  _WRAP_CREATE()
+
+  _WRAP_METHOD(void set_backlog(int listen_backlog), g_socket_listener_set_backlog)
+
+  _WRAP_METHOD(bool add_socket(const Glib::RefPtr<Socket>& socket, const Glib::RefPtr<Glib::Object>& source_object), g_socket_listener_add_socket, errthrow)
 
-_WRAP_METHOD(void set_backlog(int listen_backlog), g_socket_listener_set_backlog)
+ //TODO: The use of WRAP_METHOD_DOCS_ONLY here is almost certainly not good enough. 
+ //Check the HTML actually outputed and probably hand-code them as for Gio::File.
 
-_WRAP_METHOD(bool add_socket(const Glib::RefPtr<Socket>& socket, const Glib::RefPtr<Glib::Object>& source_object), g_socket_listener_add_socket, errthrow)
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_socket)
-bool add_socket(const Glib::RefPtr<Socket>& socket);
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_socket)
+  bool add_socket(const Glib::RefPtr<Socket>& socket);
 
-_IGNORE(g_socket_listener_add_address)
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_address)
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_address)
 bool add_address(const Glib::RefPtr<SocketAddress>& address, SocketType type, SocketProtocol protocol, const Glib::RefPtr<Glib::Object>& source_object, Glib::RefPtr<SocketAddress>& effective_address);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_address)
-bool add_address(const Glib::RefPtr<SocketAddress>& address, SocketType type, SocketProtocol protocol, Glib::RefPtr<SocketAddress>& effective_address);
+  _IGNORE(g_socket_listener_add_address)
 
-_WRAP_METHOD(bool add_inet_port(guint16 port, const Glib::RefPtr<Glib::Object>& source_object), g_socket_listener_add_inet_port, errthrow)
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_inet_port)
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_address)
+  bool add_address(const Glib::RefPtr<SocketAddress>& address, SocketType type, SocketProtocol protocol, Glib::RefPtr<SocketAddress>& effective_address);
+
+  _WRAP_METHOD(bool add_inet_port(guint16 port, const Glib::RefPtr<Glib::Object>& source_object), g_socket_listener_add_inet_port, errthrow)
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_inet_port)
 bool add_inet_port(guint16 port);
 
-_WRAP_METHOD(guint16 add_any_inet_port(const Glib::RefPtr<Glib::Object>& source_object), g_socket_listener_add_any_inet_port, errthrow)
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_any_inet_port)
-guint16 add_any_inet_port();
+  _WRAP_METHOD(guint16 add_any_inet_port(const Glib::RefPtr<Glib::Object>& source_object), g_socket_listener_add_any_inet_port, errthrow)
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_add_any_inet_port)
+  guint16 add_any_inet_port();
 
-_IGNORE(g_socket_listener_accept_socket)
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket)
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket)
 Glib::RefPtr<Socket> accept_socket(Glib::RefPtr<Glib::Object>& source_object, const Glib::RefPtr<Cancellable>& cancellable);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket)
-Glib::RefPtr<Socket> accept_socket(Glib::RefPtr<Glib::Object>& source_object);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket)
-Glib::RefPtr<Socket> accept_socket(const Glib::RefPtr<Cancellable>& cancellable);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket)
-Glib::RefPtr<Socket> accept_socket();
-
-_IGNORE(g_socket_listener_accept_socket_async)
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket_async)
-void accept_socket_async(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket_async)
-void accept_socket_async(const SlotAsyncReady& slot);
-
-_IGNORE(g_socket_listener_accept_socket_finish)
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket_finish)
-Glib::RefPtr<Socket> accept_socket_finish(const Glib::RefPtr<AsyncResult>& result, Glib::RefPtr<Glib::Object>& source_object);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket_finish)
-Glib::RefPtr<Socket> accept_socket_finish(const Glib::RefPtr<AsyncResult>& result);
-
-_IGNORE(g_socket_listener_accept)
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept)
-Glib::RefPtr<SocketConnection> accept(Glib::RefPtr<Object>& source_object, const Glib::RefPtr<Cancellable>& cancellable);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept)
-Glib::RefPtr<SocketConnection> accept(Glib::RefPtr<Object>& source_object);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept)
-Glib::RefPtr<SocketConnection> accept(const Glib::RefPtr<Cancellable>& cancellable);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept)
-Glib::RefPtr<SocketConnection> accept();
-
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_async)
-void accept_async(const SlotAsyncReady& slot);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_async)
-void accept_async(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
-_IGNORE(g_socket_listener_accept_async)
-
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_finish)
-Glib::RefPtr<SocketConnection> accept_finish(const Glib::RefPtr<AsyncResult>& result, Glib::RefPtr<Glib::Object>& source_object);
-_WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_finish)
-Glib::RefPtr<SocketConnection> accept_finish(const Glib::RefPtr<AsyncResult>& result);
-
-_WRAP_METHOD (void close(), g_socket_listener_close)
-
-_WRAP_PROPERTY("listen-backlog", int)
+  _IGNORE(g_socket_listener_accept_socket)
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket)
+  Glib::RefPtr<Socket> accept_socket(Glib::RefPtr<Glib::Object>& source_object);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket)
+  Glib::RefPtr<Socket> accept_socket(const Glib::RefPtr<Cancellable>& cancellable);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket)
+  Glib::RefPtr<Socket> accept_socket();
+
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket_async)
+  void accept_socket_async(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+  _IGNORE(g_socket_listener_accept_socket_async)
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket_async)
+  void accept_socket_async(const SlotAsyncReady& slot);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket_finish)
+  Glib::RefPtr<Socket> accept_socket_finish(const Glib::RefPtr<AsyncResult>& result, Glib::RefPtr<Glib::Object>& source_object);
+  _IGNORE(g_socket_listener_accept_socket_finish)
+  
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_socket_finish)
+  Glib::RefPtr<Socket> accept_socket_finish(const Glib::RefPtr<AsyncResult>& result);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept)
+  Glib::RefPtr<SocketConnection> accept(Glib::RefPtr<Object>& source_object, const Glib::RefPtr<Cancellable>& cancellable);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept)
+  Glib::RefPtr<SocketConnection> accept(Glib::RefPtr<Object>& source_object);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept)
+  Glib::RefPtr<SocketConnection> accept(const Glib::RefPtr<Cancellable>& cancellable);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept)
+  Glib::RefPtr<SocketConnection> accept();
+  _IGNORE(g_socket_listener_accept)
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_async)
+  void accept_async(const SlotAsyncReady& slot);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_async)
+  void accept_async(const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot);
+  _IGNORE(g_socket_listener_accept_async)
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_finish)
+  Glib::RefPtr<SocketConnection> accept_finish(const Glib::RefPtr<AsyncResult>& result, Glib::RefPtr<Glib::Object>& source_object);
+
+  _WRAP_METHOD_DOCS_ONLY(g_socket_listener_accept_finish)
+  Glib::RefPtr<SocketConnection> accept_finish(const Glib::RefPtr<AsyncResult>& result);
+
+  _WRAP_METHOD(void close(), g_socket_listener_close)
 
+  _WRAP_PROPERTY("listen-backlog", int)
 };
 
 } // namespace Gio