Glib, Gio: Remove obsolete substitutions in _WRAP_ENUM

Some substitution arguments in _WRAP_ENUM (s#old#new#) have become
unnecessary now that _WRAP_ENUM generates code with enum class.

8 files changed, 15 insertions, 25 deletions

diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index dc863020..c779cc5f 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -43,11 +43,11 @@ namespace DBus
 {
 
 _WRAP_ENUM(BusType, GBusType)
-_WRAP_ENUM(CallFlags, GDBusCallFlags, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(ConnectionFlags, GDBusConnectionFlags, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(SendMessageFlags, GDBusSendMessageFlags, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(SignalFlags, GDBusSignalFlags, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(SubtreeFlags, GDBusSubtreeFlags, s#^DBUS_##, NO_GTYPE)
+_WRAP_ENUM(CallFlags, GDBusCallFlags, NO_GTYPE)
+_WRAP_ENUM(ConnectionFlags, GDBusConnectionFlags, NO_GTYPE)
+_WRAP_ENUM(SendMessageFlags, GDBusSendMessageFlags, NO_GTYPE)
+_WRAP_ENUM(SignalFlags, GDBusSignalFlags, NO_GTYPE)
+_WRAP_ENUM(SubtreeFlags, GDBusSubtreeFlags, NO_GTYPE)
 
 _GMMPROC_EXTRA_NAMESPACE(DBus)
 
diff --git a/gio/src/dbusintrospection.hg b/gio/src/dbusintrospection.hg
index 9d252441..a99d4e37 100644
--- a/gio/src/dbusintrospection.hg
+++ b/gio/src/dbusintrospection.hg
@@ -28,7 +28,7 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(PropertyInfoFlags, GDBusPropertyInfoFlags, s#^DBUS_##, NO_GTYPE)
+_WRAP_ENUM(PropertyInfoFlags, GDBusPropertyInfoFlags, NO_GTYPE)
 
 /** Stores information about an annotation.
  *
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index 5df3ca2d..7ae6f32f 100644
--- a/gio/src/dbusmessage.hg
+++ b/gio/src/dbusmessage.hg
@@ -32,10 +32,10 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(MessageType, GDBusMessageType, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(MessageFlags, GDBusMessageFlags, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(MessageHeaderField, GDBusMessageHeaderField, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(CapabilityFlags, GDBusCapabilityFlags, s#^DBUS_##, NO_GTYPE)
+_WRAP_ENUM(MessageType, GDBusMessageType, NO_GTYPE)
+_WRAP_ENUM(MessageFlags, GDBusMessageFlags, NO_GTYPE)
+_WRAP_ENUM(MessageHeaderField, GDBusMessageHeaderField, NO_GTYPE)
+_WRAP_ENUM(CapabilityFlags, GDBusCapabilityFlags, NO_GTYPE)
 
 _GMMPROC_EXTRA_NAMESPACE(DBus)
 
diff --git a/gio/src/dbusownname.hg b/gio/src/dbusownname.hg
index 63ddac93..596171e2 100644
--- a/gio/src/dbusownname.hg
+++ b/gio/src/dbusownname.hg
@@ -25,7 +25,7 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(BusNameOwnerFlags, GBusNameOwnerFlags, s#^DBUS_##)
+_WRAP_ENUM(BusNameOwnerFlags, GBusNameOwnerFlags)
 
 /** For example,
  * void on_bus_acquired(const Glib::RefPtr<Gio::DBus::Connection>& connection,
diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg
index 8d428d56..bedcb835 100644
--- a/gio/src/dbusproxy.hg
+++ b/gio/src/dbusproxy.hg
@@ -34,7 +34,7 @@ namespace DBus
 //The GMMPROC_EXTRA_NAMESPACE() macro is a hint to generate_wrap_init.pl to put it in the DBus sub-namespace
 _GMMPROC_EXTRA_NAMESPACE(DBus)
 
-_WRAP_ENUM(ProxyFlags, GDBusProxyFlags, s#^DBUS_##, NO_GTYPE)
+_WRAP_ENUM(ProxyFlags, GDBusProxyFlags, NO_GTYPE)
 
 /** A client-side proxy.
  * This is a base class used for proxies to access a D-Bus interface on
diff --git a/gio/src/dbusserver.hg b/gio/src/dbusserver.hg
index d998edfb..64aefa00 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -29,7 +29,7 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(ServerFlags, GDBusServerFlags, s#^DBUS_##, NO_GTYPE)
+_WRAP_ENUM(ServerFlags, GDBusServerFlags, NO_GTYPE)
 
 _GMMPROC_EXTRA_NAMESPACE(DBus)
 
diff --git a/gio/src/dbuswatchname.hg b/gio/src/dbuswatchname.hg
index f68102ab..46d95d8a 100644
--- a/gio/src/dbuswatchname.hg
+++ b/gio/src/dbuswatchname.hg
@@ -25,7 +25,7 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(BusNameWatcherFlags, GBusNameWatcherFlags, s#^DBUS_##, NO_GTYPE)
+_WRAP_ENUM(BusNameWatcherFlags, GBusNameWatcherFlags, NO_GTYPE)
 
 /** For example,
  * void on_name_appeared(const Glib::RefPtr<Gio::DBus::Connection>& connection,
diff --git a/glib/src/markup.hg b/glib/src/markup.hg
index 1075f690..6f745f52 100644
--- a/glib/src/markup.hg
+++ b/glib/src/markup.hg
@@ -110,17 +110,7 @@ using Error = Glib::MarkupError;
  */
 Glib::ustring escape_text(const Glib::ustring& text);
 
-
-/** There are no flags right now. Pass <tt>Glib::Markup::ParseFlags(0)</tt> for
- * the flags argument to all functions (this should be the default argument
- * anyway).
- */
-_WRAP_ENUM(ParseFlags, GMarkupParseFlags, NO_GTYPE, s#^MARKUP_##)
-
-/*! @var Markup::ParseFlags DO_NOT_USE_THIS_UNSUPPORTED_FLAG
- * Flag you should not use.
- */
-
+_WRAP_ENUM(ParseFlags, GMarkupParseFlags, NO_GTYPE)
 
 /** Binary predicate used by Markup::Parser::AttributeMap.
  * @ingroup Markup