[glibmm] Run clang-format on tools/
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Run clang-format on tools/
- Date: Sat, 27 Feb 2016 14:42:29 +0000 (UTC)
commit 15fb34c7d93ce64a9463654b98f09a1d5f7fcc02
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Feb 26 11:09:27 2016 +0100
Run clang-format on tools/
tools/extra_defs_gen/generate_defs_gio.cc | 172 ++++++++++-----------------
tools/extra_defs_gen/generate_defs_glib.cc | 26 ++---
tools/extra_defs_gen/generate_extra_defs.cc | 160 ++++++++++++++-----------
tools/extra_defs_gen/generate_extra_defs.h | 22 ++--
4 files changed, 166 insertions(+), 214 deletions(-)
---
diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc
index 87544db..30c3939 100644
--- a/tools/extra_defs_gen/generate_defs_gio.cc
+++ b/tools/extra_defs_gen/generate_defs_gio.cc
@@ -25,143 +25,93 @@
#include <gio/gsettingsbackend.h>
#ifndef G_OS_WIN32
-# include <gio/gunixconnection.h>
+#include <gio/gunixconnection.h>
#include <gio/gunixcredentialsmessage.h>
-# include <gio/gunixfdmessage.h>
-# include <gio/gunixinputstream.h>
-# include <gio/gunixoutputstream.h>
-# include <gio/gunixsocketaddress.h>
+#include <gio/gunixfdmessage.h>
+#include <gio/gunixinputstream.h>
+#include <gio/gunixoutputstream.h>
+#include <gio/gunixsocketaddress.h>
#endif
-int main(int, char**)
+int
+main(int, char**)
{
// g_type_init() is deprecated as of 2.36.
// g_type_init();
- std::cout << get_defs(G_TYPE_ASYNC_RESULT)
- << get_defs(G_TYPE_ACTION)
- << get_defs(G_TYPE_ACTION_GROUP)
- << get_defs(G_TYPE_APPLICATION)
- << get_defs(G_TYPE_APP_INFO_MONITOR)
- << get_defs(G_TYPE_CANCELLABLE)
- << get_defs(G_TYPE_BUFFERED_INPUT_STREAM)
- << get_defs(G_TYPE_BUFFERED_OUTPUT_STREAM)
- << get_defs(G_TYPE_CHARSET_CONVERTER)
- << get_defs(G_TYPE_CONVERTER_INPUT_STREAM)
- << get_defs(G_TYPE_CONVERTER_OUTPUT_STREAM)
- << get_defs(G_TYPE_DATA_INPUT_STREAM)
- << get_defs(G_TYPE_DATA_OUTPUT_STREAM)
- << get_defs(G_TYPE_DRIVE)
- << get_defs(G_TYPE_FILE)
- << get_defs(G_TYPE_FILE_ENUMERATOR)
- << get_defs(G_TYPE_FILE_INFO)
- << get_defs(G_TYPE_FILE_ICON)
- << get_defs(G_TYPE_FILE_MONITOR)
- << get_defs(G_TYPE_FILENAME_COMPLETER)
-// << get_defs(G_TYPE_FILE_ATTRIBUTE_INFO_LIST)
-// << get_defs(G_TYPE_FILE_ATTRIBUTE_MATCHER)
- << get_defs(G_TYPE_FILE_INPUT_STREAM)
- << get_defs(G_TYPE_FILE_OUTPUT_STREAM)
- << get_defs(G_TYPE_FILTER_INPUT_STREAM)
- << get_defs(G_TYPE_FILTER_OUTPUT_STREAM)
+ std::cout << get_defs(G_TYPE_ASYNC_RESULT) << get_defs(G_TYPE_ACTION)
+ << get_defs(G_TYPE_ACTION_GROUP) << get_defs(G_TYPE_APPLICATION)
+ << get_defs(G_TYPE_APP_INFO_MONITOR) << get_defs(G_TYPE_CANCELLABLE)
+ << get_defs(G_TYPE_BUFFERED_INPUT_STREAM) << get_defs(G_TYPE_BUFFERED_OUTPUT_STREAM)
+ << get_defs(G_TYPE_CHARSET_CONVERTER) << get_defs(G_TYPE_CONVERTER_INPUT_STREAM)
+ << get_defs(G_TYPE_CONVERTER_OUTPUT_STREAM) << get_defs(G_TYPE_DATA_INPUT_STREAM)
+ << get_defs(G_TYPE_DATA_OUTPUT_STREAM) << get_defs(G_TYPE_DRIVE)
+ << get_defs(G_TYPE_FILE) << get_defs(G_TYPE_FILE_ENUMERATOR)
+ << get_defs(G_TYPE_FILE_INFO) << get_defs(G_TYPE_FILE_ICON)
+ << get_defs(G_TYPE_FILE_MONITOR) << get_defs(G_TYPE_FILENAME_COMPLETER)
+ // << get_defs(G_TYPE_FILE_ATTRIBUTE_INFO_LIST)
+ // << get_defs(G_TYPE_FILE_ATTRIBUTE_MATCHER)
+ << get_defs(G_TYPE_FILE_INPUT_STREAM) << get_defs(G_TYPE_FILE_OUTPUT_STREAM)
+ << get_defs(G_TYPE_FILTER_INPUT_STREAM) << get_defs(G_TYPE_FILTER_OUTPUT_STREAM)
#ifndef G_OS_WIN32
- << get_defs(G_TYPE_UNIX_CREDENTIALS_MESSAGE)
- << get_defs(G_TYPE_UNIX_FD_MESSAGE)
- << get_defs(G_TYPE_UNIX_INPUT_STREAM)
- << get_defs(G_TYPE_UNIX_OUTPUT_STREAM)
+ << get_defs(G_TYPE_UNIX_CREDENTIALS_MESSAGE) << get_defs(G_TYPE_UNIX_FD_MESSAGE)
+ << get_defs(G_TYPE_UNIX_INPUT_STREAM) << get_defs(G_TYPE_UNIX_OUTPUT_STREAM)
<< get_defs(G_TYPE_UNIX_SOCKET_ADDRESS)
#endif
- << get_defs(G_TYPE_INPUT_STREAM)
- << get_defs(G_TYPE_LIST_MODEL)
- << get_defs(G_TYPE_LIST_STORE)
- << get_defs(G_TYPE_LOADABLE_ICON)
- << get_defs(G_TYPE_MEMORY_INPUT_STREAM)
- << get_defs(G_TYPE_MEMORY_OUTPUT_STREAM)
- << get_defs(G_TYPE_MENU)
- << get_defs(G_TYPE_MENU_MODEL)
- << get_defs(G_TYPE_MOUNT)
- << get_defs(G_TYPE_MOUNT_OPERATION)
- << get_defs(G_TYPE_NOTIFICATION)
- << get_defs(G_TYPE_PERMISSION)
- << get_defs(G_TYPE_PROPERTY_ACTION)
- << get_defs(G_TYPE_PROXY)
- << get_defs(G_TYPE_PROXY_ADDRESS)
- << get_defs(G_TYPE_PROXY_ADDRESS_ENUMERATOR)
- << get_defs(G_TYPE_PROXY_RESOLVER)
- << get_defs(G_TYPE_SEEKABLE)
- << get_defs(G_TYPE_SETTINGS)
- << get_defs(G_TYPE_SETTINGS_BACKEND)
- << get_defs(G_TYPE_SIMPLE_ASYNC_RESULT)
- << get_defs(G_TYPE_SIMPLE_ACTION)
- << get_defs(G_TYPE_SIMPLE_IO_STREAM)
- << get_defs(G_TYPE_SUBPROCESS)
- << get_defs(G_TYPE_SUBPROCESS_LAUNCHER)
+ << get_defs(G_TYPE_INPUT_STREAM) << get_defs(G_TYPE_LIST_MODEL)
+ << get_defs(G_TYPE_LIST_STORE) << get_defs(G_TYPE_LOADABLE_ICON)
+ << get_defs(G_TYPE_MEMORY_INPUT_STREAM) << get_defs(G_TYPE_MEMORY_OUTPUT_STREAM)
+ << get_defs(G_TYPE_MENU) << get_defs(G_TYPE_MENU_MODEL) << get_defs(G_TYPE_MOUNT)
+ << get_defs(G_TYPE_MOUNT_OPERATION) << get_defs(G_TYPE_NOTIFICATION)
+ << get_defs(G_TYPE_PERMISSION) << get_defs(G_TYPE_PROPERTY_ACTION)
+ << get_defs(G_TYPE_PROXY) << get_defs(G_TYPE_PROXY_ADDRESS)
+ << get_defs(G_TYPE_PROXY_ADDRESS_ENUMERATOR) << get_defs(G_TYPE_PROXY_RESOLVER)
+ << get_defs(G_TYPE_SEEKABLE) << get_defs(G_TYPE_SETTINGS)
+ << get_defs(G_TYPE_SETTINGS_BACKEND) << get_defs(G_TYPE_SIMPLE_ASYNC_RESULT)
+ << get_defs(G_TYPE_SIMPLE_ACTION) << get_defs(G_TYPE_SIMPLE_IO_STREAM)
+ << get_defs(G_TYPE_SUBPROCESS) << get_defs(G_TYPE_SUBPROCESS_LAUNCHER)
<< get_defs(G_TYPE_THEMED_ICON)
- //TODO: This causes a g_warning:
- //GLib-GObject-CRITICAL **: g_param_spec_pool_list: assertion `pool != NULL' failed"
+ // TODO: This causes a g_warning:
+ // GLib-GObject-CRITICAL **: g_param_spec_pool_list: assertion `pool != NULL' failed"
<< get_defs(G_TYPE_VOLUME)
- << get_defs(G_TYPE_VOLUME_MONITOR)
- << get_defs(G_TYPE_ZLIB_COMPRESSOR)
+ << get_defs(G_TYPE_VOLUME_MONITOR) << get_defs(G_TYPE_ZLIB_COMPRESSOR)
<< get_defs(G_TYPE_ZLIB_DECOMPRESSOR)
// network IO classes
- << get_defs(G_TYPE_INET_ADDRESS)
- << get_defs(G_TYPE_INET_SOCKET_ADDRESS)
- << get_defs(G_TYPE_SOCKET_ADDRESS)
- << get_defs(G_TYPE_SOCKET_ADDRESS_ENUMERATOR)
- << get_defs(G_TYPE_SOCKET_CONNECTABLE)
- << get_defs(G_TYPE_SRV_TARGET)
- << get_defs(G_TYPE_RESOLVER)
- << get_defs(G_TYPE_NETWORK_ADDRESS)
- << get_defs(G_TYPE_NETWORK_MONITOR)
- << get_defs(G_TYPE_NETWORK_SERVICE)
- << get_defs(G_TYPE_SETTINGS)
- << get_defs(G_TYPE_SETTINGS_SCHEMA)
- << get_defs(G_TYPE_SETTINGS_SCHEMA_KEY)
- << get_defs(G_TYPE_SETTINGS_SCHEMA_SOURCE)
- << get_defs(G_TYPE_SIMPLE_PERMISSION)
- << get_defs(G_TYPE_SOCKET)
- << get_defs(G_TYPE_SOCKET_CLIENT)
- << get_defs(G_TYPE_SOCKET_CONNECTION)
- << get_defs(G_TYPE_TCP_CONNECTION)
- << get_defs(G_TYPE_TCP_WRAPPER_CONNECTION)
- << get_defs(G_TYPE_TLS_BACKEND)
- << get_defs(G_TYPE_TLS_CERTIFICATE)
- << get_defs(G_TYPE_TLS_CLIENT_CONNECTION)
- << get_defs(G_TYPE_TLS_CONNECTION)
- << get_defs(G_TYPE_TLS_DATABASE)
- << get_defs(G_TYPE_TLS_FILE_DATABASE)
- << get_defs(G_TYPE_TLS_INTERACTION)
- << get_defs(G_TYPE_TLS_PASSWORD)
+ << get_defs(G_TYPE_INET_ADDRESS) << get_defs(G_TYPE_INET_SOCKET_ADDRESS)
+ << get_defs(G_TYPE_SOCKET_ADDRESS) << get_defs(G_TYPE_SOCKET_ADDRESS_ENUMERATOR)
+ << get_defs(G_TYPE_SOCKET_CONNECTABLE) << get_defs(G_TYPE_SRV_TARGET)
+ << get_defs(G_TYPE_RESOLVER) << get_defs(G_TYPE_NETWORK_ADDRESS)
+ << get_defs(G_TYPE_NETWORK_MONITOR) << get_defs(G_TYPE_NETWORK_SERVICE)
+ << get_defs(G_TYPE_SETTINGS) << get_defs(G_TYPE_SETTINGS_SCHEMA)
+ << get_defs(G_TYPE_SETTINGS_SCHEMA_KEY) << get_defs(G_TYPE_SETTINGS_SCHEMA_SOURCE)
+ << get_defs(G_TYPE_SIMPLE_PERMISSION) << get_defs(G_TYPE_SOCKET)
+ << get_defs(G_TYPE_SOCKET_CLIENT) << get_defs(G_TYPE_SOCKET_CONNECTION)
+ << get_defs(G_TYPE_TCP_CONNECTION) << get_defs(G_TYPE_TCP_WRAPPER_CONNECTION)
+ << get_defs(G_TYPE_TLS_BACKEND) << get_defs(G_TYPE_TLS_CERTIFICATE)
+ << get_defs(G_TYPE_TLS_CLIENT_CONNECTION) << get_defs(G_TYPE_TLS_CONNECTION)
+ << get_defs(G_TYPE_TLS_DATABASE) << get_defs(G_TYPE_TLS_FILE_DATABASE)
+ << get_defs(G_TYPE_TLS_INTERACTION) << get_defs(G_TYPE_TLS_PASSWORD)
<< get_defs(G_TYPE_TLS_SERVER_CONNECTION)
#ifndef G_OS_WIN32
<< get_defs(G_TYPE_UNIX_CONNECTION)
#endif
- << get_defs(G_TYPE_SOCKET_LISTENER)
- << get_defs(G_TYPE_SOCKET_SERVICE)
+ << get_defs(G_TYPE_SOCKET_LISTENER) << get_defs(G_TYPE_SOCKET_SERVICE)
<< get_defs(G_TYPE_THREADED_SOCKET_SERVICE)
// DBus types:
- << get_defs(G_TYPE_DBUS_AUTH_OBSERVER)
- << get_defs(G_TYPE_DBUS_CONNECTION)
- << get_defs(G_TYPE_DBUS_ERROR)
- << get_defs(G_TYPE_DBUS_ANNOTATION_INFO)
- << get_defs(G_TYPE_DBUS_ARG_INFO)
- << get_defs(G_TYPE_DBUS_MENU_MODEL)
- << get_defs(G_TYPE_DBUS_METHOD_INFO)
- << get_defs(G_TYPE_DBUS_SIGNAL_INFO)
- << get_defs(G_TYPE_DBUS_PROPERTY_INFO)
- << get_defs(G_TYPE_DBUS_INTERFACE_INFO)
- << get_defs(G_TYPE_DBUS_INTERFACE_SKELETON)
- << get_defs(G_TYPE_DBUS_OBJECT)
- << get_defs(G_TYPE_DBUS_NODE_INFO)
- << get_defs(G_TYPE_DBUS_MESSAGE)
- << get_defs(G_TYPE_DBUS_METHOD_INVOCATION)
- << get_defs(G_TYPE_DBUS_PROXY)
+ << get_defs(G_TYPE_DBUS_AUTH_OBSERVER) << get_defs(G_TYPE_DBUS_CONNECTION)
+ << get_defs(G_TYPE_DBUS_ERROR) << get_defs(G_TYPE_DBUS_ANNOTATION_INFO)
+ << get_defs(G_TYPE_DBUS_ARG_INFO) << get_defs(G_TYPE_DBUS_MENU_MODEL)
+ << get_defs(G_TYPE_DBUS_METHOD_INFO) << get_defs(G_TYPE_DBUS_SIGNAL_INFO)
+ << get_defs(G_TYPE_DBUS_PROPERTY_INFO) << get_defs(G_TYPE_DBUS_INTERFACE_INFO)
+ << get_defs(G_TYPE_DBUS_INTERFACE_SKELETON) << get_defs(G_TYPE_DBUS_OBJECT)
+ << get_defs(G_TYPE_DBUS_NODE_INFO) << get_defs(G_TYPE_DBUS_MESSAGE)
+ << get_defs(G_TYPE_DBUS_METHOD_INVOCATION) << get_defs(G_TYPE_DBUS_PROXY)
<< get_defs(G_TYPE_DBUS_SERVER)
<< std::endl;
diff --git a/tools/extra_defs_gen/generate_defs_glib.cc b/tools/extra_defs_gen/generate_defs_glib.cc
index 1e32edb..235bc39 100644
--- a/tools/extra_defs_gen/generate_defs_glib.cc
+++ b/tools/extra_defs_gen/generate_defs_glib.cc
@@ -20,28 +20,18 @@
#include "generate_extra_defs.h"
#include <glib.h>
-int main()
+int
+main()
{
// g_type_init() is deprecated as of 2.36.
// g_type_init();
- std::cout << get_defs( G_TYPE_BINDING )
- << get_defs( G_TYPE_BYTES )
- << get_defs( G_TYPE_CHECKSUM )
- << get_defs( G_TYPE_DATE )
- << get_defs( G_TYPE_DATE_TIME )
- << get_defs( G_TYPE_IO_CHANNEL )
- << get_defs( G_TYPE_KEY_FILE )
- << get_defs( G_TYPE_MAIN_CONTEXT )
- << get_defs( G_TYPE_MAIN_LOOP )
- << get_defs( G_TYPE_MATCH_INFO )
- << get_defs( G_TYPE_REGEX )
- << get_defs( G_TYPE_SOURCE )
- << get_defs( G_TYPE_THREAD )
- << get_defs( G_TYPE_VARIANT )
- << get_defs( G_TYPE_VARIANT_BUILDER )
- << get_defs( G_TYPE_VARIANT_DICT )
- << std::endl;
+ std::cout << get_defs(G_TYPE_BINDING) << get_defs(G_TYPE_BYTES) << get_defs(G_TYPE_CHECKSUM)
+ << get_defs(G_TYPE_DATE) << get_defs(G_TYPE_DATE_TIME) << get_defs(G_TYPE_IO_CHANNEL)
+ << get_defs(G_TYPE_KEY_FILE) << get_defs(G_TYPE_MAIN_CONTEXT)
+ << get_defs(G_TYPE_MAIN_LOOP) << get_defs(G_TYPE_MATCH_INFO) << get_defs(G_TYPE_REGEX)
+ << get_defs(G_TYPE_SOURCE) << get_defs(G_TYPE_THREAD) << get_defs(G_TYPE_VARIANT)
+ << get_defs(G_TYPE_VARIANT_BUILDER) << get_defs(G_TYPE_VARIANT_DICT) << std::endl;
return 0;
}
diff --git a/tools/extra_defs_gen/generate_extra_defs.cc b/tools/extra_defs_gen/generate_extra_defs.cc
index abdd437..38f2b05 100644
--- a/tools/extra_defs_gen/generate_extra_defs.cc
+++ b/tools/extra_defs_gen/generate_extra_defs.cc
@@ -19,15 +19,16 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include "generate_extra_defs.h"
#include <algorithm>
-std::string get_property_with_node_name(GParamSpec* pParamSpec, const std::string& strObjectName, const
std::string& strNodeName)
+std::string
+get_property_with_node_name(
+ GParamSpec* pParamSpec, const std::string& strObjectName, const std::string& strNodeName)
{
std::string strResult;
- //Name and type:
+ // Name and type:
const std::string strName = g_param_spec_get_name(pParamSpec);
const std::string strTypeName = G_PARAM_SPEC_TYPE_NAME(pParamSpec);
@@ -41,13 +42,14 @@ std::string get_property_with_node_name(GParamSpec* pParamSpec, const std::strin
strResult += " (prop-type \"" + strTypeName + "\")\n";
strResult += " (docs \"" + strDocs + "\")\n";
- //Flags:
+ // Flags:
GParamFlags flags = pParamSpec->flags;
bool bReadable = (flags & G_PARAM_READABLE) == G_PARAM_READABLE;
bool bWritable = (flags & G_PARAM_WRITABLE) == G_PARAM_WRITABLE;
bool bConstructOnly = (flags & G_PARAM_CONSTRUCT_ONLY) == G_PARAM_CONSTRUCT_ONLY;
- //#t and #f aren't documented, but I guess that it's correct based on the example in the .defs spec.
+ //#t and #f aren't documented, but I guess that it's correct based on the example in the .defs
+ // spec.
const std::string strTrue = "#t";
const std::string strFalse = "#f";
@@ -55,7 +57,7 @@ std::string get_property_with_node_name(GParamSpec* pParamSpec, const std::strin
strResult += " (writable " + (bWritable ? strTrue : strFalse) + ")\n";
strResult += " (construct-only " + (bConstructOnly ? strTrue : strFalse) + ")\n";
- strResult += ")\n\n"; //close (strNodeName
+ strResult += ")\n\n"; // close (strNodeName
return strResult;
}
@@ -63,54 +65,58 @@ std::string get_property_with_node_name(GParamSpec* pParamSpec, const std::strin
// Until the glib bug https://bugzilla.gnome.org/show_bug.cgi?id=465631
// is fixed, get_properties() must be called for a GObject before it's
// called for a GInterface.
-std::string get_properties(GType gtype)
+std::string
+get_properties(GType gtype)
{
std::string strResult;
std::string strObjectName = g_type_name(gtype);
- //Get the list of properties:
+ // Get the list of properties:
GParamSpec** ppParamSpec = nullptr;
guint iCount = 0;
- if(G_TYPE_IS_OBJECT(gtype))
+ if (G_TYPE_IS_OBJECT(gtype))
{
GObjectClass* pGClass = G_OBJECT_CLASS(g_type_class_ref(gtype));
- ppParamSpec = g_object_class_list_properties (pGClass, &iCount);
+ ppParamSpec = g_object_class_list_properties(pGClass, &iCount);
g_type_class_unref(pGClass);
- if(!ppParamSpec)
+ if (!ppParamSpec)
{
- strResult += ";; Warning: g_object_class_list_properties() returned NULL for " +
std::string(g_type_name(gtype)) + "\n";
+ strResult += ";; Warning: g_object_class_list_properties() returned NULL for " +
+ std::string(g_type_name(gtype)) + "\n";
}
}
else if (G_TYPE_IS_INTERFACE(gtype))
{
gpointer pGInterface = g_type_default_interface_ref(gtype);
- if(pGInterface)
+ if (pGInterface)
{
ppParamSpec = g_object_interface_list_properties(pGInterface, &iCount);
g_type_default_interface_unref(pGInterface);
- if(!ppParamSpec)
+ if (!ppParamSpec)
{
- strResult += ";; Warning: g_object_interface_list_properties() returned NULL for " +
std::string(g_type_name(gtype)) + "\n";
+ strResult += ";; Warning: g_object_interface_list_properties() returned NULL for " +
+ std::string(g_type_name(gtype)) + "\n";
}
}
else
- strResult += ";; Warning: g_type_default_interface_ref() returned NULL for " +
std::string(g_type_name(gtype)) + "\n";
+ strResult += ";; Warning: g_type_default_interface_ref() returned NULL for " +
+ std::string(g_type_name(gtype)) + "\n";
}
- //This extra check avoids an occasional crash
- if(!ppParamSpec)
+ // This extra check avoids an occasional crash
+ if (!ppParamSpec)
iCount = 0;
- for(guint i = 0; i < iCount; i++)
+ for (guint i = 0; i < iCount; i++)
{
GParamSpec* pParamSpec = ppParamSpec[i];
// Generate the property if the specified gtype actually owns the property.
// (Generally all properties, including any base classes' properties are
// retrieved by g_object_interface_list_properties() for a given gtype.
// The base classes' properties should not be generated).
- if(pParamSpec && pParamSpec->owner_type == gtype)
+ if (pParamSpec && pParamSpec->owner_type == gtype)
{
strResult += get_property_with_node_name(pParamSpec, strObjectName, "define-property");
}
@@ -121,41 +127,46 @@ std::string get_properties(GType gtype)
return strResult;
}
-bool gtype_is_a_pointer(GType gtype)
+bool
+gtype_is_a_pointer(GType gtype)
{
return (g_type_is_a(gtype, G_TYPE_OBJECT) || g_type_is_a(gtype, G_TYPE_BOXED));
}
-std::string get_type_name(GType gtype, GTypeIsAPointerFunc is_a_pointer_func) //Adds a * if necessary.
+std::string get_type_name(
+ GType gtype, GTypeIsAPointerFunc is_a_pointer_func) // Adds a * if necessary.
{
std::string strTypeName = g_type_name(gtype);
if (is_a_pointer_func && is_a_pointer_func(gtype))
- strTypeName += "*"; //Add * to show that it's a pointer.
- else if( g_type_is_a(gtype, G_TYPE_STRING) )
- strTypeName = "gchar*"; //g_type_name() returns "gchararray".
+ strTypeName += "*"; // Add * to show that it's a pointer.
+ else if (g_type_is_a(gtype, G_TYPE_STRING))
+ strTypeName = "gchar*"; // g_type_name() returns "gchararray".
return strTypeName;
}
-std::string get_type_name_parameter(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
+std::string
+get_type_name_parameter(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
{
std::string strTypeName = get_type_name(gtype, is_a_pointer_func);
- //All signal parameters that are registered as GTK_TYPE_STRING are actually const gchar*.
- if(strTypeName == "gchar*")
+ // All signal parameters that are registered as GTK_TYPE_STRING are actually const gchar*.
+ if (strTypeName == "gchar*")
strTypeName = "const-gchar*";
return strTypeName;
}
-std::string get_type_name_signal(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
+std::string
+get_type_name_signal(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
{
- return get_type_name_parameter(gtype, is_a_pointer_func); //At the moment, it needs the same stuff.
+ return get_type_name_parameter(
+ gtype, is_a_pointer_func); // At the moment, it needs the same stuff.
}
-
-std::string get_signals(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
+std::string
+get_signals(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
{
std::string strResult;
std::string strObjectName = g_type_name(gtype);
@@ -163,105 +174,110 @@ std::string get_signals(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
gpointer gclass_ref = nullptr;
gpointer ginterface_ref = nullptr;
- if(G_TYPE_IS_OBJECT(gtype))
- gclass_ref = g_type_class_ref(gtype); //Ensures that class_init() is called.
- else if(G_TYPE_IS_INTERFACE(gtype))
- ginterface_ref = g_type_default_interface_ref(gtype); //install signals.
+ if (G_TYPE_IS_OBJECT(gtype))
+ gclass_ref = g_type_class_ref(gtype); // Ensures that class_init() is called.
+ else if (G_TYPE_IS_INTERFACE(gtype))
+ ginterface_ref = g_type_default_interface_ref(gtype); // install signals.
- //Get the list of signals:
+ // Get the list of signals:
guint iCount = 0;
- guint* pIDs = g_signal_list_ids (gtype, &iCount);
+ guint* pIDs = g_signal_list_ids(gtype, &iCount);
- //Loop through the list of signals:
- if(pIDs)
+ // Loop through the list of signals:
+ if (pIDs)
{
- for(guint i = 0; i < iCount; i++)
+ for (guint i = 0; i < iCount; i++)
{
guint signal_id = pIDs[i];
- //Name:
+ // Name:
std::string strName = g_signal_name(signal_id);
strResult += "(define-signal " + strName + "\n";
strResult += " (of-object \"" + strObjectName + "\")\n";
-
-
- //Other information about the signal:
- GSignalQuery signalQuery = { 0, nullptr, 0, GSignalFlags(0), 0, 0, nullptr, };
+ // Other information about the signal:
+ GSignalQuery signalQuery = {
+ 0, nullptr, 0, GSignalFlags(0), 0, 0, nullptr,
+ };
g_signal_query(signal_id, &signalQuery);
- //Return type:
- std::string strReturnTypeName = get_type_name_signal( signalQuery.return_type &
~G_SIGNAL_TYPE_STATIC_SCOPE, is_a_pointer_func ); //The type is mangled with a flag. Hacky.
- //bool bReturnTypeHasStaticScope = (signalQuery.return_type & G_SIGNAL_TYPE_STATIC_SCOPE) ==
G_SIGNAL_TYPE_STATIC_SCOPE;
+ // Return type:
+ std::string strReturnTypeName =
+ get_type_name_signal(signalQuery.return_type & ~G_SIGNAL_TYPE_STATIC_SCOPE,
+ is_a_pointer_func); // The type is mangled with a flag. Hacky.
+ // bool bReturnTypeHasStaticScope = (signalQuery.return_type & G_SIGNAL_TYPE_STATIC_SCOPE) ==
+ // G_SIGNAL_TYPE_STATIC_SCOPE;
strResult += " (return-type \"" + strReturnTypeName + "\")\n";
-
- //When:
+ // When:
{
bool bWhenFirst = (signalQuery.signal_flags & G_SIGNAL_RUN_FIRST) == G_SIGNAL_RUN_FIRST;
bool bWhenLast = (signalQuery.signal_flags & G_SIGNAL_RUN_LAST) == G_SIGNAL_RUN_LAST;
std::string strWhen = "unknown";
- if(bWhenFirst && bWhenLast)
+ if (bWhenFirst && bWhenLast)
strWhen = "both";
- else if(bWhenFirst)
+ else if (bWhenFirst)
strWhen = "first";
- else if(bWhenLast)
+ else if (bWhenLast)
strWhen = "last";
strResult += " (when \"" + strWhen + "\")\n";
}
-
- //Loop through the list of parameters:
+ // Loop through the list of parameters:
const GType* pParameters = signalQuery.param_types;
- if(pParameters)
+ if (pParameters)
{
strResult += " (parameters\n";
- for(unsigned j = 0; j < signalQuery.n_params; j++)
+ for (unsigned j = 0; j < signalQuery.n_params; j++)
{
GType typeParamMangled = pParameters[j];
- //Parameter name:
- //We can't get the real parameter name from the GObject system. It's not registered with
g_signal_new().
+ // Parameter name:
+ // We can't get the real parameter name from the GObject system. It's not registered with
+ // g_signal_new().
gchar* pchNum = g_strdup_printf("%d", j);
std::string strParamName = "p" + std::string(pchNum);
g_free(pchNum);
pchNum = nullptr;
- //Just like above, for the return type:
- std::string strTypeName = get_type_name_signal( typeParamMangled & ~G_SIGNAL_TYPE_STATIC_SCOPE,
is_a_pointer_func ); //The type is mangled with a flag. Hacky.
- //bool bTypeHasStaticScope = (typeParamMangled & G_SIGNAL_TYPE_STATIC_SCOPE) ==
G_SIGNAL_TYPE_STATIC_SCOPE;
+ // Just like above, for the return type:
+ std::string strTypeName =
+ get_type_name_signal(typeParamMangled & ~G_SIGNAL_TYPE_STATIC_SCOPE,
+ is_a_pointer_func); // The type is mangled with a flag. Hacky.
+ // bool bTypeHasStaticScope = (typeParamMangled & G_SIGNAL_TYPE_STATIC_SCOPE) ==
+ // G_SIGNAL_TYPE_STATIC_SCOPE;
strResult += " '(\"" + strTypeName + "\" \"" + strParamName + "\")\n";
}
- strResult += " )\n"; //close (parameters
+ strResult += " )\n"; // close (parameters
}
- strResult += ")\n\n"; //close (define-signal
+ strResult += ")\n\n"; // close (define-signal
}
}
g_free(pIDs);
- if(gclass_ref)
- g_type_class_unref(gclass_ref); //to match the g_type_class_ref() above.
- else if(ginterface_ref)
+ if (gclass_ref)
+ g_type_class_unref(gclass_ref); // to match the g_type_class_ref() above.
+ else if (ginterface_ref)
g_type_default_interface_unref(ginterface_ref); // for interface ref above.
return strResult;
}
-
-std::string get_defs(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
+std::string
+get_defs(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
{
std::string strObjectName = g_type_name(gtype);
std::string strDefs;
- if(G_TYPE_IS_OBJECT(gtype) || G_TYPE_IS_INTERFACE(gtype))
+ if (G_TYPE_IS_OBJECT(gtype) || G_TYPE_IS_INTERFACE(gtype))
{
strDefs = ";; From " + strObjectName + "\n\n";
strDefs += get_signals(gtype, is_a_pointer_func);
@@ -269,7 +285,7 @@ std::string get_defs(GType gtype, GTypeIsAPointerFunc is_a_pointer_func)
}
else
strDefs = ";; " + strObjectName +
- " is neither a GObject nor a GInterface. Not checked for signals and properties.\n\n";
+ " is neither a GObject nor a GInterface. Not checked for signals and properties.\n\n";
return strDefs;
}
diff --git a/tools/extra_defs_gen/generate_extra_defs.h b/tools/extra_defs_gen/generate_extra_defs.h
index 1283c2d..dc95262 100644
--- a/tools/extra_defs_gen/generate_extra_defs.h
+++ b/tools/extra_defs_gen/generate_extra_defs.h
@@ -19,7 +19,6 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
#include <glib-object.h>
#include <iostream>
#include <string>
@@ -36,22 +35,19 @@ typedef bool (*GTypeIsAPointerFunc)(GType gtype);
*/
bool gtype_is_a_pointer(GType gtype);
-std::string get_defs(GType gtype,
- GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
+std::string get_defs(GType gtype, GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
-std::string get_property_with_node_name(GParamSpec* pParamSpec,
- const std::string& strObjectName, const std::string& strNodeName);
+std::string get_property_with_node_name(
+ GParamSpec* pParamSpec, const std::string& strObjectName, const std::string& strNodeName);
std::string get_properties(GType gtype);
-std::string get_type_name(GType gtype,
- GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
+std::string get_type_name(GType gtype, GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
-std::string get_type_name_parameter(GType gtype,
- GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
+std::string get_type_name_parameter(
+ GType gtype, GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
-std::string get_type_name_signal(GType gtype,
- GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
+std::string get_type_name_signal(
+ GType gtype, GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
-std::string get_signals(GType gtype,
- GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
+std::string get_signals(GType gtype, GTypeIsAPointerFunc is_a_pointer_func = gtype_is_a_pointer);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
