diff options
author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2015-02-16 11:15:06 +0100 |
---|---|---|
committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2015-02-16 11:15:06 +0100 |
commit | fe4ce8e58b523935166fdd7eb074719d2f22f829 (patch) | |
tree | e3c9109addd414d041d765f4e5b8f3c6f4ef6855 | |
parent | 0cfe1b6f779aad7f5e9416cc21c204c93bca6bff (diff) | |
download | glibmm-fe4ce8e58b523935166fdd7eb074719d2f22f829.tar.gz |
Delete obsolete .defs files
* gio/src/filelist.am: Remove gio_others.defs.
* gio/src/gio_methods.defs.patch: Deleted, not used.
* gio/src/gio_others.defs: Deleted, not used.
* glib/src/filelist.am: Remove glib_deprecated_enums.defs and gobject.defs.
* glib/src/glib.defs: Remove glib_deprecated_functions.defs and
glib_deprecated_enums.defs.
* glib/src/glib_deprecated_enums.defs: Deleted, not needed.
* glib/src/glib_deprecated_functions.defs: Deleted, not needed.
* glib/src/gobject.defs: Deleted, not used.
-rw-r--r-- | gio/src/filelist.am | 1 | ||||
-rw-r--r-- | gio/src/gio_methods.defs.patch | 66 | ||||
-rw-r--r-- | gio/src/gio_others.defs | 44 | ||||
-rw-r--r-- | glib/src/filelist.am | 2 | ||||
-rw-r--r-- | glib/src/glib.defs | 2 | ||||
-rw-r--r-- | glib/src/glib_deprecated_enums.defs | 22 | ||||
-rw-r--r-- | glib/src/glib_deprecated_functions.defs | 50 | ||||
-rw-r--r-- | glib/src/gobject.defs | 3 |
8 files changed, 0 insertions, 190 deletions
diff --git a/gio/src/filelist.am b/gio/src/filelist.am index 76a587f2..f2a18bb5 100644 --- a/gio/src/filelist.am +++ b/gio/src/filelist.am @@ -6,7 +6,6 @@ giomm_files_defs = \ gio_methods.defs \ gio_extra_objects.defs \ gio_unix_functions.defs \ - gio_others.defs \ gio_signals.defs \ gio_vfuncs.defs \ gio_docs.xml \ diff --git a/gio/src/gio_methods.defs.patch b/gio/src/gio_methods.defs.patch deleted file mode 100644 index 4c6711fd..00000000 --- a/gio/src/gio_methods.defs.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- gio_methods.defs 2011-06-19 18:23:06.000000000 -0400 -+++ gio_methods_new.defs 2011-06-19 18:21:21.000000000 -0400 -@@ -867,8 +867,8 @@ - (c-name "GFileQueryInfoFlags") - (gtype-id "G_TYPE_FILE_QUERY_INFO_FLAGS") - (values -- '("ne" "G_FILE_QUERY_INFO_NONE") -- '("follow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS") -+ '("none" "G_FILE_QUERY_INFO_NONE") -+ '("nofollow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS") - ) - ) - -@@ -888,7 +888,7 @@ - (c-name "GMountMountFlags") - (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") - (values -- '("e" "G_MOUNT_MOUNT_NONE") -+ '("none" "G_MOUNT_MOUNT_NONE") - ) - ) - -@@ -907,7 +907,7 @@ - (c-name "GDriveStartFlags") - (gtype-id "G_TYPE_DRIVE_START_FLAGS") - (values -- '("e" "G_DRIVE_START_NONE") -+ '("none" "G_DRIVE_START_NONE") - ) - ) - -@@ -1321,8 +1321,8 @@ - (c-name "GDBusCallFlags") - (gtype-id "G_TYPE_D_BUS_CALL_FLAGS") - (values -- '("ne" "G_DBUS_CALL_FLAGS_NONE") -- '("-auto-start" "G_DBUS_CALL_FLAGS_NO_AUTO_START") -+ '("none" "G_DBUS_CALL_FLAGS_NONE") -+ '("no-auto-start" "G_DBUS_CALL_FLAGS_NO_AUTO_START") - ) - ) - -@@ -1344,9 +1344,9 @@ - (c-name "GDBusMessageFlags") - (gtype-id "G_TYPE_D_BUS_MESSAGE_FLAGS") - (values -- '("ne" "G_DBUS_MESSAGE_FLAGS_NONE") -- '("-reply-expected" "G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED") -- '("-auto-start" "G_DBUS_MESSAGE_FLAGS_NO_AUTO_START") -+ '("none" "G_DBUS_MESSAGE_FLAGS_NONE") -+ '("no-reply-expected" "G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED") -+ '("no-auto-start" "G_DBUS_MESSAGE_FLAGS_NO_AUTO_START") - ) - ) - -@@ -1405,8 +1405,8 @@ - (c-name "GDBusSignalFlags") - (gtype-id "G_TYPE_D_BUS_SIGNAL_FLAGS") - (values -- '("ne" "G_DBUS_SIGNAL_FLAGS_NONE") -- '("-match-rule" "G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE") -+ '("none" "G_DBUS_SIGNAL_FLAGS_NONE") -+ '("no-match-rule" "G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE") - ) - ) - diff --git a/gio/src/gio_others.defs b/gio/src/gio_others.defs deleted file mode 100644 index 43e27c83..00000000 --- a/gio/src/gio_others.defs +++ /dev/null @@ -1,44 +0,0 @@ -; h2defs.py does not generate this. murrayc. -(define-function g_themed_icon_get_names - (c-name "g_themed_icon_get_names") - (return-type "const-char*const*") -) - -; h2defs failed to generate this murrayc: -(define-method get_environ - (of-object "GApplicationCommandLine") - (c-name "g_application_command_line_get_environ") - (return-type "const-gchar*const*") -) - -(define-method list_schemas - (of-object "GSettingsBackend") - (c-name "g_settings_list_schemas") - (return-type "const-gchar*const*") -) - -; extra_defs does not generate these, for some reason. murrayc: -(define-signal changed - (of-object "GMount") - (return-type "void") - (when "last") -) - -(define-signal unmounted - (of-object "GMount") - (return-type "void") - (when "last") -) - -; extra_defs does not generate these, for some reason. murrayc: -(define-signal changed - (of-object "GVolume") - (return-type "void") - (when "last") -) - -(define-signal removed - (of-object "GVolume") - (return-type "void") - (when "last") -) diff --git a/glib/src/filelist.am b/glib/src/filelist.am index c66e01b0..133f6bef 100644 --- a/glib/src/filelist.am +++ b/glib/src/filelist.am @@ -3,13 +3,11 @@ glibmm_files_defs = \ glib.defs \ glib_enums.defs \ - glib_deprecated_enums.defs \ glib_functions.defs \ glib_extra_objects.defs \ glib_signals.defs \ gmodule_enums.defs \ gmodule_functions.defs \ - gobject.defs \ gobject_enums.defs \ gobject_functions.defs \ glib_docs.xml \ diff --git a/glib/src/glib.defs b/glib/src/glib.defs index e106d6b7..dd679a35 100644 --- a/glib/src/glib.defs +++ b/glib/src/glib.defs @@ -1,7 +1,5 @@ (include glib_functions.defs) -(include glib_deprecated_functions.defs) (include glib_enums.defs) -(include glib_deprecated_enums.defs) (include glib_extra_objects.defs) (include glib_signals.defs) (include gobject_enums.defs) diff --git a/glib/src/glib_deprecated_enums.defs b/glib/src/glib_deprecated_enums.defs deleted file mode 100644 index b80fc58c..00000000 --- a/glib/src/glib_deprecated_enums.defs +++ /dev/null @@ -1,22 +0,0 @@ -;; From gthread.h - -;; Original typedef: -;; typedef enum -;; { -;; G_THREAD_PRIORITY_LOW, -;; G_THREAD_PRIORITY_NORMAL, -;; G_THREAD_PRIORITY_HIGH, -;; G_THREAD_PRIORITY_URGENT -;; } GThreadPriority; - -(define-enum-extended ThreadPriority - (in-module "G") - (c-name "GThreadPriority") - (values - '("low" "G_THREAD_PRIORITY_LOW" "0") - '("normal" "G_THREAD_PRIORITY_NORMAL" "1") - '("high" "G_THREAD_PRIORITY_HIGH" "2") - '("urgent" "G_THREAD_PRIORITY_URGENT" "3") - ) -) - diff --git a/glib/src/glib_deprecated_functions.defs b/glib/src/glib_deprecated_functions.defs deleted file mode 100644 index eb230a6e..00000000 --- a/glib/src/glib_deprecated_functions.defs +++ /dev/null @@ -1,50 +0,0 @@ -;; -*- scheme -*- -; object definitions ... -;; Enumerations and flags ... - -(define-enum Priority - (in-module "GThread") - (c-name "GThreadPriority") - (gtype-id "G_TYPE_THREAD_PRIORITY") - (values - '("low" "G_THREAD_PRIORITY_LOW") - '("normal" "G_THREAD_PRIORITY_NORMAL") - '("high" "G_THREAD_PRIORITY_HIGH") - '("urgent" "G_THREAD_PRIORITY_URGENT") - ) -) - - -;; From gallocator.h - - - -;; From gcache.h - - - -;; From gcompletion.h - - - -;; From grel.h - - - -;; From gthread.h - -(define-function guint64 - (c-name "guint64") - (return-type "GLIB_VAR") - (parameters - '("*" "g_thread_gettime") - ) -) - -(define-method get_mutex_impl - (of-object "GStaticMutex") - (c-name "g_static_mutex_get_mutex_impl") - (return-type "GMutex*") -) - - diff --git a/glib/src/gobject.defs b/glib/src/gobject.defs deleted file mode 100644 index 0c9f4b99..00000000 --- a/glib/src/gobject.defs +++ /dev/null @@ -1,3 +0,0 @@ -(include gobject_functions.defs) -(include gobject_enums.defs) - |