GNOME.org
 

[glibmm] Re-run clang-format on some files.

commit f2cc4ebb113c48ad0aba46c1f67d4e8f65a69330
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Feb 26 22:44:05 2016 +0100

    Re-run clang-format on some files.
    
    I need to make a subsequent commit to fix the now-unaligned
    trailing comments.

 examples/options/main.cc                  |    2 +-
 gio/giomm/contenttype.h                   |    3 ++-
 glib/glibmm/base64.cc                     |    2 +-
 glib/glibmm/class.cc                      |    8 ++++----
 glib/glibmm/containerhandle_shared.h      |    4 ++--
 glib/glibmm/dispatcher.cc                 |    4 ++--
 glib/glibmm/main.cc                       |    4 ++--
 glib/glibmm/object.h                      |    2 +-
 glib/glibmm/objectbase.h                  |    4 ++--
 glib/glibmm/signalproxy.h                 |    2 +-
 glib/glibmm/signalproxy_connectionnode.cc |    8 ++++----
 glib/glibmm/ustring.cc                    |    2 +-
 glib/glibmm/value_custom.cc               |   12 ++++++------
 glib/glibmm/weakref.h                     |    2 +-
 tests/glibmm_interface_move/main.cc       |   18 +++++++++---------
 15 files changed, 39 insertions(+), 38 deletions(-)
---
diff --git a/examples/options/main.cc b/examples/options/main.cc
index 45d92e9..8da855e 100644
--- a/examples/options/main.cc
+++ b/examples/options/main.cc
@@ -70,7 +70,7 @@ ExampleOptionGroup::ExampleOptionGroup()
   entry3.set_short_name('g');
   entry3.set_description("The Goo");
   m_arg_goo = "default-goo-value"; // We can choose a default to be used if the user doesn't specify
-                                   // this option.
+  // this option.
   add_entry(entry3, m_arg_goo);
 
   Glib::OptionEntry entry4;
diff --git a/gio/giomm/contenttype.h b/gio/giomm/contenttype.h
index 2785d86..d4f7694 100644
--- a/gio/giomm/contenttype.h
+++ b/gio/giomm/contenttype.h
@@ -163,7 +163,8 @@ Glib::ustring content_type_guess(
  *
  * The types returned all have the form x-content/foo, e.g.
  * x-content/audio-cdda (for audio CDs) or x-content/image-dcf
- * (for a camera memory card). See the <a 
href="http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec";>shared-mime-info</a>
+ * (for a camera memory card). See the <a
+ * href="http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec";>shared-mime-info</a>
  * specification for more on x-content types.
  *
  * @param root The root of the tree to guess a type for.
diff --git a/glib/glibmm/base64.cc b/glib/glibmm/base64.cc
index 27ba466..c9c279c 100644
--- a/glib/glibmm/base64.cc
+++ b/glib/glibmm/base64.cc
@@ -32,7 +32,7 @@ Base64::encode(const std::string& source, bool break_lines)
      ((len / 3 + 1) * 4 + 4) / 72 + 1 bytes of extra space.
   */
   gsize length = (source.length() / 3 + 1) * 4 + 1; // + 1 for the terminating zero
-  length += ((length / 72) + 1);                    // in case break_lines = true
+  length += ((length / 72) + 1); // in case break_lines = true
   const auto buf = make_unique_ptr_gfree((char*)g_malloc(length));
   gint state = 0, save = 0;
   const guchar* src = reinterpret_cast<const unsigned char*>(source.data());
diff --git a/glib/glibmm/class.cc b/glib/glibmm/class.cc
index 66349a1..75b7d13 100644
--- a/glib/glibmm/class.cc
+++ b/glib/glibmm/class.cc
@@ -62,7 +62,7 @@ Class::register_derived_type(GType base_type, GTypeModule* module)
     nullptr, // class_finalize
     nullptr, // class_data
     instance_size,
-    0,       // n_preallocs
+    0, // n_preallocs
     nullptr, // instance_init
     nullptr, // value_table
   };
@@ -120,13 +120,13 @@ Class::clone_custom_type(
 
     const GTypeInfo derived_info = {
       class_size,
-      nullptr,                                     // base_init
+      nullptr, // base_init
       &Class::custom_class_base_finalize_function, // base_finalize
       &Class::custom_class_init_function,
       nullptr, // class_finalize
-      this,    // class_data
+      this, // class_data
       instance_size,
-      0,       // n_preallocs
+      0, // n_preallocs
       nullptr, // instance_init
       nullptr, // value_table
     };
diff --git a/glib/glibmm/containerhandle_shared.h b/glib/glibmm/containerhandle_shared.h
index 77c54c1..7084e9b 100644
--- a/glib/glibmm/containerhandle_shared.h
+++ b/glib/glibmm/containerhandle_shared.h
@@ -50,8 +50,8 @@ namespace Glib
 enum OwnershipType
 {
   OWNERSHIP_NONE = 0, /*!< Do not release anything */
-  OWNERSHIP_SHALLOW,  /*!< Release the list, but not its elements, when the container is deleted */
-  OWNERSHIP_DEEP      /*!< Release the list, and its elements, when the container is deleted. */
+  OWNERSHIP_SHALLOW, /*!< Release the list, but not its elements, when the container is deleted */
+  OWNERSHIP_DEEP /*!< Release the list, and its elements, when the container is deleted. */
 };
 
 /** Utility class holding an iterator sequence.
diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc
index d77cfc5..8525fbe 100644
--- a/glib/glibmm/dispatcher.cc
+++ b/glib/glibmm/dispatcher.cc
@@ -84,7 +84,7 @@ fd_close_and_invalidate(HANDLE& fd)
     fd = 0;
   }
 }
-#else  /* !G_OS_WIN32 */
+#else /* !G_OS_WIN32 */
 /*
  * Set the close-on-exec flag on the file descriptor,
  * so that it won't be leaked if a new process is spawned.
@@ -414,7 +414,7 @@ bool DispatchNotifier::pipe_io_handler(Glib::IOCondition)
         warn_failed_pipe_io("ResetEvent");
     }
   }
-#else  /* !G_OS_WIN32 */
+#else /* !G_OS_WIN32 */
 
   gssize n_read;
 
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index 8148120..8b0ab1b 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -856,8 +856,8 @@ wrap(GMainLoop* gobject, bool take_copy)
 const GSourceFuncs Source::vfunc_table_ = {
   &Source::prepare_vfunc, &Source::check_vfunc, &Source::dispatch_vfunc,
   nullptr, // finalize_vfunc // We can't use finalize_vfunc because there is no way
-           // to store a pointer to our wrapper anywhere in GSource so
-           // that it persists until finalize_vfunc would be called from here.
+  // to store a pointer to our wrapper anywhere in GSource so
+  // that it persists until finalize_vfunc would be called from here.
   nullptr, // closure_callback
   nullptr, // closure_marshal
 };
diff --git a/glib/glibmm/object.h b/glib/glibmm/object.h
index 1ec9f3b..522f84a 100644
--- a/glib/glibmm/object.h
+++ b/glib/glibmm/object.h
@@ -31,7 +31,7 @@
 #include <glibmm/wrap.h>
 #include <glibmm/quark.h>
 #include <glibmm/refptr.h>
-#include <glibmm/utility.h>                /* Could be private, but that would be tedious. */
+#include <glibmm/utility.h> /* Could be private, but that would be tedious. */
 #include <glibmm/containerhandle_shared.h> /* Because its specializations may be here. */
 #include <glibmm/value.h>
 #include <glib.h> /* for G_GNUC_NULL_TERMINATED */
diff --git a/glib/glibmm/objectbase.h b/glib/glibmm/objectbase.h
index a6b45ac..68e1b22 100644
--- a/glib/glibmm/objectbase.h
+++ b/glib/glibmm/objectbase.h
@@ -28,7 +28,7 @@
 #include <glibmm/debug.h>
 #include <sigc++/trackable.h>
 #include <typeinfo>
-#include <map>    // Needed until the next ABI break.
+#include <map> // Needed until the next ABI break.
 #include <memory> // Not used by ObjectBase any more, but user code may rely on it being here.
 #include <mutex>
 
@@ -236,7 +236,7 @@ protected:
   static std::mutex extra_object_base_data_mutex;
 
 public: //  is_derived_() must be public, so that overridden vfuncs and signal handlers can call it
-        //  via ObjectBase.
+  //  via ObjectBase.
   /// This is for use by gtkmm wrappers only, and not by applications.
   bool is_derived_() const; // We keep this non-inline version, to preserve ABI.
 
diff --git a/glib/glibmm/signalproxy.h b/glib/glibmm/signalproxy.h
index 932f886..7237be0 100644
--- a/glib/glibmm/signalproxy.h
+++ b/glib/glibmm/signalproxy.h
@@ -288,7 +288,7 @@ protected:
   sigc::slot_base& connect_impl_(bool notify, sigc::slot_base&& slot, bool after);
 
 private:
-  const SignalProxyInfo* info_;       // Pointer to statically allocated structure.
+  const SignalProxyInfo* info_; // Pointer to statically allocated structure.
   const Glib::ustring detailed_name_; // signal_name[::detail_name]
 
   // no copy assignment
diff --git a/glib/glibmm/signalproxy_connectionnode.cc b/glib/glibmm/signalproxy_connectionnode.cc
index b4b517c..ba67486 100644
--- a/glib/glibmm/signalproxy_connectionnode.cc
+++ b/glib/glibmm/signalproxy_connectionnode.cc
@@ -55,9 +55,9 @@ SignalProxyConnectionNode::notify(void* data)
     conn->object_ = nullptr;
 
     if (g_signal_handler_is_connected(o, conn->connection_id_)) // We check first, because during
-                                                                // destruction, GTK+ sometimes seems
-                                                                // to disconnect them for us, before
-                                                                // we expect it to.  See bug #87912
+    // destruction, GTK+ sometimes seems
+    // to disconnect them for us, before
+    // we expect it to.  See bug #87912
     {
       // Disconnecting triggers execution of destroy_notify_handler(), eiter immediately or later:
       //   When the signal handler is currently running. (for instance, if the callback disconnects
@@ -94,7 +94,7 @@ SignalProxyConnectionNode::destroy_notify_handler(gpointer data, GClosure*)
     conn->object_ = nullptr;
 
     delete conn; // if there are connection objects referring to slot_ they are notified during
-                 // destruction of slot_
+    // destruction of slot_
   }
 }
 
diff --git a/glib/glibmm/ustring.cc b/glib/glibmm/ustring.cc
index 051764c..15ab009 100644
--- a/glib/glibmm/ustring.cc
+++ b/glib/glibmm/ustring.cc
@@ -1369,7 +1369,7 @@ ustring::FormatStream::to_string() const
     str.size() * sizeof(std::wstring::value_type), "UTF-8", "WCHAR_T", nullptr, &n_bytes, &error));
 #endif /* !(__STDC_ISO_10646__ || G_OS_WIN32) */
 
-#else  /* !GLIBMM_HAVE_WIDE_STREAM */
+#else /* !GLIBMM_HAVE_WIDE_STREAM */
   const std::string str = stream_.str();
 
   gsize n_bytes = 0;
diff --git a/glib/glibmm/value_custom.cc b/glib/glibmm/value_custom.cc
index 1d1e3a1..69354ef 100644
--- a/glib/glibmm/value_custom.cc
+++ b/glib/glibmm/value_custom.cc
@@ -74,14 +74,14 @@ custom_boxed_type_register(
   };
 
   const GTypeInfo type_info = {
-    0,       // class_size
+    0, // class_size
     nullptr, // base_init
     nullptr, // base_finalize
     nullptr, // class_init_func
     nullptr, // class_finalize
     nullptr, // class_data
-    0,       // instance_size
-    0,       // n_preallocs
+    0, // instance_size
+    0, // n_preallocs
     nullptr, // instance_init
     &value_table,
   };
@@ -115,14 +115,14 @@ custom_pointer_type_register(const char* type_name)
   }
 
   const GTypeInfo type_info = {
-    0,       // class_size
+    0, // class_size
     nullptr, // base_init
     nullptr, // base_finalize
     nullptr, // class_init_func
     nullptr, // class_finalize
     nullptr, // class_data
-    0,       // instance_size
-    0,       // n_preallocs
+    0, // instance_size
+    0, // n_preallocs
     nullptr, // instance_init
     nullptr, // value_table
   };
diff --git a/glib/glibmm/weakref.h b/glib/glibmm/weakref.h
index 40da9c7..f4226cf 100644
--- a/glib/glibmm/weakref.h
+++ b/glib/glibmm/weakref.h
@@ -21,7 +21,7 @@
 #include <glibmm/refptr.h>
 #include <glibmm/objectbase.h>
 #include <type_traits> // std::is_base_of<>
-#include <utility>     // std::swap<>, std::forward<>
+#include <utility> // std::swap<>, std::forward<>
 
 namespace Glib
 {
diff --git a/tests/glibmm_interface_move/main.cc b/tests/glibmm_interface_move/main.cc
index 45b81de..99dbd58 100644
--- a/tests/glibmm_interface_move/main.cc
+++ b/tests/glibmm_interface_move/main.cc
@@ -26,15 +26,15 @@ test_Iface_get_type(void)
   {
     const GTypeInfo info = {
       sizeof(TestIface), // class_size
-      test_Iface_init,   // base_init
-      nullptr,           // base_finalize
-      nullptr,           // class_init
-      nullptr,           // class_finalize
-      nullptr,           // class_data
-      0,                 // instance_size
-      0,                 // n_preallocs
-      nullptr,           // instance_init
-      nullptr            // value_table
+      test_Iface_init, // base_init
+      nullptr, // base_finalize
+      nullptr, // class_init
+      nullptr, // class_finalize
+      nullptr, // class_data
+      0, // instance_size
+      0, // n_preallocs
+      nullptr, // instance_init
+      nullptr // value_table
     };
 
     type = g_type_register_static(G_TYPE_INTERFACE, "TestIface", &info, GTypeFlags(0));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]