diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-03-30 21:57:34 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-04-04 12:27:35 +0800 |
commit | 0c9a0f8acffe1fe9201b2c65deba5544d8f1dd94 (patch) | |
tree | 9803e4b877ad3fd0a0d346f3c587663a9b3ba7c1 /gio | |
parent | d7cbe3119f155e3f6d82d4dc205122bec8b69bf1 (diff) | |
download | glibmm-0c9a0f8acffe1fe9201b2c65deba5544d8f1dd94.tar.gz |
gio/src/*.hg: Mark _WRAP_ENUM with decl_prefix GIOMM_API
This way, we can mark the template<> classes with GIOMM_API so that we
can export them as well using compiler directives. Note that those
marked with NO_GTYPE do not need to be marked with this, as no
template<> classes are generated with these.
Diffstat (limited to 'gio')
-rw-r--r-- | gio/src/application.hg | 2 | ||||
-rw-r--r-- | gio/src/converter.hg | 4 | ||||
-rw-r--r-- | gio/src/dbusconnection.hg | 4 | ||||
-rw-r--r-- | gio/src/dbusinterfaceskeleton.hg | 2 | ||||
-rw-r--r-- | gio/src/dbusmessage.hg | 2 | ||||
-rw-r--r-- | gio/src/dbusobjectmanagerclient.hg | 2 | ||||
-rw-r--r-- | gio/src/dbusownname.hg | 2 | ||||
-rw-r--r-- | gio/src/dbusproxy.hg | 2 | ||||
-rw-r--r-- | gio/src/dbusserver.hg | 2 | ||||
-rw-r--r-- | gio/src/drive.hg | 4 | ||||
-rw-r--r-- | gio/src/enums.hg | 12 | ||||
-rw-r--r-- | gio/src/fileattributeinfo.hg | 6 | ||||
-rw-r--r-- | gio/src/mountoperation.hg | 2 | ||||
-rw-r--r-- | gio/src/networkmonitor.hg | 2 | ||||
-rw-r--r-- | gio/src/notification.hg | 2 | ||||
-rw-r--r-- | gio/src/resolver.hg | 2 | ||||
-rw-r--r-- | gio/src/resource.hg | 4 | ||||
-rw-r--r-- | gio/src/settings.hg | 2 | ||||
-rw-r--r-- | gio/src/socket.hg | 6 | ||||
-rw-r--r-- | gio/src/socketclient.hg | 2 | ||||
-rw-r--r-- | gio/src/tlsdatabase.hg | 4 | ||||
-rw-r--r-- | gio/src/tlsinteraction.hg | 4 | ||||
-rw-r--r-- | gio/src/tlspassword.hg | 2 | ||||
-rw-r--r-- | gio/src/unixsocketaddress.hg | 2 | ||||
-rw-r--r-- | gio/src/zlibcompressor.hg | 2 |
25 files changed, 41 insertions, 39 deletions
diff --git a/gio/src/application.hg b/gio/src/application.hg index dd2c5ecc..cf59206e 100644 --- a/gio/src/application.hg +++ b/gio/src/application.hg @@ -89,7 +89,7 @@ class GIOMM_API Application : public Glib::Object, public ActionGroup, public Ac _IMPLEMENTS_INTERFACE(ActionMap) public: - _WRAP_ENUM(Flags, GApplicationFlags, s#^FLAGS_##) + _WRAP_ENUM(Flags, GApplicationFlags, s#^FLAGS_##, decl_prefix GIOMM_API) protected: /** Constructs an application instance. diff --git a/gio/src/converter.hg b/gio/src/converter.hg index 74e1624d..3c27ccde 100644 --- a/gio/src/converter.hg +++ b/gio/src/converter.hg @@ -44,8 +44,8 @@ class GIOMM_API Converter : public Glib::Interface _CLASS_INTERFACE(Converter, GConverter, G_CONVERTER, GConverterIface, , , GIOMM_API) public: - _WRAP_ENUM(Result, GConverterResult) - _WRAP_ENUM(Flags, GConverterFlags) + _WRAP_ENUM(Result, GConverterResult, decl_prefix GIOMM_API) + _WRAP_ENUM(Flags, GConverterFlags, decl_prefix GIOMM_API) _WRAP_METHOD(Result convert(const void* inbuf, gsize inbuf_size, void* outbuf, gsize outbuf_size, Flags flags, gsize& bytes_read, gsize& bytes_written), g_converter_convert, errthrow) _WRAP_METHOD(void reset(), g_converter_reset) diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg index 5734c0fd..e93f6988 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, NO_GTYPE) -_WRAP_ENUM(ConnectionFlags, GDBusConnectionFlags, gtype_func g_dbus_connection_flags_get_type) +_WRAP_ENUM(ConnectionFlags, GDBusConnectionFlags, gtype_func g_dbus_connection_flags_get_type, decl_prefix GIOMM_API) _WRAP_ENUM(SendMessageFlags, GDBusSendMessageFlags, NO_GTYPE) _WRAP_ENUM(SignalFlags, GDBusSignalFlags, NO_GTYPE) _WRAP_ENUM(SubtreeFlags, GDBusSubtreeFlags, NO_GTYPE) diff --git a/gio/src/dbusinterfaceskeleton.hg b/gio/src/dbusinterfaceskeleton.hg index 7ad634ce..a3eeae28 100644 --- a/gio/src/dbusinterfaceskeleton.hg +++ b/gio/src/dbusinterfaceskeleton.hg @@ -44,7 +44,7 @@ class GIOMM_API InterfaceSkeleton _IMPLEMENTS_INTERFACE(Interface) public: - _WRAP_ENUM(Flags, GDBusInterfaceSkeletonFlags, gtype_func g_dbus_interface_skeleton_flags_get_type) + _WRAP_ENUM(Flags, GDBusInterfaceSkeletonFlags, gtype_func g_dbus_interface_skeleton_flags_get_type, decl_prefix GIOMM_API) _WRAP_METHOD(void flush(), g_dbus_interface_skeleton_flush) diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg index 3a28cee7..c03f5181 100644 --- a/gio/src/dbusmessage.hg +++ b/gio/src/dbusmessage.hg @@ -36,7 +36,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, gtype_func g_dbus_capability_flags_get_type) +_WRAP_ENUM(CapabilityFlags, GDBusCapabilityFlags, 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 42a9d38b..ce60c60b 100644 --- a/gio/src/dbusobjectmanagerclient.hg +++ b/gio/src/dbusobjectmanagerclient.hg @@ -125,7 +125,7 @@ class GIOMM_API ObjectManagerClient _IMPLEMENTS_INTERFACE(DBus::ObjectManager) public: - _WRAP_ENUM(Flags, GDBusObjectManagerClientFlags, gtype_func g_dbus_object_manager_client_flags_get_type) + _WRAP_ENUM(Flags, GDBusObjectManagerClientFlags, gtype_func g_dbus_object_manager_client_flags_get_type, decl_prefix GIOMM_API) /** A slot that will be called to determine the GType to use for an interface proxy * (if interface_name is not an empty string) or object proxy (if interface_name is diff --git a/gio/src/dbusownname.hg b/gio/src/dbusownname.hg index 24884405..15e5c2b8 100644 --- a/gio/src/dbusownname.hg +++ b/gio/src/dbusownname.hg @@ -24,7 +24,7 @@ namespace Gio namespace DBus { -_WRAP_ENUM(BusNameOwnerFlags, GBusNameOwnerFlags) +_WRAP_ENUM(BusNameOwnerFlags, GBusNameOwnerFlags, 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 41b813a9..4deb01b9 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, gtype_func g_dbus_proxy_flags_get_type) +_WRAP_ENUM(ProxyFlags, GDBusProxyFlags, 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 91b47d3f..c7dc24f0 100644 --- a/gio/src/dbusserver.hg +++ b/gio/src/dbusserver.hg @@ -52,7 +52,7 @@ class GIOMM_API Server : public Glib::Object, public Initable _IMPLEMENTS_INTERFACE(Initable) public: - _WRAP_ENUM(Flags, GDBusServerFlags, gtype_func g_dbus_server_flags_get_type) + _WRAP_ENUM(Flags, GDBusServerFlags, gtype_func g_dbus_server_flags_get_type, decl_prefix GIOMM_API) protected: Server(const std::string& address, diff --git a/gio/src/drive.hg b/gio/src/drive.hg index 6a746734..dde48d17 100644 --- a/gio/src/drive.hg +++ b/gio/src/drive.hg @@ -47,8 +47,8 @@ class GIOMM_API Drive : public Glib::Interface _CLASS_INTERFACE(Drive, GDrive, G_DRIVE, GDriveIface, , , GIOMM_API) public: - _WRAP_ENUM(StartFlags, GDriveStartFlags) - _WRAP_ENUM(StartStopType, GDriveStartStopType) + _WRAP_ENUM(StartFlags, GDriveStartFlags, decl_prefix GIOMM_API) + _WRAP_ENUM(StartStopType, GDriveStartStopType, decl_prefix GIOMM_API) _WRAP_METHOD(Glib::ustring get_name() const, g_drive_get_name) diff --git a/gio/src/enums.hg b/gio/src/enums.hg index b46b7fe6..26888dd0 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> @@ -23,10 +25,10 @@ namespace Gio { // BIG_ENDIAN and LITTLE_ENDIAN are defined as preprocessor macros somewhere. -_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, s#ENDIAN$#ENDIAN_ORDER#) -_WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType) -_WRAP_ENUM(SocketFamily, GSocketFamily) -_WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode) -_WRAP_ENUM(TlsCertificateFlags, GTlsCertificateFlags) +_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, s#ENDIAN$#ENDIAN_ORDER#, decl_prefix GIOMM_API) +_WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType, decl_prefix GIOMM_API) +_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 7e045620..5f329d73 100644 --- a/gio/src/fileattributeinfo.hg +++ b/gio/src/fileattributeinfo.hg @@ -25,8 +25,8 @@ _DEFS(giomm,gio) namespace Gio { -_WRAP_ENUM(FileAttributeType, GFileAttributeType) -_WRAP_ENUM(FileAttributeStatus, GFileAttributeStatus) +_WRAP_ENUM(FileAttributeType, GFileAttributeType, decl_prefix GIOMM_API) +_WRAP_ENUM(FileAttributeStatus, GFileAttributeStatus, decl_prefix GIOMM_API) /** Information about a specific attribute - see FileAttributeInfoList. @@ -35,7 +35,7 @@ _WRAP_ENUM(FileAttributeStatus, GFileAttributeStatus) */ class GIOMM_API FileAttributeInfo { - _CLASS_GENERIC(FileAttributeInfo, GFileAttributeInfo) + _CLASS_GENERIC(FileAttributeInfo, GFileAttributeInfo, decl_prefix GIOMM_API) public: _WRAP_ENUM(Flags, GFileAttributeInfoFlags) diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg index 282ace83..9181de57 100644 --- a/gio/src/mountoperation.hg +++ b/gio/src/mountoperation.hg @@ -26,7 +26,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 f2dbf253..46270ba9 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 add6fad8..4b94054d 100644 --- a/gio/src/notification.hg +++ b/gio/src/notification.hg @@ -64,7 +64,7 @@ protected: _IGNORE(g_notification_new) public: - _WRAP_ENUM(Priority, GNotificationPriority, newin "2,44") + _WRAP_ENUM(Priority, GNotificationPriority, newin "2,44", decl_prefix GIOMM_API) _WRAP_METHOD_DOCS_ONLY(g_notification_new) _WRAP_CREATE(const Glib::ustring& title) diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg index 7e9c5bee..5900f3be 100644 --- a/gio/src/resolver.hg +++ b/gio/src/resolver.hg @@ -56,7 +56,7 @@ class GIOMM_API Resolver protected: public: - _WRAP_ENUM(RecordType, GResolverRecordType) + _WRAP_ENUM(RecordType, GResolverRecordType, decl_prefix GIOMM_API) static Glib::RefPtr<Resolver> get_default(); _IGNORE(g_resolver_get_default) diff --git a/gio/src/resource.hg b/gio/src/resource.hg index 43ad6f05..cdd89b8b 100644 --- a/gio/src/resource.hg +++ b/gio/src/resource.hg @@ -130,8 +130,8 @@ class GIOMM_API Resource final _IGNORE(g_resource_ref, g_resource_unref) public: - _WRAP_ENUM(Flags, GResourceFlags, newin "2,44") - _WRAP_ENUM(LookupFlags, GResourceLookupFlags, newin "2,44") + _WRAP_ENUM(Flags, GResourceFlags, newin "2,44", decl_prefix GIOMM_API) + _WRAP_ENUM(LookupFlags, GResourceLookupFlags, newin "2,44", decl_prefix GIOMM_API) _WRAP_METHOD(static Glib::RefPtr<Resource> create_from_data(const Glib::RefPtr<const Glib::Bytes>& data), g_resource_new_from_data, errthrow "Glib::FileError", newin "2,44") _WRAP_METHOD(static Glib::RefPtr<Resource> create_from_file(const std::string& filename), g_resource_load, errthrow "Glib::FileError", newin "2,44") diff --git a/gio/src/settings.hg b/gio/src/settings.hg index 69c34719..d08260d2 100644 --- a/gio/src/settings.hg +++ b/gio/src/settings.hg @@ -39,7 +39,7 @@ class GIOMM_API Settings : public Glib::Object _CLASS_GOBJECT(Settings, GSettings, G_SETTINGS, Glib::Object, GObject, , , GIOMM_API) public: - _WRAP_ENUM(BindFlags, GSettingsBindFlags) + _WRAP_ENUM(BindFlags, GSettingsBindFlags, decl_prefix GIOMM_API) protected: _WRAP_CTOR(Settings(const Glib::ustring& schema_id), g_settings_new) diff --git a/gio/src/socket.hg b/gio/src/socket.hg index 5d0f2383..c790bb54 100644 --- a/gio/src/socket.hg +++ b/gio/src/socket.hg @@ -88,9 +88,9 @@ class GIOMM_API Socket : public Glib::Object, public Initable _IMPLEMENTS_INTERFACE(Initable) public: - _WRAP_ENUM(Type, GSocketType) - _WRAP_ENUM(Protocol, GSocketProtocol) - _WRAP_ENUM(MsgFlags, GSocketMsgFlags) + _WRAP_ENUM(Type, GSocketType, decl_prefix GIOMM_API) + _WRAP_ENUM(Protocol, GSocketProtocol, decl_prefix GIOMM_API) + _WRAP_ENUM(MsgFlags, GSocketMsgFlags, decl_prefix GIOMM_API) protected: Socket(SocketFamily family, Type type, Protocol protocol, diff --git a/gio/src/socketclient.hg b/gio/src/socketclient.hg index 755f14cc..b7ae3e32 100644 --- a/gio/src/socketclient.hg +++ b/gio/src/socketclient.hg @@ -29,7 +29,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/tlsdatabase.hg b/gio/src/tlsdatabase.hg index 291d8a34..9b8cf6a3 100644 --- a/gio/src/tlsdatabase.hg +++ b/gio/src/tlsdatabase.hg @@ -57,8 +57,8 @@ public: //TODO?: Have a constant for the C macro G_TLS_DATABASE_PURPOSE_AUTHENTICATE_SERVER (which is a string)? //TODO?: Have a constant for the C macro G_TLS_DATABASE_PURPOSE_AUTHENTICATE_CLIENT (which is a string)? - _WRAP_ENUM(VerifyFlags, GTlsDatabaseVerifyFlags) - _WRAP_ENUM(LookupFlags, GTlsDatabaseLookupFlags) + _WRAP_ENUM(VerifyFlags, GTlsDatabaseVerifyFlags, decl_prefix GIOMM_API) + _WRAP_ENUM(LookupFlags, GTlsDatabaseLookupFlags, decl_prefix GIOMM_API) _WRAP_METHOD(TlsCertificateFlags verify_chain(const Glib::RefPtr<TlsCertificate>& chain, const Glib::ustring& purpose, const Glib::RefPtr<const SocketConnectable>& identity{?}, const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?}, VerifyFlags flags{.} = VerifyFlags::NONE) const, g_tls_database_verify_chain, errthrow) _WRAP_METHOD(void verify_chain_async(const Glib::RefPtr<TlsCertificate>& chain, const Glib::ustring& purpose, const Glib::RefPtr<const SocketConnectable>& identity{?}, const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const Glib::RefPtr<Cancellable>& cancellable{.?}, VerifyFlags flags{.} = VerifyFlags::NONE) const, g_tls_database_verify_chain_async, slot_name slot, slot_callback SignalProxy_async_callback) diff --git a/gio/src/tlsinteraction.hg b/gio/src/tlsinteraction.hg index daed3537..5a67b86c 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 aec1bcba..a8e9c1fb 100644 --- a/gio/src/tlspassword.hg +++ b/gio/src/tlspassword.hg @@ -34,7 +34,7 @@ class GIOMM_API TlsPassword : public Glib::Object _CLASS_GOBJECT(TlsPassword, GTlsPassword, G_TLS_PASSWORD, Glib::Object, GObject, , , GIOMM_API) public: - _WRAP_ENUM(Flags, GTlsPasswordFlags) + _WRAP_ENUM(Flags, GTlsPasswordFlags, decl_prefix GIOMM_API) protected: _WRAP_CTOR(TlsPassword(const Glib::ustring& description{.}, Flags flags{.} = Flags::NONE), g_tls_password_new) diff --git a/gio/src/unixsocketaddress.hg b/gio/src/unixsocketaddress.hg index ca250a8b..ee4a74af 100644 --- a/gio/src/unixsocketaddress.hg +++ b/gio/src/unixsocketaddress.hg @@ -52,7 +52,7 @@ class GIOMM_API UnixSocketAddress _GTKMMPROC_WIN32_NO_WRAP public: - _WRAP_ENUM(Type, GUnixSocketAddressType) + _WRAP_ENUM(Type, GUnixSocketAddressType, decl_prefix GIOMM_API) protected: _WRAP_CTOR(UnixSocketAddress(const std::string& path), g_unix_socket_address_new) 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; |