diff options
author | Murray Cumming <murrayc@murrayc.com> | 2010-09-03 22:54:39 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2010-09-03 22:54:39 +0200 |
commit | 1874b5025083dbc46111c6a0fcd36697ecda47ad (patch) | |
tree | 14d346787d67f8d1e5ad24951a71d1a985a2052c /gio | |
parent | 0c4e2bcbd9f677db0b5fa48a6756c461e00c67be (diff) | |
download | glibmm-1874b5025083dbc46111c6a0fcd36697ecda47ad.tar.gz |
gmmproc: Fix the annoying warnings about documentation.
* tools/pm/GtkDefs.pm: lookup_object(): Do not print a warning when the
object is found, because this is used when guessing an object name while
breaking apart a function name in DocsParser.pm.
* gio/src/filelist.am:
* gio/src/gio.defs:
* gio/src/gio_extra_objects.defs:
* glib/src/filelist.am:
* glib/src/glib.defs:
* glib/src/glib_extra_objects.defs: Added the *extra_objects.defs files,
with hand-coded define-object sections, for objects that hide their *Class
or *Iface struct declarations, which stops h2defs.py from generating
define-object sections.
These allows DocsParser.pm to know how to split mentions of C functions into
the object and the method, so it can guess the C++ method name to mention
instead.
Diffstat (limited to 'gio')
-rw-r--r-- | gio/src/filelist.am | 1 | ||||
-rw-r--r-- | gio/src/gio.defs | 1 | ||||
-rw-r--r-- | gio/src/gio_extra_objects.defs | 84 |
3 files changed, 86 insertions, 0 deletions
diff --git a/gio/src/filelist.am b/gio/src/filelist.am index c55ed263..39545da1 100644 --- a/gio/src/filelist.am +++ b/gio/src/filelist.am @@ -4,6 +4,7 @@ giomm_files_defs = \ gio.defs \ gio_enums.defs \ gio_methods.defs \ + gio_extra_objects.defs \ gio_unix_functions.defs \ gio_others.defs \ gio_signals.defs \ diff --git a/gio/src/gio.defs b/gio/src/gio.defs index 8d30ed18..d2620139 100644 --- a/gio/src/gio.defs +++ b/gio/src/gio.defs @@ -1,5 +1,6 @@ (include gio_methods.defs) (include gio_unix_functions.defs) +(include gio_extra_objects.defs) (include gio_others.defs) (include gio_enums.defs) (include gio_signals.defs) diff --git a/gio/src/gio_extra_objects.defs b/gio/src/gio_extra_objects.defs new file mode 100644 index 00000000..b60825b0 --- /dev/null +++ b/gio/src/gio_extra_objects.defs @@ -0,0 +1,84 @@ +; These define-object declarations were not generated by h2defs.py +; because it looks for the SomethingClass declaration too, but that is often +; hidden. +; However, it is needed by the documentation generation, which needs to +; know what objects exist, so it can guess how to break apart C function names +; that are mentioned in documentation text. +; (DocsParser.pm:substitute_function(), which uses GtkDefs.pm:lookup_object().) + +(define-object DBusConnection + (in-module "GLib") + (c-name "GDBusConnection") + (gtype-id "G_TYPE_DBUS_CONNECTION") +) + +; This helps DocParser.pm, which can't always guess how to break the "DB" part. +(define-object DbusConnection + (in-module "GLib") + (c-name "GDbusConnection") + (gtype-id "G_TYPE_DBUS_CONNECTION") +) + +(define-object DBusMessage + (in-module "GLib") + (c-name "GDBusMessage") + (gtype-id "G_TYPE_DBUS_MESSAGE") +) + +; This helps DocParser.pm, which can't always guess how to break the "DB" part. +(define-object DbusMessage + (in-module "GLib") + (c-name "GDbusMessage") + (gtype-id "G_TYPE_DBUS_MESSAGE") +) + + +(define-object DBusMethodInvocation + (in-module "GLib") + (c-name "GDBusMethodInvocation") + (gtype-id "G_TYPE_DBUS_METHOD_INVOCATION") +) + +(define-object DBusServer + (in-module "GLib") + (c-name "GDBusServer") + (gtype-id "G_TYPE_DBUS_SERVER") +) + +; This helps DocParser.pm, which can't always guess how to break the "DB" part. +(define-object DbusServer + (in-module "GLib") + (c-name "GDbusServer") + (gtype-id "G_TYPE_DBUS_SERVER") +) + +(define-object DBusMethodInvocation + (in-module "GLib") + (c-name "GDBusMethodInvocation") + (gtype-id "G_TYPE_DBUS_METHOD_INVOCATION") +) + +(define-object DesktopAppInfo + (in-module "GLib") + (c-name "GDesktopAppInfo") + (gtype-id "G_TYPE_DESKTOP_APP_INFO") +) + +(define-object FileAttribute + (in-module "GLib") + (c-name "GFileAttribute") + (gtype-id "G_TYPE_FILE_ATTRIBUTE") +) + +(define-object FileAttributeInfoList + (in-module "GLib") + (c-name "GFileAttributeInfoList") + (gtype-id "G_TYPE_FILE_ATTRIBUTE_INFO_LISt") +) + +(define-object FileInfo + (in-module "GLib") + (c-name "GFileInfo") + (gtype-id "G_TYPE_FILE_INFO") +) + |