GNOME.org
 

[glibmm/export-more-symbols-2-64: 8/9] gio/src: Apply `decl_prefix GIOMM_API` to _WRAP_ENUM

commit 0b3e3e82dfa40dcf92e1eec1731c5f93b96415b0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Mar 30 19:12:09 2020 +0800

    gio/src: Apply `decl_prefix GIOMM_API` to _WRAP_ENUM
    
    This way, we can ensure that the headers generated with gmmproc marks
    the template<> classes with GIOMM_API, so that we can export them in
    Visual Studio builds.
    
    Note that for those _WRAP_ENUM calls marked with NO_GTYPE, there is no
    need to add 'decl_prefix ...'.

 gio/src/application.hg             |  2 +-
 gio/src/converter.hg               |  4 ++--
 gio/src/dbusconnection.hg          |  4 ++--
 gio/src/dbusinterfaceskeleton.hg   |  2 +-
 gio/src/dbusmessage.hg             |  2 +-
 gio/src/dbusobjectmanagerclient.hg |  2 +-
 gio/src/dbusownname.hg             |  2 +-
 gio/src/dbusproxy.hg               |  2 +-
 gio/src/dbusserver.hg              |  2 +-
 gio/src/drive.hg                   |  4 ++--
 gio/src/enums.hg                   | 12 +++++++-----
 gio/src/fileattributeinfo.hg       |  6 +++---
 gio/src/mountoperation.hg          |  2 +-
 gio/src/networkmonitor.hg          |  2 +-
 gio/src/notification.hg            |  2 +-
 gio/src/resolver.hg                |  2 +-
 gio/src/resource.hg                |  4 ++--
 gio/src/settings.hg                |  2 +-
 gio/src/socket.hg                  |  6 +++---
 gio/src/socketclient.hg            |  2 +-
 gio/src/tlsconnection.hg           |  2 +-
 gio/src/tlsdatabase.hg             |  4 ++--
 gio/src/tlsinteraction.hg          |  4 ++--
 gio/src/tlspassword.hg             |  2 +-
 gio/src/unixsocketaddress.hg       |  2 +-
 gio/src/zlibcompressor.hg          |  2 +-
 26 files changed, 42 insertions(+), 40 deletions(-)
---
diff --git a/gio/src/application.hg b/gio/src/application.hg
index a8bf9660..01fa1490 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -34,7 +34,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(ApplicationFlags, GApplicationFlags)
+_WRAP_ENUM(ApplicationFlags, GApplicationFlags, decl_prefix GIOMM_API)
 
 /** Application - Core application class.
  * An Application is the foundation of an application, unique for a given
diff --git a/gio/src/converter.hg b/gio/src/converter.hg
index ce0691c2..e218fbd0 100644
--- a/gio/src/converter.hg
+++ b/gio/src/converter.hg
@@ -29,8 +29,8 @@ typedef struct _GConverterIface GConverterIface;
 namespace Gio
 {
 
-_WRAP_ENUM(ConverterResult, GConverterResult)
-_WRAP_ENUM(ConverterFlags, GConverterFlags)
+_WRAP_ENUM(ConverterResult, GConverterResult, decl_prefix GIOMM_API)
+_WRAP_ENUM(ConverterFlags, GConverterFlags, decl_prefix GIOMM_API)
 
 /** Converter - Data conversion interface.
  * Converter is implemented by objects that convert binary data in various
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 1cc7a376..e83899c3 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -41,9 +41,9 @@ class GIOMM_API UnixFDList;
 namespace DBus
 {
 
-_WRAP_ENUM(BusType, GBusType)
+_WRAP_ENUM(BusType, GBusType, decl_prefix GIOMM_API)
 _WRAP_ENUM(CallFlags, GDBusCallFlags, s#^DBUS_##, NO_GTYPE)
-_WRAP_ENUM(ConnectionFlags, GDBusConnectionFlags, s#^DBUS_##, gtype_func g_dbus_connection_flags_get_type)
+_WRAP_ENUM(ConnectionFlags, GDBusConnectionFlags, s#^DBUS_##, gtype_func g_dbus_connection_flags_get_type, 
decl_prefix GIOMM_API)
 _WRAP_ENUM(SendMessageFlags, GDBusSendMessageFlags, s#^DBUS_##, NO_GTYPE)
 _WRAP_ENUM(SignalFlags, GDBusSignalFlags, s#^DBUS_##, NO_GTYPE)
 _WRAP_ENUM(SubtreeFlags, GDBusSubtreeFlags, s#^DBUS_##, NO_GTYPE)
diff --git a/gio/src/dbusinterfaceskeleton.hg b/gio/src/dbusinterfaceskeleton.hg
index 287c363d..bcf51593 100644
--- a/gio/src/dbusinterfaceskeleton.hg
+++ b/gio/src/dbusinterfaceskeleton.hg
@@ -27,7 +27,7 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(InterfaceSkeletonFlags, GDBusInterfaceSkeletonFlags, gtype_func 
g_dbus_interface_skeleton_flags_get_type)
+_WRAP_ENUM(InterfaceSkeletonFlags, GDBusInterfaceSkeletonFlags, gtype_func 
g_dbus_interface_skeleton_flags_get_type, decl_prefix GIOMM_API)
 
 class GIOMM_API InterfaceInfo;
 class GIOMM_API Connection;
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index 0c364f10..d31a4672 100644
--- a/gio/src/dbusmessage.hg
+++ b/gio/src/dbusmessage.hg
@@ -36,7 +36,7 @@ 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_##, gtype_func g_dbus_capability_flags_get_type)
+_WRAP_ENUM(CapabilityFlags, GDBusCapabilityFlags, s#^DBUS_##, gtype_func g_dbus_capability_flags_get_type, 
decl_prefix GIOMM_API)
 
 _GMMPROC_EXTRA_NAMESPACE(DBus)
 
diff --git a/gio/src/dbusobjectmanagerclient.hg b/gio/src/dbusobjectmanagerclient.hg
index c05c742d..3ea04206 100644
--- a/gio/src/dbusobjectmanagerclient.hg
+++ b/gio/src/dbusobjectmanagerclient.hg
@@ -32,7 +32,7 @@ namespace Gio
 namespace DBus
 {
 _WRAP_ENUM(ObjectManagerClientFlags, GDBusObjectManagerClientFlags, s#^DBUS_##,
-  gtype_func g_dbus_object_manager_client_flags_get_type)
+  gtype_func g_dbus_object_manager_client_flags_get_type, decl_prefix GIOMM_API)
 
 //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)
diff --git a/gio/src/dbusownname.hg b/gio/src/dbusownname.hg
index 2f476831..517583e1 100644
--- a/gio/src/dbusownname.hg
+++ b/gio/src/dbusownname.hg
@@ -26,7 +26,7 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(BusNameOwnerFlags, GBusNameOwnerFlags, s#^DBUS_##)
+_WRAP_ENUM(BusNameOwnerFlags, GBusNameOwnerFlags, s#^DBUS_##, decl_prefix GIOMM_API)
 
 /** 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 3a31a141..a0f1cdc3 100644
--- a/gio/src/dbusproxy.hg
+++ b/gio/src/dbusproxy.hg
@@ -32,7 +32,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_##, gtype_func g_dbus_proxy_flags_get_type)
+_WRAP_ENUM(ProxyFlags, GDBusProxyFlags, s#^DBUS_##, gtype_func g_dbus_proxy_flags_get_type, decl_prefix 
GIOMM_API)
 
 /** 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 f983350c..964f2aa2 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -28,7 +28,7 @@ namespace Gio
 namespace DBus
 {
 
-_WRAP_ENUM(ServerFlags, GDBusServerFlags, s#^DBUS_##, gtype_func g_dbus_server_flags_get_type)
+_WRAP_ENUM(ServerFlags, GDBusServerFlags, s#^DBUS_##, gtype_func g_dbus_server_flags_get_type, decl_prefix 
GIOMM_API)
 
 _GMMPROC_EXTRA_NAMESPACE(DBus)
 
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index 21d28563..8e48bc9b 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -31,8 +31,8 @@ typedef struct _GDriveIface GDriveIface;
 namespace Gio
 {
 
-_WRAP_ENUM(DriveStartFlags, GDriveStartFlags)
-_WRAP_ENUM(DriveStartStopType, GDriveStartStopType)
+_WRAP_ENUM(DriveStartFlags, GDriveStartFlags, decl_prefix GIOMM_API)
+_WRAP_ENUM(DriveStartStopType, GDriveStartStopType, decl_prefix GIOMM_API)
 
 /** Virtual File System drive management.
  *
diff --git a/gio/src/enums.hg b/gio/src/enums.hg
index a80830b9..02b1b0c2 100644
--- a/gio/src/enums.hg
+++ b/gio/src/enums.hg
@@ -14,6 +14,8 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+_CONFIGINCLUDE(giommconfig.h)
+
 #include <gio/gio.h>
 #include <glibmm/value.h>
 
@@ -22,11 +24,11 @@ _DEFS(giomm,gio)
 namespace Gio
 {
 
-_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder)
-_WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType)
+_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, decl_prefix GIOMM_API)
+_WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType, decl_prefix GIOMM_API)
 _WRAP_ENUM(ErrorEnum, GIOErrorEnum, NO_GTYPE)
-_WRAP_ENUM(SocketFamily, GSocketFamily)
-_WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode)
-_WRAP_ENUM(TlsCertificateFlags, GTlsCertificateFlags)
+_WRAP_ENUM(SocketFamily, GSocketFamily, decl_prefix GIOMM_API)
+_WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode, decl_prefix GIOMM_API)
+_WRAP_ENUM(TlsCertificateFlags, GTlsCertificateFlags, decl_prefix GIOMM_API)
 
 } // namespace Gio
diff --git a/gio/src/fileattributeinfo.hg b/gio/src/fileattributeinfo.hg
index 4fd21f8b..6ffb00b2 100644
--- a/gio/src/fileattributeinfo.hg
+++ b/gio/src/fileattributeinfo.hg
@@ -25,9 +25,9 @@ _DEFS(giomm,gio)
 namespace Gio
 {
 
-_WRAP_ENUM(FileAttributeType, GFileAttributeType)
-_WRAP_ENUM(FileAttributeInfoFlags, GFileAttributeInfoFlags)
-_WRAP_ENUM(FileAttributeStatus, GFileAttributeStatus)
+_WRAP_ENUM(FileAttributeType, GFileAttributeType, decl_prefix GIOMM_API)
+_WRAP_ENUM(FileAttributeInfoFlags, GFileAttributeInfoFlags, decl_prefix GIOMM_API)
+_WRAP_ENUM(FileAttributeStatus, GFileAttributeStatus, decl_prefix GIOMM_API)
 
 
 /** Information about a specific attribute - see FileAttributeInfoList.
diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg
index c45a4282..2429dec3 100644
--- a/gio/src/mountoperation.hg
+++ b/gio/src/mountoperation.hg
@@ -27,7 +27,7 @@ namespace Gio
 {
 
 _WRAP_ENUM(AskPasswordFlags, GAskPasswordFlags, NO_GTYPE)
-_WRAP_ENUM(PasswordSave, GPasswordSave)
+_WRAP_ENUM(PasswordSave, GPasswordSave, decl_prefix GIOMM_API)
 _WRAP_ENUM(MountOperationResult, GMountOperationResult, NO_GTYPE)
 
 /** Authentication methods for mountable locations.
diff --git a/gio/src/networkmonitor.hg b/gio/src/networkmonitor.hg
index b376e47c..4e4e424f 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)
+_WRAP_ENUM(NetworkConnectivity, GNetworkConnectivity, decl_prefix GIOMM_API)
 
 /** Network status monitor.
  *
diff --git a/gio/src/notification.hg b/gio/src/notification.hg
index 8e65c90b..ded9abca 100644
--- a/gio/src/notification.hg
+++ b/gio/src/notification.hg
@@ -27,7 +27,7 @@ namespace Gio
 {
 class GIOMM_API Icon;
 
-_WRAP_ENUM(NotificationPriority, GNotificationPriority, newin "2,44")
+_WRAP_ENUM(NotificationPriority, GNotificationPriority, newin "2,44", decl_prefix GIOMM_API)
 
 /** User Notifications (pop up messages).
  *
diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg
index 599ecb92..4e70915a 100644
--- a/gio/src/resolver.hg
+++ b/gio/src/resolver.hg
@@ -35,7 +35,7 @@ class GLIBMM_API VariantContainerBase;
 namespace Gio
 {
 
-_WRAP_ENUM(ResolverRecordType, GResolverRecordType)
+_WRAP_ENUM(ResolverRecordType, GResolverRecordType, decl_prefix GIOMM_API)
 
 /** Asynchronous and cancellable DNS resolver
  *
diff --git a/gio/src/resource.hg b/gio/src/resource.hg
index 88855145..0a8ec5e6 100644
--- a/gio/src/resource.hg
+++ b/gio/src/resource.hg
@@ -34,8 +34,8 @@ namespace Gio
  */
 _WRAP_GERROR(ResourceError, GResourceError, G_RESOURCE_ERROR, NO_GTYPE, newin "2,34", decl_prefix GIOMM_API)
 
-_WRAP_ENUM(ResourceFlags, GResourceFlags, newin "2,44")
-_WRAP_ENUM(ResourceLookupFlags, GResourceLookupFlags, newin "2,44")
+_WRAP_ENUM(ResourceFlags, GResourceFlags, newin "2,44", decl_prefix GIOMM_API)
+_WRAP_ENUM(ResourceLookupFlags, GResourceLookupFlags, newin "2,44", decl_prefix GIOMM_API)
 
 /** %Resource framework.
  *
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index b335881c..2b0447b6 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -28,7 +28,7 @@ namespace Gio
 {
 class GIOMM_API SettingsSchema;
 
-  _WRAP_ENUM(SettingsBindFlags, GSettingsBindFlags)
+  _WRAP_ENUM(SettingsBindFlags, GSettingsBindFlags, decl_prefix GIOMM_API)
 
 /** A high-level API for application settings
  *
diff --git a/gio/src/socket.hg b/gio/src/socket.hg
index 7e386091..2727e21e 100644
--- a/gio/src/socket.hg
+++ b/gio/src/socket.hg
@@ -30,9 +30,9 @@ namespace Gio
 {
 class GIOMM_API SocketSource;
 
-_WRAP_ENUM(SocketType, GSocketType)
-_WRAP_ENUM(SocketProtocol, GSocketProtocol)
-_WRAP_ENUM(SocketMsgFlags, GSocketMsgFlags)
+_WRAP_ENUM(SocketType, GSocketType, decl_prefix GIOMM_API)
+_WRAP_ENUM(SocketProtocol, GSocketProtocol, decl_prefix GIOMM_API)
+_WRAP_ENUM(SocketMsgFlags, GSocketMsgFlags, decl_prefix GIOMM_API)
 
 /** @defgroup NetworkIO Portable Network I/O Functionality
  */
diff --git a/gio/src/socketclient.hg b/gio/src/socketclient.hg
index 635c0e5d..169a2751 100644
--- a/gio/src/socketclient.hg
+++ b/gio/src/socketclient.hg
@@ -31,7 +31,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(SocketClientEvent, GSocketClientEvent)
+_WRAP_ENUM(SocketClientEvent, GSocketClientEvent, decl_prefix GIOMM_API)
 
 /** Helper for connecting to a network service.
  *
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg
index f332abe1..fc3eedc4 100644
--- a/gio/src/tlsconnection.hg
+++ b/gio/src/tlsconnection.hg
@@ -26,7 +26,7 @@ _PINCLUDE(giomm/private/iostream_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(TlsRehandshakeMode,GTlsRehandshakeMode)
+_WRAP_ENUM(TlsRehandshakeMode,GTlsRehandshakeMode, decl_prefix GIOMM_API)
 
 class GIOMM_API Cancellable;
 class GIOMM_API TlsDatabase;
diff --git a/gio/src/tlsdatabase.hg b/gio/src/tlsdatabase.hg
index 95d577c4..2b85c621 100644
--- a/gio/src/tlsdatabase.hg
+++ b/gio/src/tlsdatabase.hg
@@ -32,8 +32,8 @@ class GLIBMM_API ByteArray;
 namespace Gio
 {
 
-_WRAP_ENUM(TlsDatabaseVerifyFlags, GTlsDatabaseVerifyFlags)
-_WRAP_ENUM(TlsDatabaseLookupFlags, GTlsDatabaseLookupFlags)
+_WRAP_ENUM(TlsDatabaseVerifyFlags, GTlsDatabaseVerifyFlags, decl_prefix GIOMM_API)
+_WRAP_ENUM(TlsDatabaseLookupFlags, GTlsDatabaseLookupFlags, decl_prefix GIOMM_API)
 
 class GIOMM_API Cancellable;
 class GIOMM_API SocketConnectable;
diff --git a/gio/src/tlsinteraction.hg b/gio/src/tlsinteraction.hg
index ed1ed019..b8df1611 100644
--- a/gio/src/tlsinteraction.hg
+++ b/gio/src/tlsinteraction.hg
@@ -25,8 +25,8 @@ _PINCLUDE(gio/gio.h)
 namespace Gio
 {
 
-_WRAP_ENUM(TlsInteractionResult, GTlsInteractionResult)
-_WRAP_ENUM(TlsCertificateRequestFlags, GTlsCertificateRequestFlags)
+_WRAP_ENUM(TlsInteractionResult, GTlsInteractionResult, decl_prefix GIOMM_API)
+_WRAP_ENUM(TlsCertificateRequestFlags, GTlsCertificateRequestFlags, decl_prefix GIOMM_API)
 
 class GIOMM_API Cancellable;
 class GIOMM_API TlsPassword;
diff --git a/gio/src/tlspassword.hg b/gio/src/tlspassword.hg
index 12e8baf8..1818d433 100644
--- a/gio/src/tlspassword.hg
+++ b/gio/src/tlspassword.hg
@@ -24,7 +24,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(TlsPasswordFlags, GTlsPasswordFlags)
+_WRAP_ENUM(TlsPasswordFlags, GTlsPasswordFlags, decl_prefix GIOMM_API)
 
 /** TlsPassword - TLS Passwords for prompting.
  * Holds a password used in TLS.
diff --git a/gio/src/unixsocketaddress.hg b/gio/src/unixsocketaddress.hg
index 25cbb6e8..fb2b1fda 100644
--- a/gio/src/unixsocketaddress.hg
+++ b/gio/src/unixsocketaddress.hg
@@ -24,7 +24,7 @@ _PINCLUDE(giomm/private/socketaddress_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(UnixSocketAddressType, GUnixSocketAddressType)
+_WRAP_ENUM(UnixSocketAddressType, GUnixSocketAddressType, decl_prefix GIOMM_API)
 
 class GLIBMM_API ByteArray;
 
diff --git a/gio/src/zlibcompressor.hg b/gio/src/zlibcompressor.hg
index a0127087..402701d5 100644
--- a/gio/src/zlibcompressor.hg
+++ b/gio/src/zlibcompressor.hg
@@ -25,7 +25,7 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace Gio
 {
 
-_WRAP_ENUM(ZlibCompressorFormat,  GZlibCompressorFormat)
+_WRAP_ENUM(ZlibCompressorFormat,  GZlibCompressorFormat, decl_prefix GIOMM_API)
 
 class GIOMM_API FileInfo;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]