Commit 2b2bec8a authored by Kjell Ahlstedt's avatar Kjell Ahlstedt

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
parent 6e166f08
......@@ -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.
......
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
......@@ -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,
......
......@@ -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)
......
......@@ -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.
......
......@@ -31,7 +31,7 @@ typedef struct _GNetworkMonitorInterface GNetworkMonitorInterface;
namespace Gio
{
_WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity, NO_GTYPE)
_WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity)
/** Network status monitor.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment