[glibmm] Gio: Remove NO_GTYPE from some _WRAP_ENUMs
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Gio: Remove NO_GTYPE from some _WRAP_ENUMs
- Date: Mon, 7 Jan 2019 14:31:27 +0000 (UTC)
commit 2b2bec8a8164921f233dbfe4e25c4e4a93e93f10
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Mon Jan 7 15:25:10 2019 +0100
Gio: Remove NO_GTYPE from some _WRAP_ENUMs
NO_GTYPE can't be used in _WRAP_ENUM if the enum is used in _WRAP_PROPERTY.
The error is noticed only during execution of code that calls the generated
property_*() method. Fixes #37
gio/src/application.hg | 2 +-
gio/src/dbusinterfaceskeleton.hg | 2 +-
gio/src/dbusmessage.hg | 2 +-
gio/src/dbusproxy.hg | 2 +-
gio/src/dbusserver.hg | 2 +-
gio/src/enums.hg | 4 ++--
gio/src/mountoperation.hg | 2 +-
gio/src/networkmonitor.hg | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gio/src/application.hg b/gio/src/application.hg
index b08bdb01..584305b7 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -89,7 +89,7 @@ class Application : public Glib::Object, public ActionGroup, public ActionMap
_IMPLEMENTS_INTERFACE(ActionMap)
public:
- _WRAP_ENUM(Flags, GApplicationFlags, NO_GTYPE, s#^FLAGS_##)
+ _WRAP_ENUM(Flags, GApplicationFlags, s#^FLAGS_##)
protected:
/** Constructs an application instance.
diff --git a/gio/src/dbusinterfaceskeleton.hg b/gio/src/dbusinterfaceskeleton.hg
index c027fbae..8ad46930 100644
--- a/gio/src/dbusinterfaceskeleton.hg
+++ b/gio/src/dbusinterfaceskeleton.hg
@@ -44,7 +44,7 @@ class InterfaceSkeleton
_IMPLEMENTS_INTERFACE(Interface)
public:
- _WRAP_ENUM(Flags, GDBusInterfaceSkeletonFlags, NO_GTYPE)
+ _WRAP_ENUM(Flags, GDBusInterfaceSkeletonFlags, gtype_func g_dbus_interface_skeleton_flags_get_type)
_WRAP_METHOD(void flush(), g_dbus_interface_skeleton_flush)
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index 52d12088..544f5e34 100644
--- a/gio/src/dbusmessage.hg
+++ b/gio/src/dbusmessage.hg
@@ -34,7 +34,7 @@ namespace DBus
_WRAP_ENUM(MessageType, GDBusMessageType, NO_GTYPE)
_WRAP_ENUM(MessageFlags, GDBusMessageFlags, NO_GTYPE)
_WRAP_ENUM(MessageHeaderField, GDBusMessageHeaderField, NO_GTYPE)
-_WRAP_ENUM(CapabilityFlags, GDBusCapabilityFlags, NO_GTYPE)
+_WRAP_ENUM(CapabilityFlags, GDBusCapabilityFlags, gtype_func g_dbus_capability_flags_get_type)
_GMMPROC_EXTRA_NAMESPACE(DBus)
diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg
index 332e2296..94f138fa 100644
--- a/gio/src/dbusproxy.hg
+++ b/gio/src/dbusproxy.hg
@@ -33,7 +33,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, NO_GTYPE)
+_WRAP_ENUM(ProxyFlags, GDBusProxyFlags, gtype_func g_dbus_proxy_flags_get_type)
/** 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 217ed96d..bf0105de 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -52,7 +52,7 @@ class Server : public Glib::Object, public Initable
_IMPLEMENTS_INTERFACE(Initable)
public:
- _WRAP_ENUM(Flags, GDBusServerFlags, NO_GTYPE)
+ _WRAP_ENUM(Flags, GDBusServerFlags, gtype_func g_dbus_server_flags_get_type)
protected:
Server(const std::string& address,
diff --git a/gio/src/enums.hg b/gio/src/enums.hg
index d3062254..b46b7fe6 100644
--- a/gio/src/enums.hg
+++ b/gio/src/enums.hg
@@ -23,8 +23,8 @@ namespace Gio
{
// BIG_ENDIAN and LITTLE_ENDIAN are defined as preprocessor macros somewhere.
-_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, NO_GTYPE, s#ENDIAN$#ENDIAN_ORDER#)
-_WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType, NO_GTYPE)
+_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, s#ENDIAN$#ENDIAN_ORDER#)
+_WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType)
_WRAP_ENUM(SocketFamily, GSocketFamily)
_WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode)
_WRAP_ENUM(TlsCertificateFlags, GTlsCertificateFlags)
diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg
index 17b74a8d..cf16c62f 100644
--- a/gio/src/mountoperation.hg
+++ b/gio/src/mountoperation.hg
@@ -24,7 +24,7 @@ namespace Gio
{
_WRAP_ENUM(AskPasswordFlags, GAskPasswordFlags, NO_GTYPE)
-_WRAP_ENUM(PasswordSave, GPasswordSave, NO_GTYPE)
+_WRAP_ENUM(PasswordSave, GPasswordSave)
_WRAP_ENUM(MountOperationResult, GMountOperationResult, NO_GTYPE)
/** Authentication methods for mountable locations.
diff --git a/gio/src/networkmonitor.hg b/gio/src/networkmonitor.hg
index d46cbba1..7c36b2cf 100644
--- a/gio/src/networkmonitor.hg
+++ b/gio/src/networkmonitor.hg
@@ -31,7 +31,7 @@ typedef struct _GNetworkMonitorInterface GNetworkMonitorInterface;
namespace Gio
{
-_WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity, NO_GTYPE)
+_WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity)
/** Network status monitor.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]