[glibmm] Fix build when _WRAP_ENUM generates enum class
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Fix build when _WRAP_ENUM generates enum class
- Date: Tue, 11 Apr 2017 17:38:24 +0000 (UTC)
commit e8ded6b902ba766dc7bd697f8d379cb4158f7dfd
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Tue Apr 11 19:33:11 2017 +0200
Fix build when _WRAP_ENUM generates enum class
Bug 86864
gio/src/application.hg | 6 +-
gio/src/dbusconnection.hg | 62 +++++-----
gio/src/dbusmessage.hg | 4 +-
gio/src/dbusownname.hg | 4 +-
gio/src/dbusproxy.hg | 46 ++++----
gio/src/dbusserver.hg | 10 +-
gio/src/dbuswatchname.hg | 6 +-
gio/src/drive.hg | 20 ++--
gio/src/enums.hg | 20 +++-
gio/src/file.hg | 230 +++++++++++++++++++-------------------
gio/src/fileattributeinfolist.hg | 6 +-
gio/src/fileinfo.hg | 12 +--
gio/src/gio_docs_override.xml | 63 +++++++++++
gio/src/gio_enums.defs | 2 +-
gio/src/gio_enums.defs.patch | 2 +-
gio/src/iostream.hg | 6 +-
gio/src/mount.hg | 32 +++---
gio/src/notification.hg | 2 +-
gio/src/outputstream.hg | 8 +-
gio/src/resource.hg | 24 ++--
gio/src/settings.hg | 4 +-
gio/src/tlsdatabase.hg | 22 ++--
gio/src/tlspassword.hg | 4 +-
gio/src/unixsocketaddress.hg | 6 +-
gio/src/volume.hg | 20 ++--
glib/glibmm/dispatcher.cc | 8 +-
glib/glibmm/main.cc | 4 +-
glib/glibmm/main.h | 4 +-
glib/glibmm/property.h | 38 +++---
glib/glibmm/ustring.h | 2 +-
glib/glibmm/value.h | 4 +-
glib/src/binding.hg | 4 +-
glib/src/date.ccg | 10 ++
glib/src/date.hg | 16 ++-
glib/src/glib_docs_override.xml | 15 +++
glib/src/iochannel.hg | 28 +++---
glib/src/keyfile.hg | 8 +-
glib/src/miscutils.hg | 6 +-
glib/src/spawn.hg | 48 ++++----
glib/src/value_basictypes.cc.m4 | 2 +-
40 files changed, 455 insertions(+), 363 deletions(-)
---
diff --git a/gio/src/application.hg b/gio/src/application.hg
index 6b36ad3..fc3d693 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -35,7 +35,7 @@ _PINCLUDE(glibmm/private/object_p.h)
namespace Gio
{
-_WRAP_ENUM(ApplicationFlags, GApplicationFlags, NO_GTYPE)
+_WRAP_ENUM(ApplicationFlags, GApplicationFlags, NO_GTYPE, s#^FLAGS_##)
/** Application - Core application class.
* An Application is the foundation of an application, unique for a given
@@ -97,7 +97,7 @@ protected:
* @param application_id The application ID.
* @param flags The application flags.
*/
- explicit Application(const Glib::ustring& application_id = Glib::ustring(), ApplicationFlags flags =
APPLICATION_FLAGS_NONE);
+ explicit Application(const Glib::ustring& application_id = Glib::ustring(), ApplicationFlags flags =
ApplicationFlags::NONE);
_IGNORE(g_application_new)
public:
@@ -136,7 +136,7 @@ public:
* @param application_id The application ID.
* @param flags The application flags.
*/
- _WRAP_CREATE(const Glib::ustring& application_id = Glib::ustring(), ApplicationFlags flags =
APPLICATION_FLAGS_NONE)
+ _WRAP_CREATE(const Glib::ustring& application_id = Glib::ustring(), ApplicationFlags flags =
ApplicationFlags::NONE)
_WRAP_METHOD(static bool id_is_valid(const Glib::ustring& application_id), g_application_id_is_valid)
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 96b65c8..dc86302 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -229,27 +229,27 @@ public:
const Glib::RefPtr<AuthObserver>& observer,
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new)
static void create(const Glib::RefPtr<IOStream>& stream,
const std::string& guid,
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/// Non-cancellable version of create().
static void create(const Glib::RefPtr<IOStream>& stream,
const std::string& guid,
const Glib::RefPtr<AuthObserver>& observer,
const SlotAsyncReady& slot,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/// Non-cancellable version of create().
static void create(const Glib::RefPtr<IOStream>& stream,
const std::string& guid,
const SlotAsyncReady& slot,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_finish)
/// @throw Glib::Error.
@@ -260,24 +260,24 @@ public:
const Glib::RefPtr<AuthObserver>& observer,
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address)
static void create_for_address(const std::string& address,
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/// Non-cancellable version of create_for_address().
static void create_for_address(const std::string& address,
const Glib::RefPtr<AuthObserver>& observer,
const SlotAsyncReady& slot,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/// Non-cancellable version of create_for_address().
static void create_for_address(const std::string& address,
const SlotAsyncReady& slot,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address_finish)
/// @throw Glib::Error.
@@ -290,7 +290,7 @@ public:
const std::string& guid,
const Glib::RefPtr<AuthObserver>& observer,
const Glib::RefPtr<Cancellable>& cancellable,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_sync)
/// @throw Glib::Error.
@@ -298,20 +298,20 @@ public:
const Glib::RefPtr<IOStream>& stream,
const std::string& guid,
const Glib::RefPtr<Cancellable>& cancellable,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/// Non-cancellable version of create_sync().
static Glib::RefPtr<Connection> create_sync(
const Glib::RefPtr<IOStream>& stream,
const std::string& guid,
const Glib::RefPtr<AuthObserver>& observer,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/// Non-cancellable version of create_sync().
static Glib::RefPtr<Connection> create_sync(
const Glib::RefPtr<IOStream>& stream,
const std::string& guid,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address_sync)
/// @throw Glib::Error.
@@ -319,25 +319,25 @@ public:
const std::string& address,
const Glib::RefPtr<AuthObserver>& observer,
const Glib::RefPtr<Cancellable>& cancellable,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address_sync)
/// @throw Glib::Error.
static Glib::RefPtr<Connection> create_for_address_sync(
const std::string& address,
const Glib::RefPtr<Cancellable>& cancellable,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/// Non-cancellable version of create_for_address_sync().
static Glib::RefPtr<Connection> create_for_address_sync(
const std::string& address,
const Glib::RefPtr<AuthObserver>& observer,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/// Non-cancellable version of create_for_address_sync().
static Glib::RefPtr<Connection> create_for_address_sync(
const std::string& address,
- ConnectionFlags flags = Gio::DBus::CONNECTION_FLAGS_NONE);
+ ConnectionFlags flags = Gio::DBus::ConnectionFlags::NONE);
/** Closes the connection. Note that this never causes the process to exit
* (this might only happen if the other end of a shared message bus
@@ -489,11 +489,11 @@ public:
/// A send_message() without an "out_serial" parameter.
bool send_message(const Glib::RefPtr<Message>& message,
- SendMessageFlags flags = Gio::DBus::SEND_MESSAGE_FLAGS_NONE);
+ SendMessageFlags flags = Gio::DBus::SendMessageFlags::NONE);
/** Asynchronously sends message to the peer represented by the connection.
*
- * Unless flags contain the Gio::DBus::SEND_MESSAGE_FLAGS_PRESERVE_SERIAL
+ * Unless flags contain the Gio::DBus::SendMessageFlags::PRESERVE_SERIAL
* flag, the serial number will be assigned by the connection and set on
* message via Gio::DBus::Message::set_serial().
*
@@ -509,7 +509,7 @@ public:
* send_message_with_reply_sync() for the synchronous version.
*
* Note that message must be unlocked, unless flags contain the
- * Gio::DBus::SEND_MESSAGE_FLAGS_PRESERVE_SERIAL flag.
+ * Gio::DBus::SendMessageFlags::PRESERVE_SERIAL flag.
*
* See the C API docs for examples.
*
@@ -542,7 +542,7 @@ public:
* reached. See send_message_with_reply() for the asynchronous version of
* this method.
*
- * Unless flags contain the Gio::DBus::SEND_MESSAGE_FLAGS_PRESERVE_SERIAL
+ * Unless flags contain the Gio::DBus::SendMessageFlags::PRESERVE_SERIAL
* flag, the serial number will be assigned by the connection and set on
* message via Gio::DBus::Message::set_serial().
*
@@ -559,7 +559,7 @@ public:
* See the C API docs for examples.
*
* Note that message must be unlocked, unless flags contain the
- * Gio::DBus::SEND_MESSAGE_FLAGS_PRESERVE_SERIAL flag.
+ * Gio::DBus::SendMessageFlags::PRESERVE_SERIAL flag.
*
* @param message A Message.
* @param cancellable A Cancellable.
@@ -642,7 +642,7 @@ public:
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::ustring& bus_name = Glib::ustring(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE,
+ CallFlags flags = Gio::DBus::CallFlags::NONE,
const Glib::VariantType& reply_type = Glib::VariantType());
_IGNORE(g_dbus_connection_call)
@@ -655,7 +655,7 @@ public:
const SlotAsyncReady& slot,
const Glib::ustring& bus_name = Glib::ustring(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE,
+ CallFlags flags = Gio::DBus::CallFlags::NONE,
const Glib::VariantType& reply_type = Glib::VariantType());
/** Finishes an operation started with call().
@@ -709,7 +709,7 @@ public:
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::ustring& bus_name = Glib::ustring(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE,
+ CallFlags flags = Gio::DBus::CallFlags::NONE,
const Glib::VariantType& reply_type = Glib::VariantType());
_IGNORE(g_dbus_connection_call_sync)
@@ -721,7 +721,7 @@ public:
const Glib::VariantContainerBase& parameters,
const Glib::ustring& bus_name = Glib::ustring(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE,
+ CallFlags flags = Gio::DBus::CallFlags::NONE,
const Glib::VariantType& reply_type = Glib::VariantType());
#ifdef G_OS_UNIX
@@ -760,7 +760,7 @@ public:
const Glib::RefPtr<UnixFDList>& fd_list,
const Glib::ustring& bus_name = Glib::ustring(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE,
+ CallFlags flags = Gio::DBus::CallFlags::NONE,
const Glib::VariantType& reply_type = Glib::VariantType());
_IGNORE(g_dbus_connection_call_with_unix_fd_list)
@@ -776,7 +776,7 @@ public:
const Glib::RefPtr<UnixFDList>& fd_list,
const Glib::ustring& bus_name = Glib::ustring(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE,
+ CallFlags flags = Gio::DBus::CallFlags::NONE,
const Glib::VariantType& reply_type = Glib::VariantType());
#endif // G_OS_UNIX
@@ -801,7 +801,7 @@ public:
Glib::RefPtr<UnixFDList>& out_fd_list{.>>},
const Glib::ustring& bus_name{.NULL} = Glib::ustring(),
int timeout_msec{.} = -1,
- CallFlags flags{.} = Gio::DBus::CALL_FLAGS_NONE,
+ CallFlags flags{.} = Gio::DBus::CallFlags::NONE,
const Glib::VariantType& reply_type{.} = Glib::VariantType()
),
g_dbus_connection_call_with_unix_fd_list_sync, errthrow, ifdef G_OS_UNIX
@@ -868,7 +868,7 @@ public:
const Glib::ustring& member = Glib::ustring(),
const Glib::ustring& object_path = Glib::ustring(),
const Glib::ustring& arg0 = Glib::ustring(),
- SignalFlags flags = Gio::DBus::SIGNAL_FLAGS_NONE);
+ SignalFlags flags = Gio::DBus::SignalFlags::NONE);
_IGNORE(g_dbus_connection_signal_subscribe)
_WRAP_METHOD(void signal_unsubscribe(guint subscription_id), g_dbus_connection_signal_unsubscribe)
@@ -977,7 +977,7 @@ public:
*
* When handling remote calls into any node in the subtree, first the
* enumerate slot is used to check if the node exists. If the node
- * exists or the Gio::DBus::SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES flag
+ * exists or the Gio::DBus::SubtreeFlags::DISPATCH_TO_UNENUMERATED_NODES flag
* is set the introspection slot is used to check if the node supports the
* requested method. If so, the dispatch function is used to determine where
* to dispatch the call. The collected InterfaceVTable will be used to
@@ -1007,7 +1007,7 @@ public:
*/
guint register_subtree(const Glib::ustring& object_path,
const SubtreeVTable& vtable,
- SubtreeFlags flags = Gio::DBus::SUBTREE_FLAGS_NONE);
+ SubtreeFlags flags = Gio::DBus::SubtreeFlags::NONE);
_IGNORE(g_dbus_connection_register_subtree)
_WRAP_METHOD(bool unregister_subtree(guint registration_id), g_dbus_connection_unregister_subtree)
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg
index f348a73..5df3ca2 100644
--- a/gio/src/dbusmessage.hg
+++ b/gio/src/dbusmessage.hg
@@ -76,7 +76,7 @@ public:
// Ignore variable argument functions.
_IGNORE(g_dbus_message_new_method_error, g_dbus_message_new_method_error_valist)
- _WRAP_METHOD(static Glib::RefPtr<Message> create_from_blob(const guchar* blob, gsize blob_len,
CapabilityFlags capabilities = CAPABILITY_FLAGS_NONE), g_dbus_message_new_from_blob, errthrow)
+ _WRAP_METHOD(static Glib::RefPtr<Message> create_from_blob(const guchar* blob, gsize blob_len,
CapabilityFlags capabilities = CapabilityFlags::NONE), g_dbus_message_new_from_blob, errthrow)
_WRAP_METHOD(Glib::ustring print(guint indent), g_dbus_message_print)
@@ -169,7 +169,7 @@ public:
_WRAP_METHOD(static gssize bytes_needed(const guchar* blob, gsize blob_len), g_dbus_message_bytes_needed,
errthrow)
- _WRAP_METHOD(guchar* to_blob(gsize& out_size, CapabilityFlags capabilities = CAPABILITY_FLAGS_NONE),
g_dbus_message_to_blob, errthrow)
+ _WRAP_METHOD(guchar* to_blob(gsize& out_size, CapabilityFlags capabilities = CapabilityFlags::NONE),
g_dbus_message_to_blob, errthrow)
_WRAP_METHOD(void to_exception(), g_dbus_message_to_gerror, errthrow)
diff --git a/gio/src/dbusownname.hg b/gio/src/dbusownname.hg
index 5944f43..63ddac9 100644
--- a/gio/src/dbusownname.hg
+++ b/gio/src/dbusownname.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2010 The giomm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -116,7 +114,7 @@ guint own_name(
const SlotBusAcquired& bus_acquired_slot = SlotBusAcquired(),
const SlotNameAcquired& name_acquired_slot = SlotNameAcquired(),
const SlotNameLost& name_lost_slot = SlotNameLost(),
- BusNameOwnerFlags flags = Gio::DBus::BUS_NAME_OWNER_FLAGS_NONE
+ BusNameOwnerFlags flags = Gio::DBus::BusNameOwnerFlags::NONE
);
_IGNORE(g_bus_own_name)
diff --git a/gio/src/dbusproxy.hg b/gio/src/dbusproxy.hg
index 23b9589..8d428d5 100644
--- a/gio/src/dbusproxy.hg
+++ b/gio/src/dbusproxy.hg
@@ -82,7 +82,7 @@ protected:
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
Proxy(const Glib::RefPtr<Connection>& connection,
const Glib::ustring& name,
@@ -90,7 +90,7 @@ protected:
const Glib::ustring& interface_name,
const SlotAsyncReady& slot,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
Proxy(const Glib::RefPtr<Connection>& connection,
const Glib::ustring& name,
@@ -98,14 +98,14 @@ protected:
const Glib::ustring& interface_name,
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
Proxy(const Glib::RefPtr<Connection>& connection,
const Glib::ustring& name,
const Glib::ustring& object_path,
const Glib::ustring& interface_name,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
Proxy(BusType bus_type,
const Glib::ustring& name,
@@ -114,7 +114,7 @@ protected:
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
Proxy(BusType bus_type,
const Glib::ustring& name,
@@ -122,7 +122,7 @@ protected:
const Glib::ustring& interface_name,
const SlotAsyncReady& slot,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
Proxy(BusType bus_type,
const Glib::ustring& name,
@@ -130,14 +130,14 @@ protected:
const Glib::ustring& interface_name,
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
Proxy(BusType bus_type,
const Glib::ustring& name,
const Glib::ustring& object_path,
const Glib::ustring& interface_name,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
public:
@@ -149,7 +149,7 @@ public:
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
/// Non-cancellable version of create().
static void create(const Glib::RefPtr<Connection>& connection,
@@ -158,7 +158,7 @@ public:
const Glib::ustring& interface_name,
const SlotAsyncReady& slot,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_proxy_new_finish)
/// @throw Glib::Error.
@@ -172,7 +172,7 @@ public:
const Glib::ustring& interface_name,
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
/// Non-cancellable version of create_sync().
static Glib::RefPtr<Proxy>
@@ -181,7 +181,7 @@ public:
const Glib::ustring& object_path,
const Glib::ustring& interface_name,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_proxy_new_for_bus)
static void create_for_bus(BusType bus_type,
@@ -191,7 +191,7 @@ public:
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
/// Non-cancellable version of create_for_bus().
static void create_for_bus(BusType bus_type,
@@ -200,7 +200,7 @@ public:
const Glib::ustring& interface_name,
const SlotAsyncReady& slot,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_proxy_new_for_bus_finish)
/// @throw Glib::Error.
@@ -214,7 +214,7 @@ public:
const Glib::ustring& interface_name,
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
/// Non-cancellable version of create_for_bus_sync().
static Glib::RefPtr<Proxy>
@@ -223,7 +223,7 @@ public:
const Glib::ustring& object_path,
const Glib::ustring& interface_name,
const Glib::RefPtr<InterfaceInfo>& info = Glib::RefPtr<InterfaceInfo>(),
- ProxyFlags flags = PROXY_FLAGS_NONE);
+ ProxyFlags flags = ProxyFlags::NONE);
_WRAP_METHOD(ProxyFlags get_flags() const, g_dbus_proxy_get_flags)
@@ -270,7 +270,7 @@ public:
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::VariantContainerBase& parameters = Glib::VariantContainerBase(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE
+ CallFlags flags = Gio::DBus::CallFlags::NONE
);
/// A non-cancellable version of call().
@@ -279,7 +279,7 @@ public:
const SlotAsyncReady& slot,
const Glib::VariantContainerBase& parameters = Glib::VariantContainerBase(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE
+ CallFlags flags = Gio::DBus::CallFlags::NONE
);
/** Finishes an operation started with call().
@@ -312,7 +312,7 @@ public:
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::VariantContainerBase& parameters = Glib::VariantContainerBase(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE
+ CallFlags flags = Gio::DBus::CallFlags::NONE
);
_IGNORE(g_dbus_proxy_call_sync)
@@ -321,7 +321,7 @@ public:
const Glib::ustring& method_name,
const Glib::VariantContainerBase& parameters = Glib::VariantContainerBase(),
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE
+ CallFlags flags = Gio::DBus::CallFlags::NONE
);
@@ -354,7 +354,7 @@ public:
const Glib::RefPtr<Cancellable>& cancellable,
const Glib::RefPtr<UnixFDList>& fd_list,
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE);
+ CallFlags flags = Gio::DBus::CallFlags::NONE);
_IGNORE(g_dbus_proxy_call_with_unix_fd_list)
/** A non-cancellable version of call() (with a UnixFDList).
@@ -366,7 +366,7 @@ public:
const SlotAsyncReady& slot,
const Glib::RefPtr<UnixFDList>& fd_list,
int timeout_msec = -1,
- CallFlags flags = Gio::DBus::CALL_FLAGS_NONE);
+ CallFlags flags = Gio::DBus::CallFlags::NONE);
/** Finishes an operation started with call() (with a UnixFDList).
* @param res A AsyncResult obtained from the SlotAsyncReady passed to
@@ -387,7 +387,7 @@ public:
const Glib::RefPtr<UnixFDList>& fd_list{.},
Glib::RefPtr<UnixFDList>& out_fd_list{.>>},
int timeout_msec{.} = -1,
- CallFlags flags{.} = Gio::DBus::CALL_FLAGS_NONE
+ CallFlags flags{.} = Gio::DBus::CallFlags::NONE
),
g_dbus_proxy_call_with_unix_fd_list_sync, errthrow, ifdef G_OS_UNIX
)
diff --git a/gio/src/dbusserver.hg b/gio/src/dbusserver.hg
index 6c36f8d..d998edf 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2010 The giomm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -86,25 +84,25 @@ public:
const std::string& guid,
const Glib::RefPtr<AuthObserver>& observer,
const Glib::RefPtr<Cancellable>& cancellable,
- ServerFlags flags = Gio::DBus::SERVER_FLAGS_NONE);
+ ServerFlags flags = Gio::DBus::ServerFlags::NONE);
_WRAP_METHOD_DOCS_ONLY(g_dbus_server_new_sync)
/// @throw Glib::Error.
static Glib::RefPtr<Server> create_sync(const std::string& address,
const std::string& guid,
const Glib::RefPtr<Cancellable>& cancellable,
- ServerFlags flags = Gio::DBus::SERVER_FLAGS_NONE);
+ ServerFlags flags = Gio::DBus::ServerFlags::NONE);
/// Non-cancellable version of create_sync().
static Glib::RefPtr<Server> create_sync(const std::string& address,
const std::string& guid,
const Glib::RefPtr<AuthObserver>& observer,
- ServerFlags flags = Gio::DBus::SERVER_FLAGS_NONE);
+ ServerFlags flags = Gio::DBus::ServerFlags::NONE);
/// Non-cancellable version of create_sync().
static Glib::RefPtr<Server> create_sync(const std::string& address,
const std::string& guid,
- ServerFlags flags = Gio::DBus::SERVER_FLAGS_NONE);
+ ServerFlags flags = Gio::DBus::ServerFlags::NONE);
_WRAP_METHOD(void start(), g_dbus_server_start)
_WRAP_METHOD(void stop(), g_dbus_server_stop)
diff --git a/gio/src/dbuswatchname.hg b/gio/src/dbuswatchname.hg
index 63cdab4..f68102a 100644
--- a/gio/src/dbuswatchname.hg
+++ b/gio/src/dbuswatchname.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2010 The giomm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -89,7 +87,7 @@ guint watch_name(
const Glib::ustring& name,
const SlotNameAppeared& name_appeared_slot = SlotNameAppeared(),
const SlotNameVanished& name_vanished_slot = SlotNameVanished(),
- BusNameWatcherFlags flags = Gio::DBus::BUS_NAME_WATCHER_FLAGS_NONE
+ BusNameWatcherFlags flags = Gio::DBus::BusNameWatcherFlags::NONE
);
_IGNORE(g_bus_watch_name)
@@ -112,7 +110,7 @@ guint watch_name(
const Glib::ustring& name,
const SlotNameAppeared& name_appeared_slot = SlotNameAppeared(),
const SlotNameVanished& name_vanished_slot = SlotNameVanished(),
- BusNameWatcherFlags flags = Gio::DBus::BUS_NAME_WATCHER_FLAGS_NONE
+ BusNameWatcherFlags flags = Gio::DBus::BusNameWatcherFlags::NONE
);
_IGNORE(g_bus_watch_name_on_connection)
diff --git a/gio/src/drive.hg b/gio/src/drive.hg
index 8250459..f754b52 100644
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@ -76,21 +76,21 @@ public:
* @param flags Flags affecting the unmount if required for eject.
* @param cancellable A cancellable object which can be used to cancel the eject.
*/
- void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags
flags = MOUNT_UNMOUNT_NONE);
+ void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags
flags = MountUnmountFlags::NONE);
/** Ejects the drive.
* @param slot A callback which will be called when the eject is completed.
* @param flags Flags affecting the unmount if required for eject.
*/
- void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Ejects the drive.
* @param flags Flags affecting the unmount if required for eject.
*/
- void eject(MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MOUNT_UNMOUNT_NONE);
+ void eject(MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MountUnmountFlags::NONE);
_IGNORE(g_drive_eject)
_IGNORE(g_drive_eject_with_operation)
@@ -129,9 +129,9 @@ public:
_WRAP_METHOD(std::vector<Glib::ustring> enumerate_identifiers() const, g_drive_enumerate_identifiers)
/** @newin{2,22} */
- void start(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>&
cancellable, const SlotAsyncReady& slot, DriveStartFlags flags = DRIVE_START_NONE);
+ void start(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>&
cancellable, const SlotAsyncReady& slot, DriveStartFlags flags = DriveStartFlags::NONE);
/** @newin{2,22} */
- void start(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
DriveStartFlags flags = DRIVE_START_NONE);
+ void start(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
DriveStartFlags flags = DriveStartFlags::NONE);
_IGNORE(g_drive_start)
_WRAP_METHOD(bool start_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_start_finish, errthrow)
/** @newin{2,22} */
@@ -140,9 +140,9 @@ public:
_WRAP_METHOD(bool can_start_degraded() const, g_drive_can_start_degraded)
/** @newin{2,22} */
- void stop(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>&
cancellable, const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void stop(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>&
cancellable, const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
/** @newin{2,22} */
- void stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MountUnmountFlags::NONE);
_IGNORE(g_drive_stop)
_WRAP_METHOD(bool stop_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_stop_finish, errthrow)
/** @newin{2,22} */
diff --git a/gio/src/enums.hg b/gio/src/enums.hg
index 2518559..3698a77 100644
--- a/gio/src/enums.hg
+++ b/gio/src/enums.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2007 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -20,12 +18,23 @@
#include <gio/gio.h>
#include <glibmm/value.h>
+// There have been issues with other libraries defining HOST_NOT_FOUND (e.g.
+// netdb.h). As a workaround, we added the alternate name HOST_WAS_NOT_FOUND.
+// Portable code should not use HOST_NOT_FOUND. Undefining it here (and
+// restoring it below) will allow programs to compile even if they include
+// netdb.h. See Bug #529496
+#ifdef HOST_NOT_FOUND
+#define GIOMM_SAVED_HOST_NOT_FOUND HOST_NOT_FOUND
+#undef HOST_NOT_FOUND
+#endif // HOST_NOT_FOUND
+
_DEFS(giomm,gio)
namespace Gio
{
-_WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, NO_GTYPE)
+// 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(ErrorEnum, GIOErrorEnum, NO_GTYPE)
_WRAP_ENUM(SocketFamily, GSocketFamily)
@@ -34,3 +43,8 @@ _WRAP_ENUM(TlsCertificateFlags, GTlsCertificateFlags)
} // namespace Gio
+#ifdef GIOMM_SAVED_HOST_NOT_FOUND
+// restore the previously-defined HOST_NOT_FOUND macro
+#define HOST_NOT_FOUND GIOMM_SAVED_HOST_NOT_FOUND
+#undef GIOMM_SAVED_HOST_NOT_FOUND
+#endif // GIOMM_SAVED_HOST_NOT_FOUND
diff --git a/gio/src/file.hg b/gio/src/file.hg
index f2b595a..3a0fd37 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -222,7 +222,7 @@ public:
* the file doesn't already exist it is created.
*
* By default files created are generally readable by everyone,
- * but if you pass FILE_CREATE_PRIVATE in @a flags the file
+ * but if you pass FileCreateFlags::PRIVATE in @a flags the file
* will be made readable only to the current user, to the level that
* is supported on the target filesystem.
*
@@ -239,13 +239,13 @@ public:
* @param cancellable Optional Cancellable object.
* @return A FileOutputStream.
*/
- Glib::RefPtr<FileOutputStream> append_to(const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags
flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileOutputStream> append_to(const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags
flags = FileCreateFlags::NONE);
/** Gets an output stream for appending data to the file. If
* the file doesn't already exist it is created.
*
* By default files created are generally readable by everyone,
- * but if you pass FILE_CREATE_PRIVATE in @a flags the file
+ * but if you pass FileCreateFlags::PRIVATE in @a flags the file
* will be made readable only to the current user, to the level that
* is supported on the target filesystem.
*
@@ -257,7 +257,7 @@ public:
* @param flags A set of FileCreateFlags.
* @return A FileOutputStream.
*/
- Glib::RefPtr<FileOutputStream> append_to(FileCreateFlags flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileOutputStream> append_to(FileCreateFlags flags = FileCreateFlags::NONE);
_IGNORE(g_file_append_to)
//We renamed this to create_file from (g_file_create() and g_file_create_readwrite), to avoid confusion
with static create() methods,
@@ -267,7 +267,7 @@ public:
* The file must not already exist.
*
* By default files created are generally readable by everyone,
- * but if you pass FILE_CREATE_PRIVATE in @a flags the file
+ * but if you pass FileCreateFlags::PRIVATE in @a flags the file
* will be made readable only to the current user, to the level that
* is supported on the target filesystem.
*
@@ -288,13 +288,13 @@ public:
* @param flags a set of FileCreateFlags.
* @return A FileOutputStream for the newly created file.
*/
- Glib::RefPtr<FileOutputStream> create_file(const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags
flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileOutputStream> create_file(const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags
flags = FileCreateFlags::NONE);
/** Creates a new file and returns an output stream for writing to it.
* The file must not already exist.
*
* By default files created are generally readable by everyone,
- * but if you pass FILE_CREATE_PRIVATE in @a flags the file
+ * but if you pass FileCreateFlags::PRIVATE in @a flags the file
* will be made readable only to the current user, to the level that
* is supported on the target filesystem.
*
@@ -311,14 +311,14 @@ public:
* @param flags a set of FileCreateFlags.
* @return A FileOutputStream for the newly created file.
*/
- Glib::RefPtr<FileOutputStream> create_file(FileCreateFlags flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileOutputStream> create_file(FileCreateFlags flags = FileCreateFlags::NONE);
_IGNORE(g_file_create)
/** Creates a new file and returns a stream for reading and writing to it.
* The file must not already exist.
*
* By default files created are generally readable by everyone,
- * but if you pass FILE_CREATE_PRIVATE in @a flags the file
+ * but if you pass FileCreateFlags::PRIVATE in @a flags the file
* will be made readable only to the current user, to the level that
* is supported on the target filesystem.
*
@@ -343,13 +343,13 @@ public:
* @param flags a set of FileCreateFlags.
* @return A FileOutputStream for the newly created file.
*/
- Glib::RefPtr<FileIOStream> create_file_readwrite(const Glib::RefPtr<Cancellable>& cancellable,
FileCreateFlags flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileIOStream> create_file_readwrite(const Glib::RefPtr<Cancellable>& cancellable,
FileCreateFlags flags = FileCreateFlags::NONE);
/** Creates a new file and returns a stream for reading and writing to it.
* The file must not already exist.
*
* By default files created are generally readable by everyone,
- * but if you pass FILE_CREATE_PRIVATE in @a flags the file
+ * but if you pass FileCreateFlags::PRIVATE in @a flags the file
* will be made readable only to the current user, to the level that
* is supported on the target filesystem.
*
@@ -370,7 +370,7 @@ public:
* @param flags a set of FileCreateFlags.
* @return A FileOutputStream for the newly created file.
*/
- Glib::RefPtr<FileIOStream> create_file_readwrite(FileCreateFlags flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileIOStream> create_file_readwrite(FileCreateFlags flags = FileCreateFlags::NONE);
_IGNORE(g_file_create_readwrite)
@@ -380,7 +380,7 @@ public:
* not affect an already existing copy of the file. For instance, for local files it may write to a
* temporary file and then atomically rename over the destination when the stream is closed.
*
- * By default files created are generally readable by everyone, but if you pass FILE_CREATE_PRIVATE in
+ * By default files created are generally readable by everyone, but if you pass FileCreateFlags::PRIVATE in
* @a flags the file will be made readable only to the current user, to the level that is supported on the
* target filesystem.
*
@@ -409,7 +409,7 @@ public:
* @param flags A set of FileCreateFlags.
* @return A FileOutputStream.
*/
- Glib::RefPtr<FileOutputStream> replace(const Glib::RefPtr<Cancellable>& cancellable, const std::string&
etag = std::string(), bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileOutputStream> replace(const Glib::RefPtr<Cancellable>& cancellable, const std::string&
etag = std::string(), bool make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE);
/** Returns an output stream for overwriting the file, possibly creating a backup copy of the file first.
@@ -417,7 +417,7 @@ public:
* not affect an already existing copy of the file. For instance, for local files it may write to a
* temporary file and then atomically rename over the destination when the stream is closed.
*
- * By default files created are generally readable by everyone, but if you pass FILE_CREATE_PRIVATE in
+ * By default files created are generally readable by everyone, but if you pass FileCreateFlags::PRIVATE in
* @a flags the file will be made readable only to the current user, to the level that is supported on the
* target filesystem.
*
@@ -442,7 +442,7 @@ public:
* @param flags A set of FileCreateFlags.
* @return A FileOutputStream.
*/
- Glib::RefPtr<FileOutputStream> replace(const std::string& etag = std::string(), bool make_backup = false,
FileCreateFlags flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileOutputStream> replace(const std::string& etag = std::string(), bool make_backup = false,
FileCreateFlags flags = FileCreateFlags::NONE);
_IGNORE(g_file_replace)
@@ -456,7 +456,7 @@ public:
* @param flags a set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
*/
- void append_to_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void append_to_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
FileCreateFlags flags = FileCreateFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
/** Asynchronously opens the file for appending.
* For more details, see append_to() which is the synchronous version of this call.
@@ -466,7 +466,7 @@ public:
* @param flags a set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
*/
- void append_to_async(const SlotAsyncReady& slot, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority
= Glib::PRIORITY_DEFAULT);
+ void append_to_async(const SlotAsyncReady& slot, FileCreateFlags flags = FileCreateFlags::NONE, int
io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_append_to_async)
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> append_to_finish(const Glib::RefPtr<AsyncResult>& res),
@@ -486,7 +486,7 @@ public:
* @param flags a set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
*/
- void create_file_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void create_file_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
FileCreateFlags flags = FileCreateFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
/** Asynchronously creates a new file and returns an output stream for writing to it. The file must not
already exist.
* For more details, see create_file() which is the synchronous version of this call.
@@ -497,7 +497,7 @@ public:
* @param flags a set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
*/
- void create_file_async(const SlotAsyncReady& slot, FileCreateFlags flags = FILE_CREATE_NONE, int
io_priority = Glib::PRIORITY_DEFAULT);
+ void create_file_async(const SlotAsyncReady& slot, FileCreateFlags flags = FileCreateFlags::NONE, int
io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_create_async)
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> create_file_finish(const Glib::RefPtr<AsyncResult>& res),
@@ -519,7 +519,7 @@ public:
*
* @newin{2,24}
*/
- void create_file_readwrite_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void create_file_readwrite_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
FileCreateFlags flags = FileCreateFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
/** Asynchronously creates a new file and returns a stream for reading and
* writing to it. The file must not already exist.
@@ -534,7 +534,7 @@ public:
*
* @newin{2,24}
*/
- void create_file_readwrite_async(const SlotAsyncReady& slot, FileCreateFlags flags = FILE_CREATE_NONE, int
io_priority = Glib::PRIORITY_DEFAULT);
+ void create_file_readwrite_async(const SlotAsyncReady& slot, FileCreateFlags flags =
FileCreateFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_create_readwrite_async)
_WRAP_METHOD(Glib::RefPtr<FileIOStream> create_file_readwrite_finish(const Glib::RefPtr<AsyncResult>& res),
@@ -552,7 +552,7 @@ public:
* @param flags A set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
*/
- void replace_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
std::string& etag = std::string(), bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE, int
io_priority = Glib::PRIORITY_DEFAULT);
+ void replace_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
std::string& etag = std::string(), bool make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE,
int io_priority = Glib::PRIORITY_DEFAULT);
/** Asyncronously overwrites the file, replacing the contents, possibly creating a backup copy of the file
first.
* For more details, see replace() which is the synchronous version of this call.
@@ -564,7 +564,7 @@ public:
* @param flags A set of FileCreateFlags.
* @param io_priority The I/O priority of the request.
*/
- void replace_async(const SlotAsyncReady& slot, const std::string& etag = std::string(), bool make_backup =
false, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void replace_async(const SlotAsyncReady& slot, const std::string& etag = std::string(), bool make_backup =
false, FileCreateFlags flags = FileCreateFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_replace_async)
_WRAP_METHOD(Glib::RefPtr<FileOutputStream> replace_finish(const Glib::RefPtr<AsyncResult>& res),
@@ -639,7 +639,7 @@ public:
*
* @newin{2,24}
*/
- Glib::RefPtr<FileIOStream> replace_readwrite(const Glib::RefPtr<Cancellable>& cancellable, const
std::string& etag = std::string(), bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileIOStream> replace_readwrite(const Glib::RefPtr<Cancellable>& cancellable, const
std::string& etag = std::string(), bool make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE);
/** Returns an output stream for overwriting the file in readwrite mode, possibly creating a backup copy
of the file first.
@@ -659,7 +659,7 @@ public:
*
* @newin{2,24}
*/
- Glib::RefPtr<FileIOStream> replace_readwrite(const std::string& etag = std::string(), bool make_backup =
false, FileCreateFlags flags = FILE_CREATE_NONE);
+ Glib::RefPtr<FileIOStream> replace_readwrite(const std::string& etag = std::string(), bool make_backup =
false, FileCreateFlags flags = FileCreateFlags::NONE);
_IGNORE(g_file_replace_readwrite)
@@ -679,7 +679,7 @@ public:
*
* @newin{2,24}
*/
- void replace_readwrite_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
const std::string& etag = std::string(), bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE,
int io_priority = Glib::PRIORITY_DEFAULT);
+ void replace_readwrite_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
const std::string& etag = std::string(), bool make_backup = false, FileCreateFlags flags =
FileCreateFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
/** Asyncronously overwrites the file in read-write mode, replacing the contents, possibly creating a
backup copy of the file first.
*
@@ -694,7 +694,7 @@ public:
*
* @newin{2,24}
*/
- void replace_readwrite_async(const SlotAsyncReady& slot, const std::string& etag = std::string(), bool
make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void replace_readwrite_async(const SlotAsyncReady& slot, const std::string& etag = std::string(), bool
make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_replace_readwrite_async)
_WRAP_METHOD(Glib::RefPtr<FileIOStream> replace_readwrite_finish(const Glib::RefPtr<AsyncResult>& res),
@@ -719,7 +719,7 @@ public:
*
* For symlinks, normally the information about the target of the
* symlink is returned, rather than information about the symlink itself.
- * However if you pass FILE_QUERY_INFO_NOFOLLOW_SYMLINKS in @a flags the
+ * However if you pass FileQueryInfoFlags::NOFOLLOW_SYMLINKS in @a flags the
* information about the symlink itself will be returned. Also, for symlinks
* that point to non-existing files the information about the symlink itself
* will be returned.
@@ -732,7 +732,7 @@ public:
* @param flags: A set of FileQueryInfoFlags.
* @result a FileInfo for the file, or an empty RefPtr on error.
*/
- Glib::RefPtr<FileInfo> query_info(const Glib::RefPtr<Cancellable>& cancellable, const std::string&
attributes = "*", FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE) const;
+ Glib::RefPtr<FileInfo> query_info(const Glib::RefPtr<Cancellable>& cancellable, const std::string&
attributes = "*", FileQueryInfoFlags flags = FileQueryInfoFlags::NONE) const;
/** Gets the requested information about the file. The result
* is a FileInfo object that contains key-value attributes (such as the type or size
@@ -748,7 +748,7 @@ public:
*
* For symlinks, normally the information about the target of the
* symlink is returned, rather than information about the symlink itself.
- * However if you pass FILE_QUERY_INFO_NOFOLLOW_SYMLINKS in @a flags the
+ * However if you pass FileQueryInfoFlags::NOFOLLOW_SYMLINKS in @a flags the
* information about the symlink itself will be returned. Also, for symlinks
* that point to non-existing files the information about the symlink itself
* will be returned.
@@ -760,7 +760,7 @@ public:
* @param flags: A set of FileQueryInfoFlags.
* @result a FileInfo for the file, or an empty RefPtr on error.
*/
- Glib::RefPtr<FileInfo> query_info(const std::string& attributes = "*", FileQueryInfoFlags flags =
FILE_QUERY_INFO_NONE) const;
+ Glib::RefPtr<FileInfo> query_info(const std::string& attributes = "*", FileQueryInfoFlags flags =
FileQueryInfoFlags::NONE) const;
_IGNORE(g_file_query_info)
@@ -780,7 +780,7 @@ public:
*
* @newin{2,18}
*/
- FileType query_file_type(FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE) const;
+ FileType query_file_type(FileQueryInfoFlags flags = FileQueryInfoFlags::NONE) const;
/** Asynchronously gets the requested information about specified file. The result is a FileInfo object
that contains key-value attributes (such as type or size for the file).
*
@@ -793,7 +793,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @param io_priority The I/O priority of the request.
*/
- void query_info_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
std::string& attributes = "*", FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority =
Glib::PRIORITY_DEFAULT) const;
+ void query_info_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
std::string& attributes = "*", FileQueryInfoFlags flags = FileQueryInfoFlags::NONE, int io_priority =
Glib::PRIORITY_DEFAULT) const;
/** Asynchronously gets the requested information about specified file. The result is a FileInfo object
that contains key-value attributes (such as type or size for the file).
*
@@ -805,7 +805,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @param io_priority The I/O priority of the request.
*/
- void query_info_async(const SlotAsyncReady& slot, const std::string& attributes = "*", FileQueryInfoFlags
flags = FILE_QUERY_INFO_NONE, int io_priority = Glib::PRIORITY_DEFAULT) const;
+ void query_info_async(const SlotAsyncReady& slot, const std::string& attributes = "*", FileQueryInfoFlags
flags = FileQueryInfoFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT) const;
_IGNORE(g_file_query_info_async)
@@ -959,7 +959,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @return A FileEnumerator if successful.
*/
- Glib::RefPtr<FileEnumerator> enumerate_children(const Glib::RefPtr<Cancellable>& cancellable, const
std::string& attributes = "*", FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE);
+ Glib::RefPtr<FileEnumerator> enumerate_children(const Glib::RefPtr<Cancellable>& cancellable, const
std::string& attributes = "*", FileQueryInfoFlags flags = FileQueryInfoFlags::NONE);
_IGNORE(g_file_enumerate_children)
/** Gets the requested information about the files in a directory. The result
@@ -982,7 +982,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @return A FileEnumerator if successful.
*/
- Glib::RefPtr<FileEnumerator> enumerate_children(const std::string& attributes = "*", FileQueryInfoFlags
flags = FILE_QUERY_INFO_NONE);
+ Glib::RefPtr<FileEnumerator> enumerate_children(const std::string& attributes = "*", FileQueryInfoFlags
flags = FileQueryInfoFlags::NONE);
_IGNORE(g_file_enumerate_children)
@@ -998,7 +998,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @param io_priority The I/O priority of the request.
*/
- void enumerate_children_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
const std::string& attributes = "*", FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority =
Glib::PRIORITY_DEFAULT);
+ void enumerate_children_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
const std::string& attributes = "*", FileQueryInfoFlags flags = FileQueryInfoFlags::NONE, int io_priority =
Glib::PRIORITY_DEFAULT);
/** Asynchronously gets the requested information about the files in a directory. The result is a
GFileEnumerator object that will give out GFileInfo objects for all the files in the directory.
*
@@ -1010,7 +1010,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @param io_priority The I/O priority of the request.
*/
- void enumerate_children_async(const SlotAsyncReady& slot, const std::string& attributes = "*",
FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void enumerate_children_async(const SlotAsyncReady& slot, const std::string& attributes = "*",
FileQueryInfoFlags flags = FileQueryInfoFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_enumerate_children_async)
_WRAP_METHOD(Glib::RefPtr<FileEnumerator> enumerate_children_finish(const Glib::RefPtr<AsyncResult>& res),
@@ -1121,8 +1121,8 @@ public:
using SlotFileProgress = sigc::slot<void(goffset, goffset)>;
/** Copies the file source to the location specified by destination. Can not handle recursive copies of
directories.
- * If the flag FILE_COPY_OVERWRITE is specified an already existing destination file is overwritten.
- * If the flag FILE_COPY_NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks,
otherwise the target of the source symlink will be copied.
+ * If the flag FileCopyFlags::OVERWRITE is specified an already existing destination file is overwritten.
+ * If the flag FileCopyFlags::NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks,
otherwise the target of the source symlink will be copied.
*
* The operation can be cancelled by triggering the cancellable object from another thread. If the
operation was cancelled, a Gio::Error with CANCELLED will be thrown.
*
@@ -1130,55 +1130,55 @@ public:
*
* If the source file does not exist then a Gio::Error with NOT_FOUND will be thrown, independent on the
status of the destination.
*
- * If FILE_COPY_OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will be
thrown.
+ * If FileCopyFlags::OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will
be thrown.
*
* If trying to overwrite a file over a directory a Gio::Error with IS_DIRECTORY will be thrown.
* If trying to overwrite a directory with a directory a Gio::Error with WOULD_MERGE will be thrown.
*
- * If the source is a directory and the target does not exist, or FILE_COPY_OVERWRITE is specified and the
target is a file,
+ * If the source is a directory and the target does not exist, or FileCopyFlags::OVERWRITE is specified
and the target is a file,
* then a Gio::Error with WOULD_RECURSE will be thrown.
*
* If you are interested in copying the Gio::File object itself (not the on-disk file), see File::dup().
*/
- bool copy(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, const
Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags = FILE_COPY_NONE);
+ bool copy(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, const
Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags = FileCopyFlags::NONE);
/** Copies the file source to the location specified by destination. Can not handle recursive copies of
directories.
- * If the flag FILE_COPY_OVERWRITE is specified an already existing destination file is overwritten.
- * If the flag FILE_COPY_NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks,
otherwise the target of the source symlink will be copied.
+ * If the flag FileCopyFlags::OVERWRITE is specified an already existing destination file is overwritten.
+ * If the flag FileCopyFlags::NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks,
otherwise the target of the source symlink will be copied.
*
* The operation can be monitored via the @a slot callback.
*
* If the source file does not exist then a Gio::Error with NOT_FOUND will be thrown, independent on the
status of the destination.
*
- * If FILE_COPY_OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will be
thrown.
+ * If FileCopyFlags::OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will
be thrown.
*
* If trying to overwrite a file over a directory a Gio::Error with IS_DIRECTORY will be thrown.
* If trying to overwrite a directory with a directory a Gio::Error with WOULD_MERGE will be thrown.
*
- * If the source is a directory and the target does not exist, or FILE_COPY_OVERWRITE is specified and the
target is a file,
+ * If the source is a directory and the target does not exist, or FileCopyFlags::OVERWRITE is specified
and the target is a file,
* then a Gio::Error with WOULD_RECURSE will be thrown.
*
* If you are interested in copying the Gio::File object itself (not the on-disk file), see File::dup().
*/
- bool copy(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, FileCopyFlags flags =
FILE_COPY_NONE);
+ bool copy(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, FileCopyFlags flags =
FileCopyFlags::NONE);
/** Copies the file source to the location specified by destination. Can not handle recursive copies of
directories.
- * If the flag FILE_COPY_OVERWRITE is specified an already existing destination file is overwritten.
- * If the flag FILE_COPY_NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks,
otherwise the target of the source symlink will be copied.
+ * If the flag FileCopyFlags::OVERWRITE is specified an already existing destination file is overwritten.
+ * If the flag FileCopyFlags::NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks,
otherwise the target of the source symlink will be copied.
*
* If the source file does not exist then a Gio::Error with NOT_FOUND will be thrown, independent on the
status of the destination.
*
- * If FILE_COPY_OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will be
thrown.
+ * If FileCopyFlags::OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will
be thrown.
*
* If trying to overwrite a file over a directory a Gio::Error with IS_DIRECTORY will be thrown.
* If trying to overwrite a directory with a directory a Gio::Error with WOULD_MERGE will be thrown.
*
- * If the source is a directory and the target does not exist, or FILE_COPY_OVERWRITE is specified and the
target is a file,
+ * If the source is a directory and the target does not exist, or FileCopyFlags::OVERWRITE is specified
and the target is a file,
* then a Gio::Error with WOULD_RECURSE will be thrown.
*
* If you are interested in copying the Gio::File object itself (not the on-disk file), see File::dup().
*/
- bool copy(const Glib::RefPtr<File>& destination, FileCopyFlags flags = FILE_COPY_NONE);
+ bool copy(const Glib::RefPtr<File>& destination, FileCopyFlags flags = FileCopyFlags::NONE);
_IGNORE(g_file_copy)
/** Copies the file to the location specified by @a destination asynchronously.
@@ -1198,7 +1198,7 @@ public:
* @param flags Set of FileCopyFlags
* @param io_priority The I/O priority of the request
*/
- void copy_async(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot_progress, const
SlotAsyncReady& slot_ready, const Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags =
FILE_COPY_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void copy_async(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot_progress, const
SlotAsyncReady& slot_ready, const Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags =
FileCopyFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
/** Copies the file to the location specified by @a destination asynchronously.
* For details of the behaviour, see copy().
@@ -1212,7 +1212,7 @@ public:
* @param flags Set of FileCopyFlags
* @param io_priority The I/O priority of the request
*/
- void copy_async(const Glib::RefPtr<File>& destination, const SlotAsyncReady& slot_ready, const
Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags = FILE_COPY_NONE, int io_priority =
Glib::PRIORITY_DEFAULT);
+ void copy_async(const Glib::RefPtr<File>& destination, const SlotAsyncReady& slot_ready, const
Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags = FileCopyFlags::NONE, int io_priority =
Glib::PRIORITY_DEFAULT);
/** Copies the file to the location specified by @a destination asynchronously.
* For details of the behaviour, see copy().
@@ -1230,7 +1230,7 @@ public:
* @param flags Set of FileCopyFlags
* @param io_priority The I/O priority of the request
*/
- void copy_async(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot_progress, const
SlotAsyncReady& slot_ready, FileCopyFlags flags = FILE_COPY_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void copy_async(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot_progress, const
SlotAsyncReady& slot_ready, FileCopyFlags flags = FileCopyFlags::NONE, int io_priority =
Glib::PRIORITY_DEFAULT);
/** Copies the file to the location specified by @a destination asynchronously.
* For details of the behaviour, see copy().
@@ -1243,7 +1243,7 @@ public:
* @param flags Set of FileCopyFlags
* @param io_priority The I/O priority of the request
*/
- void copy_async(const Glib::RefPtr<File>& destination, const SlotAsyncReady& slot_ready, FileCopyFlags
flags = FILE_COPY_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void copy_async(const Glib::RefPtr<File>& destination, const SlotAsyncReady& slot_ready, FileCopyFlags
flags = FileCopyFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_copy_async)
_WRAP_METHOD(bool copy_finish(const Glib::RefPtr<AsyncResult>& res),
@@ -1254,27 +1254,27 @@ public:
* used, otherwise a copy and delete fallback is used. The native implementation may support moving
directories (for instance on moves inside
* the same filesystem), but the fallback code does not.
*
- * If the flag FILE_COPY_OVERWRITE is specified an already existing destination file is overwritten.
+ * If the flag FileCopyFlags::OVERWRITE is specified an already existing destination file is overwritten.
*
- * If the flag FILE_COPY_NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks,
otherwise the target of the source symlink will be copied.
+ * If the flag FileCopyFlags::NOFOLLOW_SYMLINKS is specified then symlinks will be copied as symlinks,
otherwise the target of the source symlink will be copied.
*
* The operation can be cancelled by triggering the cancellable object from another thread. If the
operation was cancelled, a Gio::Error with CANCELLED will be thrown.
*
* The operation can be monitored via the @a slot callback.
* If the source file does not exist then a Gio::Error with NOT_FOUND will be thrown, independent on the
status of the destination.
*
- * If G_FILE_COPY_OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS will be
thrown.
+ * If G_FileCopyFlags::OVERWRITE is not specified and the target exists, then a Gio::Error with EXISTS
will be thrown.
*
* If trying to overwrite a file over a directory a Gio::Error with IS_DIRECTORY will be thrown.
* If trying to overwrite a directory with a directory a Gio::Error with WOULD_MERGE will be thrown.
*
- * If the source is a directory and the target does not exist, or FILE_COPY_OVERWRITE is specified and the
target is a file, then a Gio::Error with WOULD_RECURSE may be thrown (if the native move operation isn't
available).
+ * If the source is a directory and the target does not exist, or FileCopyFlags::OVERWRITE is specified
and the target is a file, then a Gio::Error with WOULD_RECURSE may be thrown (if the native move operation
isn't available).
*/
- bool move(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, const
Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags = FILE_COPY_NONE);
+ bool move(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, const
Glib::RefPtr<Cancellable>& cancellable, FileCopyFlags flags = FileCopyFlags::NONE);
- bool move(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, FileCopyFlags flags =
FILE_COPY_NONE);
+ bool move(const Glib::RefPtr<File>& destination, const SlotFileProgress& slot, FileCopyFlags flags =
FileCopyFlags::NONE);
- bool move(const Glib::RefPtr<File>& destination, FileCopyFlags flags = FILE_COPY_NONE);
+ bool move(const Glib::RefPtr<File>& destination, FileCopyFlags flags = FileCopyFlags::NONE);
_IGNORE(g_file_move)
_WRAP_METHOD(bool make_directory(const Glib::RefPtr<Cancellable>& cancellable{?}),
@@ -1348,7 +1348,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @return <tt>true</tt> if there was any error, <tt>false</tt> otherwise.
*/
- bool set_attributes_from_info(const Glib::RefPtr<FileInfo>& info, const Glib::RefPtr<Cancellable>&
cancellable, FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE);
+ bool set_attributes_from_info(const Glib::RefPtr<FileInfo>& info, const Glib::RefPtr<Cancellable>&
cancellable, FileQueryInfoFlags flags = FileQueryInfoFlags::NONE);
/** Tries to set all attributes in the FileInfo on the target values,
* not stopping on the first error.
@@ -1366,7 +1366,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @return <tt>true</tt> if there was any error, <tt>false</tt> otherwise.
*/
- bool set_attributes_from_info(const Glib::RefPtr<FileInfo>& info, FileQueryInfoFlags flags =
FILE_QUERY_INFO_NONE);
+ bool set_attributes_from_info(const Glib::RefPtr<FileInfo>& info, FileQueryInfoFlags flags =
FileQueryInfoFlags::NONE);
_IGNORE(g_file_set_attributes_from_info)
@@ -1381,7 +1381,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @param io_priority The I/O priority of the request.
*/
- void set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority =
Glib::PRIORITY_DEFAULT);
+ void set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, FileQueryInfoFlags flags = FileQueryInfoFlags::NONE, int io_priority
= Glib::PRIORITY_DEFAULT);
/** Asynchronously sets the attributes of file with info.
*
@@ -1393,7 +1393,7 @@ public:
* @param flags A set of FileQueryInfoFlags.
* @param io_priority The I/O priority of the request.
*/
- void set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot,
FileQueryInfoFlags flags = FILE_QUERY_INFO_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void set_attributes_async(const Glib::RefPtr<FileInfo>& info, const SlotAsyncReady& slot,
FileQueryInfoFlags flags = FileQueryInfoFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_set_attributes_async)
_IGNORE(g_file_set_attributes_finish) // takes GFileInfo**
@@ -1436,7 +1436,7 @@ public:
* @param cancellable A Cancellable object.
* @param flags Flags affecting the operation.
*/
- void mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady&
slot, const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady&
slot, const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MountMountFlags::NONE);
/** Starts a @a mount_operation, mounting the volume that contains the file.
*
@@ -1447,7 +1447,7 @@ public:
* @param slot A callback slot which will be called when the request is satisfied.
* @param flags Flags affecting the operation.
*/
- void mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady&
slot, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount_enclosing_volume(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady&
slot, MountMountFlags flags = MountMountFlags::NONE);
/** Starts a @a mount_operation, mounting the volume that contains the file.
*
@@ -1457,14 +1457,14 @@ public:
* @param slot A callback slot which will be called when the request is satisfied.
* @param flags Flags affecting the operation.
*/
- void mount_enclosing_volume(const SlotAsyncReady& slot, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount_enclosing_volume(const SlotAsyncReady& slot, MountMountFlags flags = MountMountFlags::NONE);
_IGNORE(g_file_mount_enclosing_volume)
/** Starts a @a mount_operation, mounting the volume that contains the file.
*
* @param flags Flags affecting the operation.
*/
- void mount_enclosing_volume(MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount_enclosing_volume(MountMountFlags flags = MountMountFlags::NONE);
_IGNORE(g_file_mount_enclosing_volume)
_WRAP_METHOD(bool mount_enclosing_volume_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -1484,7 +1484,7 @@ public:
* @param slot A callback slot which will be called when the request is satisfied.
* @param flags Flags affecting the operation.
*/
- void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MountMountFlags::NONE);
/** Mounts a file of type FILE_TYPE_MOUNTABLE. Using @a mount_operation, you can request callbacks when,
for instance,
* passwords are needed during authentication.
@@ -1495,7 +1495,7 @@ public:
* @param slot A callback slot which will be called when the request is satisfied.
* @param flags Flags affecting the operation.
*/
- void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountMountFlags flags = MountMountFlags::NONE);
/** Mounts a file of type FILE_TYPE_MOUNTABLE without user interaction.
*
@@ -1504,13 +1504,13 @@ public:
* @param slot A callback slot which will be called when the request is satisfied.
* @param flags Flags affecting the operation.
*/
- void mount_mountable(const SlotAsyncReady& slot, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount_mountable(const SlotAsyncReady& slot, MountMountFlags flags = MountMountFlags::NONE);
/** Mounts a file of type FILE_TYPE_MOUNTABLE without user interaction.
*
* @param flags Flags affecting the operation.
*/
- void mount_mountable(MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount_mountable(MountMountFlags flags = MountMountFlags::NONE);
_IGNORE(g_file_mount_mountable)
_WRAP_METHOD(Glib::RefPtr<File> mount_mountable_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -1528,7 +1528,7 @@ public:
* @param cancellable A Cancellable object which can be used to cancel the operation.
* @param flags Flags affecting the operation.
*/
- void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Unmounts a file of type FILE_TYPE_MOUNTABLE.
*
@@ -1537,13 +1537,13 @@ public:
* @param slot A callback slot which will be called when the request is satisfied.
* @param flags Flags affecting the operation.
*/
- void unmount_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void unmount_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Unmounts a file of type FILE_TYPE_MOUNTABLE.
*
* @param flags Flags affecting the operation.
*/
- void unmount_mountable(MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void unmount_mountable(MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Unmounts a file of type FILE_TYPE_MOUNTABLE.
*
@@ -1559,7 +1559,7 @@ public:
*
* @newin{2,24}
*/
- void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Unmounts a file of type FILE_TYPE_MOUNTABLE.
*
@@ -1571,7 +1571,7 @@ public:
*
* @newin{2,24}
*/
- void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& mount_operation,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void unmount_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& mount_operation,
MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Unmounts a file of type FILE_TYPE_MOUNTABLE.
*
@@ -1580,7 +1580,7 @@ public:
*
* @newin{2,24}
*/
- void unmount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MOUNT_UNMOUNT_NONE);
+ void unmount_mountable(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MountUnmountFlags::NONE);
_IGNORE(g_file_unmount_mountable, g_file_unmount_mountable_finish, g_file_unmount_mountable_with_operation)
@@ -1599,7 +1599,7 @@ public:
* @param cancellable A Cancellable object which can be used to cancel the operation.
* @param flags Flags affecting the operation.
*/
- void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Starts an asynchronous eject on a mountable.
*
@@ -1608,13 +1608,13 @@ public:
* @param slot A callback slot which will be called when the request is satisfied.
* @param flags Flags affecting the operation.
*/
- void eject_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void eject_mountable(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Starts an asynchronous eject on a mountable.
*
* @param flags Flags affecting the operation.
*/
- void eject_mountable(MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void eject_mountable(MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Starts an asynchronous eject on a mountable.
*
@@ -1630,7 +1630,7 @@ public:
*
* @newin{2,24}
*/
- void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Starts an asynchronous eject on a mountable.
*
@@ -1642,7 +1642,7 @@ public:
*
* @newin{2,24}
*/
- void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& mount_operation,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void eject_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& mount_operation,
MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Starts an asynchronous eject on a mountable.
*
@@ -1651,7 +1651,7 @@ public:
*
* @newin{2,24}
*/
- void eject_mountable(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MOUNT_UNMOUNT_NONE);
+ void eject_mountable(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MountUnmountFlags::NONE);
_IGNORE(g_file_eject_mountable, g_file_eject_mountable_finish, g_file_eject_mountable_with_operation)
@@ -1665,7 +1665,7 @@ public:
* Normally only a subset of the file attributes are copied,
* those that are copies in a normal file copy operation
* (which for instance does not include e.g. mtime). However
- * if FILE_COPY_ALL_METADATA is specified in @a flags, then
+ * if FileCopyFlags::ALL_METADATA is specified in @a flags, then
* all the metadata that is possible to copy is copied.
*
* @param destination A File to copy attributes to.
@@ -1673,21 +1673,21 @@ public:
* @param flags A set of FileMonitorFlags.
* @result true if the attributes were copied successfully, false otherwise.
*/
- bool copy_attributes(const Glib::RefPtr<File>& destination, const Glib::RefPtr<Cancellable>& cancellable,
FileCopyFlags flags = FILE_COPY_NONE);
+ bool copy_attributes(const Glib::RefPtr<File>& destination, const Glib::RefPtr<Cancellable>& cancellable,
FileCopyFlags flags = FileCopyFlags::NONE);
/** Copies the file attributes from @a source to @a destination.
*
* Normally only a subset of the file attributes are copied,
* those that are copies in a normal file copy operation
* (which for instance does not include e.g. mtime). However
- * if FILE_COPY_ALL_METADATA is specified in @a flags, then
+ * if FileCopyFlags::ALL_METADATA is specified in @a flags, then
* all the metadata that is possible to copy is copied.
*
* @param destination A File to copy attributes to.
* @param flags A set of FileMonitorFlags.
* @result true if the attributes were copied successfully, false otherwise.
*/
- bool copy_attributes(const Glib::RefPtr<File>& destination, FileCopyFlags flags = FILE_COPY_NONE);
+ bool copy_attributes(const Glib::RefPtr<File>& destination, FileCopyFlags flags = FileCopyFlags::NONE);
_IGNORE(g_file_copy_attributes)
/** Obtains a directory monitor for the given file.
@@ -1700,7 +1700,7 @@ public:
* @param flags A set of FileMonitorFlags.
* @return A FileMonitor for the file.
*/
- Glib::RefPtr<FileMonitor> monitor_directory(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags
flags = FILE_MONITOR_NONE);
+ Glib::RefPtr<FileMonitor> monitor_directory(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags
flags = FileMonitorFlags::NONE);
/** Obtains a directory monitor for the given file.
* This may fail if directory monitoring is not supported.
@@ -1708,7 +1708,7 @@ public:
* @param flags A set of FileMonitorFlags.
* @return A FileMonitor for the file.
*/
- Glib::RefPtr<FileMonitor> monitor_directory(FileMonitorFlags flags = FILE_MONITOR_NONE);
+ Glib::RefPtr<FileMonitor> monitor_directory(FileMonitorFlags flags = FileMonitorFlags::NONE);
_IGNORE(g_file_monitor_directory)
/** Obtains a file monitor for the given file. If no file notification
@@ -1721,7 +1721,7 @@ public:
* @param flags A set of FileMonitorFlags.
* @return A FileMonitor for the file.
*/
- Glib::RefPtr<FileMonitor> monitor_file(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags
flags = FILE_MONITOR_NONE);
+ Glib::RefPtr<FileMonitor> monitor_file(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags
flags = FileMonitorFlags::NONE);
/** Obtains a file monitor for the given file. If no file notification
* mechanism exists, then regular polling of the file is used.
@@ -1732,7 +1732,7 @@ public:
* @param flags A set of FileMonitorFlags.
* @return A FileMonitor for the file.
*/
- Glib::RefPtr<FileMonitor> monitor_file(FileMonitorFlags flags = FILE_MONITOR_NONE);
+ Glib::RefPtr<FileMonitor> monitor_file(FileMonitorFlags flags = FileMonitorFlags::NONE);
_IGNORE(g_file_monitor_file)
@@ -1748,7 +1748,7 @@ public:
*
* @newin{2,18}
*/
- Glib::RefPtr<FileMonitor> monitor(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags flags =
FILE_MONITOR_NONE);
+ Glib::RefPtr<FileMonitor> monitor(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags flags =
FileMonitorFlags::NONE);
/** Obtains a file monitor for the given file. If no file notification
* mechanism exists, then regular polling of the file is used.
@@ -1761,7 +1761,7 @@ public:
*
* @newin{2,18}
*/
- Glib::RefPtr<FileMonitor> monitor(FileMonitorFlags flags = FILE_MONITOR_NONE);
+ Glib::RefPtr<FileMonitor> monitor(FileMonitorFlags flags = FileMonitorFlags::NONE);
_IGNORE(g_file_monitor)
@@ -1835,7 +1835,7 @@ public:
* @param num_files The number of non-directories encountered.
* @param flags Set of FileMeasureFlags.
*/
- void measure_disk_usage(const Glib::RefPtr<Cancellable>& cancellable, const SlotFileMeasureProgress&
slot_progress, guint64& disk_usage, guint64& num_dirs, guint64& num_files, FileMeasureFlags flags =
FILE_MEASURE_NONE);
+ void measure_disk_usage(const Glib::RefPtr<Cancellable>& cancellable, const SlotFileMeasureProgress&
slot_progress, guint64& disk_usage, guint64& num_dirs, guint64& num_files, FileMeasureFlags flags =
FileMeasureFlags::NONE);
_IGNORE(g_file_measure_disk_usage)
/** Recursively measures the disk usage of the file.
@@ -1852,7 +1852,7 @@ public:
* @param flags Set of FileMeasureFlags
* @param io_priority The I/O priority of the request
*/
- void measure_disk_usage_async(const SlotAsyncReady& slot_ready, const Glib::RefPtr<Cancellable>&
cancellable, const SlotFileMeasureProgress& slot_progress, FileMeasureFlags flags = FILE_MEASURE_NONE, int
io_priority = Glib::PRIORITY_DEFAULT);
+ void measure_disk_usage_async(const SlotAsyncReady& slot_ready, const Glib::RefPtr<Cancellable>&
cancellable, const SlotFileMeasureProgress& slot_progress, FileMeasureFlags flags = FileMeasureFlags::NONE,
int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_file_measure_disk_usage_async)
_WRAP_METHOD(bool measure_disk_usage_finish(const Glib::RefPtr<AsyncResult>& result, guint64& disk_usage,
guint64& num_dirs, guint64& num_files), g_file_measure_disk_usage_finish, errthrow)
@@ -1879,7 +1879,7 @@ public:
*
* @newin{2,24}
*/
- void start_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
Glib::RefPtr<MountOperation>& start_operation, DriveStartFlags flags = DRIVE_START_NONE);
+ void start_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
Glib::RefPtr<MountOperation>& start_operation, DriveStartFlags flags = DriveStartFlags::NONE);
/** Starts a file of type Mountable.
* Using @a start_operation, you can request callbacks when, for instance,
@@ -1898,7 +1898,7 @@ public:
*
* @newin{2,24}
*/
- void start_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& start_operation,
DriveStartFlags flags = DRIVE_START_NONE);
+ void start_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& start_operation,
DriveStartFlags flags = DriveStartFlags::NONE);
_IGNORE(g_file_start_mountable)
_WRAP_METHOD(bool start_mountable_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -1923,7 +1923,7 @@ public:
*
* @newin{2,24}
*/
- void stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
Glib::RefPtr<MountOperation>& start_operation, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, const
Glib::RefPtr<MountOperation>& start_operation, MountUnmountFlags flags = MountUnmountFlags::NONE);
/** Stops a file of type Mountable.
@@ -1943,7 +1943,7 @@ public:
*
* @newin{2,24}
*/
- void stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& start_operation,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void stop_mountable(const SlotAsyncReady& slot, const Glib::RefPtr<MountOperation>& start_operation,
MountUnmountFlags flags = MountUnmountFlags::NONE);
_IGNORE(g_file_stop_mountable)
_WRAP_METHOD(bool stop_mountable_finish(const Glib::RefPtr<AsyncResult>& result),
@@ -2177,7 +2177,7 @@ public:
* for the document.
* @param cancellable A Cancellable object.
*/
- void replace_contents(const char* contents, gsize length, const std::string& etag, std::string& new_etag,
const Glib::RefPtr<Cancellable>& cancellable, bool make_backup = false, FileCreateFlags flags =
FILE_CREATE_NONE);
+ void replace_contents(const char* contents, gsize length, const std::string& etag, std::string& new_etag,
const Glib::RefPtr<Cancellable>& cancellable, bool make_backup = false, FileCreateFlags flags =
FileCreateFlags::NONE);
/** Replaces the contents of the file with @a contents of @a length bytes.
*
@@ -2197,7 +2197,7 @@ public:
* @param new_etag A location to a new entity tag
* for the document.
*/
- void replace_contents(const char* contents, gsize length, const std::string& etag, std::string& new_etag,
bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE);
+ void replace_contents(const char* contents, gsize length, const std::string& etag, std::string& new_etag,
bool make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE);
/** Replaces the contents of the file with @a contents.
*
@@ -2221,7 +2221,7 @@ public:
* for the document.
* @param cancellable A Cancellable object.
*/
- void replace_contents(const std::string& contents, const std::string& etag, std::string& new_etag, const
Glib::RefPtr<Cancellable>& cancellable, bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE);
+ void replace_contents(const std::string& contents, const std::string& etag, std::string& new_etag, const
Glib::RefPtr<Cancellable>& cancellable, bool make_backup = false, FileCreateFlags flags =
FileCreateFlags::NONE);
/** Replaces the contents of the file with @a contents.
*
@@ -2240,7 +2240,7 @@ public:
* @param new_etag A location to a new entity tag
* for the document.
*/
- void replace_contents(const std::string& contents, const std::string& etag, std::string& new_etag, bool
make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE);
+ void replace_contents(const std::string& contents, const std::string& etag, std::string& new_etag, bool
make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE);
_IGNORE(g_file_replace_contents)
@@ -2269,7 +2269,7 @@ public:
* @param make_backup true if a backup should be created.
* @param flags A set of FileCreateFlags.
*/
- void replace_contents_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
const char* contents, gsize length, const std::string& etag, bool make_backup = false, FileCreateFlags flags
= FILE_CREATE_NONE);
+ void replace_contents_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
const char* contents, gsize length, const std::string& etag, bool make_backup = false, FileCreateFlags flags
= FileCreateFlags::NONE);
/** Starts an asynchronous replacement of the file with the given
* @a contents of @a length bytes. @a etag will replace the document's
@@ -2288,7 +2288,7 @@ public:
* @param make_backup true if a backup should be created.
* @param flags A set of FileCreateFlags.
*/
- void replace_contents_async(const SlotAsyncReady& slot, const char* contents, gsize length, const
std::string& etag, bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE);
+ void replace_contents_async(const SlotAsyncReady& slot, const char* contents, gsize length, const
std::string& etag, bool make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE);
/** Starts an asynchronous replacement of the file with the given
* @a contents of @a length bytes. @a etag will replace the document's
@@ -2311,7 +2311,7 @@ public:
* @param make_backup true if a backup should be created.
* @param flags A set of FileCreateFlags.
*/
- void replace_contents_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
const std::string& contents, const std::string& etag, bool make_backup = false, FileCreateFlags flags =
FILE_CREATE_NONE);
+ void replace_contents_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
const std::string& contents, const std::string& etag, bool make_backup = false, FileCreateFlags flags =
FileCreateFlags::NONE);
/** Starts an asynchronous replacement of the file with the given
* @a contents. @a etag will replace the document's
@@ -2333,7 +2333,7 @@ public:
* @param make_backup true if a backup should be created.
* @param flags A set of FileCreateFlags.
*/
- void replace_contents_async(const SlotAsyncReady& slot, const std::string& contents, const std::string&
etag, bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE);
+ void replace_contents_async(const SlotAsyncReady& slot, const std::string& contents, const std::string&
etag, bool make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE);
_IGNORE(g_file_replace_contents_async)
@@ -2375,7 +2375,7 @@ public:
* @param make_backup true if a backup should be created.
* @param flags A set of FileCreateFlags.
*/
- void replace_contents_bytes_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>&
cancellable, const Glib::RefPtr<const Glib::Bytes>& contents, const std::string& etag, bool make_backup =
false, FileCreateFlags flags = FILE_CREATE_NONE);
+ void replace_contents_bytes_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>&
cancellable, const Glib::RefPtr<const Glib::Bytes>& contents, const std::string& etag, bool make_backup =
false, FileCreateFlags flags = FileCreateFlags::NONE);
/** Same as replace_contents_async() but takes a Gio::Bytes input instead.
*
@@ -2395,7 +2395,7 @@ public:
* @param make_backup true if a backup should be created.
* @param flags A set of FileCreateFlags.
*/
- void replace_contents_bytes_async(const SlotAsyncReady& slot, const Glib::RefPtr<const Glib::Bytes>&
contents, const std::string& etag, bool make_backup = false, FileCreateFlags flags = FILE_CREATE_NONE);
+ void replace_contents_bytes_async(const SlotAsyncReady& slot, const Glib::RefPtr<const Glib::Bytes>&
contents, const std::string& etag, bool make_backup = false, FileCreateFlags flags = FileCreateFlags::NONE);
_IGNORE(g_file_replace_contents_async)
diff --git a/gio/src/fileattributeinfolist.hg b/gio/src/fileattributeinfolist.hg
index 9f1c802..b7010c9 100644
--- a/gio/src/fileattributeinfolist.hg
+++ b/gio/src/fileattributeinfolist.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2007 The gtkmm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -32,7 +30,7 @@ namespace Gio
* e.g. "standard::*" will return all of the keys in the "standard" namespace.
*
* Values are stored within the list in Gio::FileAttributeValue structures. Values can store different
types, listed in the enum
- * Gio::FileAttributeType. Upon creation of a Gio::FileAttributeValue, the type will be set to
Gio::FILE_ATTRIBUTE_TYPE_INVALID.
+ * Gio::FileAttributeType. Upon creation of a Gio::FileAttributeValue, the type will be set to
Gio::FileAttributeType::INVALID.
*
* The list of possible attributes for a filesystem (pointed to by a Gio::File) is availible as a
Gio::FileAttributeInfoList.
* This list is queryable by key names as indicated earlier.
@@ -73,7 +71,7 @@ public:
_WRAP_METHOD(Glib::RefPtr<FileAttributeInfoList> dup() const, g_file_attribute_info_list_dup)
- _WRAP_METHOD(void add(const std::string& name, FileAttributeType type, FileAttributeInfoFlags flags =
FILE_ATTRIBUTE_INFO_NONE), g_file_attribute_info_list_add)
+ _WRAP_METHOD(void add(const std::string& name, FileAttributeType type, FileAttributeInfoFlags flags =
FileAttributeInfoFlags::NONE), g_file_attribute_info_list_add)
};
} // namespace Gio
diff --git a/gio/src/fileinfo.hg b/gio/src/fileinfo.hg
index a1cbdf3..93a39a6 100644
--- a/gio/src/fileinfo.hg
+++ b/gio/src/fileinfo.hg
@@ -26,17 +26,7 @@ _PINCLUDE(glibmm/private/object_p.h)
namespace Gio
{
-
-// Rename FILE_TYPE_UNKNOWN to FILE_TYPE_NOT_KNOWN because the former is a
-// define in a Windows header (winbase.h, included from windows.h).
-_WRAP_ENUM(FileType, GFileType, NO_GTYPE, s#FILE_TYPE_UNKNOWN#FILE_TYPE_NOT_KNOWN#)
-
-// Provide FILE_TYPE_UNKNOWN for backwards compatibility.
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-#ifndef FILE_TYPE_UNKNOWN
-const FileType FILE_TYPE_UNKNOWN = FILE_TYPE_NOT_KNOWN;
-#endif
-#endif
+_WRAP_ENUM(FileType, GFileType, NO_GTYPE)
//TODO: attribute strings
diff --git a/gio/src/gio_docs_override.xml b/gio/src/gio_docs_override.xml
index 5ea862d..5e79060 100644
--- a/gio/src/gio_docs_override.xml
+++ b/gio/src/gio_docs_override.xml
@@ -1,4 +1,67 @@
<root>
+<substitute_type_name from="GDBusActionGroup" to="Gio::DBus::ActionGroup" />
+<substitute_type_name from="GDBusConnection" to="Gio::DBus::Connection" />
+<substitute_type_name from="GDBusAuthObserver" to="Gio::DBus::AuthObserver" />
+<substitute_type_name from="GDBusMessage" to="Gio::DBus::Message" />
+<substitute_type_name from="GDBusCallFlags" to="Gio::DBus::CallFlags" />
+<substitute_type_name from="GDBusProxyFlags" to="Gio::DBus::ProxyFlags" />
+<substitute_type_name from="GDBusProxy" to="Gio::DBus::Proxy" />
+<substitute_type_name from="GDBusInterfaceInfo" to="Gio::DBus::InterfaceInfo" />
+<substitute_type_name from="GDBusServer" to="Gio::DBus::Server" />
+<substitute_type_name from="GDBusServerFlags" to="Gio::DBus::ServerFlags" />
+<substitute_type_name from="GIOErrorEnum" to="Gio::Error" />
+
+<substitute_enumerator_name from_prefix="G_APPLICATION_" to_prefix="Gio::ApplicationFlags::" />
+<!-- GConverterFlags and GConverterResult both have prefix G_CONVERTER_. -->
+<substitute_enumerator_name from_prefix="G_CONVERTER_NO_FLAGS" to_prefix="Gio::ConverterFlags::NO_FLAGS" />
+<substitute_enumerator_name from_prefix="G_CONVERTER_INPUT_AT_END"
to_prefix="Gio::ConverterFlags::INPUT_AT_END" />
+<substitute_enumerator_name from_prefix="G_CONVERTER_FLUSH" to_prefix="Gio::ConverterFlags::FLUSH" />
+<substitute_enumerator_name from_prefix="G_CONVERTER_" to_prefix="Gio::ConverterResult::" />
+
+<substitute_enumerator_name from_prefix="G_IO_ERROR_" to_prefix="Gio::Error::" />
+<substitute_enumerator_name from_prefix="G_DBUS_CONNECTION_FLAGS_" to_prefix="Gio::DBus::ConnectionFlags::"
/>
+<substitute_enumerator_name from_prefix="G_DBUS_SEND_MESSAGE_FLAGS_"
to_prefix="Gio::DBus::SendMessageFlags::" />
+<substitute_enumerator_name from_prefix="G_DBUS_MESSAGE_TYPE_" to_prefix="Gio::DBus::MessageType::" />
+<substitute_enumerator_name from_prefix="G_DBUS_ERROR_" to_prefix="Gio::DBus::Error::" />
+<substitute_enumerator_name from_prefix="G_DBUS_MESSAGE_HEADER_FIELD_"
to_prefix="Gio::DBus::MessageHeaderField::" />
+<substitute_enumerator_name from_prefix="G_DBUS_MESSAGE_FLAGS_" to_prefix="Gio::DBus::MessageFlags::" />
+<substitute_enumerator_name from_prefix="G_DBUS_PROXY_FLAGS_" to_prefix="Gio::DBus::ProxyFlags::" />
+<substitute_enumerator_name from_prefix="G_DBUS_INTERFACE_SKELETON_FLAGS_"
to_prefix="Gio::DBus::InterfaceSkeletonFlags::" />
+<substitute_enumerator_name from_prefix="G_BUS_NAME_OWNER_FLAGS_" to_prefix="Gio::DBus::BusNameOwnerFlags::"
/>
+<substitute_enumerator_name from_prefix="G_DBUS_SERVER_FLAGS_" to_prefix="Gio::DBus::ServerFlags::" />
+<substitute_enumerator_name from_prefix="G_FILE_MONITOR_" to_prefix="Gio::FileMonitorFlags::" />
+<substitute_enumerator_name from_prefix="G_FILE_TYPE_" to_prefix="Gio::FileType::" />
+<substitute_enumerator_name from_prefix="G_NETWORK_CONNECTIVITY_" to_prefix="Gio::NetworkConnectivity::" />
+<substitute_enumerator_name from_prefix="G_RESOLVER_RECORD_" to_prefix="Gio::ResolverRecordType::" />
+<substitute_enumerator_name from_prefix="G_RESOURCE_ERROR_" to_prefix="Gio::ResourceError::" />
+<substitute_enumerator_name from_prefix="G_SETTINGS_BIND_" to_prefix="Gio::SettingsBindFlags::" />
+<substitute_enumerator_name from_prefix="G_SOCKET_PROTOCOL_" to_prefix="Gio::SocketProtocol::" />
+<substitute_enumerator_name from_prefix="G_SOCKET_TYPE_" to_prefix="Gio::SocketType::" />
+<substitute_enumerator_name from_prefix="G_SOCKET_FAMILY_" to_prefix="Gio::SocketFamily::" />
+<substitute_enumerator_name from_prefix="G_IO_" to_prefix="Glib::IOCondition::" />
+<substitute_enumerator_name from_prefix="G_SOCKET_CLIENT_" to_prefix="Gio::SocketClientEvent::" />
+<substitute_enumerator_name from_prefix="G_TLS_CERTIFICATE_" to_prefix="Gio::TlsCertificateFlags::" />
+<substitute_enumerator_name from_prefix="G_TLS_REHANDSHAKE_" to_prefix="Gio::TlsRehandshakeMode::" />
+<substitute_enumerator_name from_prefix="G_TLS_DATABASE_VERIFY_" to_prefix="Gio::TlsDatabaseVerifyFlags::" />
+<substitute_enumerator_name from_prefix="G_TLS_INTERACTION_" to_prefix="Gio::TlsInteractionResult::" />
+<substitute_enumerator_name from_prefix="G_TLS_ERROR_" to_prefix="Gio::TlsError::" />
+<substitute_enumerator_name from_prefix="G_ZLIB_COMPRESSOR_FORMAT_" to_prefix="Gio::ZlibCompressorFormat::"
/>
+<substitute_enumerator_name from_prefix="G_UNIX_SOCKET_ADDRESS_" to_prefix="Gio::UnixSocketAddressType::" />
+<!-- These are preprocessor defines. Don't substitute. -->
+<substitute_enumerator_name from="G_MAXSSIZE" to="G_MAXSSIZE" />
+<substitute_enumerator_name from="G_MAXINT" to="G_MAXINT" />
+<substitute_enumerator_name from="G_CONVERT_ERROR" to="G_CONVERT_ERROR" />
+<substitute_enumerator_name from="G_DBUS_ERROR" to="G_DBUS_ERROR" />
+<substitute_enumerator_name from="G_RESOURCE_ERROR" to="G_RESOURCE_ERROR" />
+<substitute_enumerator_name from="G_RESOLVER_ERROR" to="G_RESOLVER_ERROR" />
+<substitute_enumerator_name from="G_TLS_ERROR" to="G_TLS_ERROR" />
+<substitute_enumerator_name from_prefix="G_FILE_ATTRIBUTE_" to_prefix="G_FILE_ATTRIBUTE_" />
+<substitute_enumerator_name from_prefix="G_MENU_ATTRIBUTE_" to_prefix="G_MENU_ATTRIBUTE_" />
+<substitute_enumerator_name from_prefix="G_MENU_LINK_" to_prefix="G_MENU_LINK_" />
+<substitute_enumerator_name from_prefix="G_VARIANT_TYPE_" to_prefix="G_VARIANT_TYPE_" />
+<substitute_enumerator_name from_prefix="G_TLS_DATABASE_PURPOSE_AUTHENTICATE_"
to_prefix="G_TLS_DATABASE_PURPOSE_AUTHENTICATE_" />
+<substitute_enumerator_name from_prefix="G_KEY_FILE_DESKTOP_KEY_" to_prefix="G_KEY_FILE_DESKTOP_KEY_" />
+
<function name="g_file_make_symbolic_link">
<description>
Creates a symbolic link.
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index 98a7922..33168a0 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -498,7 +498,7 @@
'("busy" "G_IO_ERROR_BUSY" "26")
'("would-block" "G_IO_ERROR_WOULD_BLOCK" "27")
'("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28")
- '("host-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
+ '("host-was-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
'("would-merge" "G_IO_ERROR_WOULD_MERGE" "29")
'("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30")
'("too-many-open-files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31")
diff --git a/gio/src/gio_enums.defs.patch b/gio/src/gio_enums.defs.patch
index 4d64a58..4ef9701 100644
--- a/gio/src/gio_enums.defs.patch
+++ b/gio/src/gio_enums.defs.patch
@@ -6,7 +6,7 @@
'("busy" "G_IO_ERROR_BUSY" "26")
'("would-block" "G_IO_ERROR_WOULD_BLOCK" "27")
'("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28")
-+ '("host-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
++ '("host-was-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
'("would-merge" "G_IO_ERROR_WOULD_MERGE" "29")
'("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30")
'("too-many-open-files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31")
diff --git a/gio/src/iostream.hg b/gio/src/iostream.hg
index dcd5a76..0f6a3cf 100644
--- a/gio/src/iostream.hg
+++ b/gio/src/iostream.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
/* Copyright (C) 2007 The giomm Development Team
*
* This library is free software; you can redistribute it and/or
@@ -84,14 +82,14 @@ public:
*/
void splice_async(const Glib::RefPtr<IOStream>& stream2,
const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable,
- IOStreamSpliceFlags flags = Gio::IO_STREAM_SPLICE_NONE,
+ IOStreamSpliceFlags flags = Gio::IOStreamSpliceFlags::NONE,
int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_io_stream_splice_async)
/// A non-cancellable version of splice_async().
void splice_async(const Glib::RefPtr<IOStream>& stream2,
const SlotAsyncReady& slot,
- IOStreamSpliceFlags flags = Gio::IO_STREAM_SPLICE_NONE,
+ IOStreamSpliceFlags flags = Gio::IOStreamSpliceFlags::NONE,
int io_priority = Glib::PRIORITY_DEFAULT);
_WRAP_METHOD(static bool splice_finish(const Glib::RefPtr<AsyncResult>& result),
g_io_stream_splice_finish, errthrow)
diff --git a/gio/src/mount.hg b/gio/src/mount.hg
index c8dc3d9..89a8dbe 100644
--- a/gio/src/mount.hg
+++ b/gio/src/mount.hg
@@ -82,12 +82,12 @@ public:
_WRAP_METHOD(bool can_unmount() const, g_mount_can_unmount)
_WRAP_METHOD(bool can_eject() const, g_mount_can_eject)
- void unmount(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags
flags = MOUNT_UNMOUNT_NONE);
- void unmount(const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void unmount(MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void unmount(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MOUNT_UNMOUNT_NONE);
- void unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
+ void unmount(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags
flags = MountUnmountFlags::NONE);
+ void unmount(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void unmount(MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void unmount(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MountUnmountFlags::NONE);
+ void unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void unmount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
_IGNORE(g_mount_unmount)
_IGNORE(g_mount_unmount_with_operation)
@@ -106,7 +106,7 @@ public:
* @param cancellable A cancellable object which can be used to cancel the operation.
* @param flags Flags affecting the operation.
*/
- void remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MountMountFlags::NONE);
/** Remounts a mount.
* This is an asynchronous operation, and is finished by calling mount_finish() with the AsyncResult data
returned in the callback slot.
@@ -119,7 +119,7 @@ public:
* @param slot A callback which will be called when the operation is completed or canceled.
* @param flags Flags affecting the operation.
*/
- void remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, MountMountFlags
flags = MOUNT_MOUNT_NONE);
+ void remount(const Glib::RefPtr<MountOperation>& operation, const SlotAsyncReady& slot, MountMountFlags
flags = MountMountFlags::NONE);
/** Remounts a mount.
*
@@ -130,7 +130,7 @@ public:
* @param operation A mount operation.
* @param flags Flags affecting the operation.
*/
- void remount(const Glib::RefPtr<MountOperation>& operation, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void remount(const Glib::RefPtr<MountOperation>& operation, MountMountFlags flags = MountMountFlags::NONE);
/** Remounts a mount, without user interaction.
*
@@ -140,18 +140,18 @@ public:
*
* @param flags Flags affecting the operation.
*/
- void remount(MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void remount(MountMountFlags flags = MountMountFlags::NONE);
_IGNORE(g_mount_remount)
_WRAP_METHOD(bool remount_finish(const Glib::RefPtr<AsyncResult>& result), g_mount_remount_finish,
errthrow)
- void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags
flags = MOUNT_UNMOUNT_NONE);
- void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MOUNT_UNMOUNT_NONE);
+ void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags
flags = MountUnmountFlags::NONE);
+ void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MountUnmountFlags::NONE);
_IGNORE(g_mount_eject)
_IGNORE(g_mount_eject_with_operation)
diff --git a/gio/src/notification.hg b/gio/src/notification.hg
index de15fcf..cc35e2c 100644
--- a/gio/src/notification.hg
+++ b/gio/src/notification.hg
@@ -72,7 +72,7 @@ public:
_WRAP_METHOD(void set_body(const Glib::ustring& body), g_notification_set_body)
_WRAP_METHOD(void set_icon(const Glib::RefPtr<Icon>& icon), g_notification_set_icon)
_IGNORE(g_notification_set_urgent)
- _WRAP_METHOD(void set_priority(NotificationPriority priority = NOTIFICATION_PRIORITY_NORMAL),
g_notification_set_priority, newin "2,44")
+ _WRAP_METHOD(void set_priority(NotificationPriority priority = NotificationPriority::NORMAL),
g_notification_set_priority, newin "2,44")
_WRAP_METHOD(void add_button(const Glib::ustring& label, const Glib::ustring& detailed_action),
g_notification_add_button)
diff --git a/gio/src/outputstream.hg b/gio/src/outputstream.hg
index 8b0c938..ebb30ed 100644
--- a/gio/src/outputstream.hg
+++ b/gio/src/outputstream.hg
@@ -210,7 +210,7 @@ public:
* ignore.
* @return A #gssize containing the size of the data spliced.
*/
- gssize splice(const Glib::RefPtr<InputStream>& source, const Glib::RefPtr<Cancellable>& cancellable,
OutputStreamSpliceFlags flags = OUTPUT_STREAM_SPLICE_NONE);
+ gssize splice(const Glib::RefPtr<InputStream>& source, const Glib::RefPtr<Cancellable>& cancellable,
OutputStreamSpliceFlags flags = OutputStreamSpliceFlags::NONE);
/** Splices an input stream into an output stream.
*
@@ -219,7 +219,7 @@ public:
* ignore.
* @return A #gssize containing the size of the data spliced.
*/
- gssize splice(const Glib::RefPtr<InputStream>& source, OutputStreamSpliceFlags flags =
OUTPUT_STREAM_SPLICE_NONE);
+ gssize splice(const Glib::RefPtr<InputStream>& source, OutputStreamSpliceFlags flags =
OutputStreamSpliceFlags::NONE);
_IGNORE(g_output_stream_splice)
_WRAP_METHOD(bool flush(const Glib::RefPtr<Cancellable>& cancellable{?}),
@@ -414,7 +414,7 @@ public:
* @param flags A set of OutputStreamSpliceFlags.
* @param io_priority The io priority of the request.
*/
- void splice_async(const Glib::RefPtr<InputStream>& source, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, OutputStreamSpliceFlags flags = OUTPUT_STREAM_SPLICE_NONE, int
io_priority = Glib::PRIORITY_DEFAULT);
+ void splice_async(const Glib::RefPtr<InputStream>& source, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, OutputStreamSpliceFlags flags = OutputStreamSpliceFlags::NONE, int
io_priority = Glib::PRIORITY_DEFAULT);
/** Splices a stream asynchronously.
* When the operation is finished @a slot will be called.
@@ -429,7 +429,7 @@ public:
* @param flags A set of OutputStreamSpliceFlags.
* @param io_priority The io priority of the request.
*/
- void splice_async(const Glib::RefPtr<InputStream>& source, const SlotAsyncReady& slot,
OutputStreamSpliceFlags flags = OUTPUT_STREAM_SPLICE_NONE, int io_priority = Glib::PRIORITY_DEFAULT);
+ void splice_async(const Glib::RefPtr<InputStream>& source, const SlotAsyncReady& slot,
OutputStreamSpliceFlags flags = OutputStreamSpliceFlags::NONE, int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_output_stream_splice_async)
diff --git a/gio/src/resource.hg b/gio/src/resource.hg
index 5cee8bf..32e8589 100644
--- a/gio/src/resource.hg
+++ b/gio/src/resource.hg
@@ -136,11 +136,11 @@ class Resource final
public:
_WRAP_METHOD(static Glib::RefPtr<Resource> create_from_data(const Glib::RefPtr<const Glib::Bytes>& data),
g_resource_new_from_data, errthrow, newin "2,44")
_WRAP_METHOD(static Glib::RefPtr<Resource> create_from_file(const std::string& filename), g_resource_load,
errthrow, newin "2,44")
- _WRAP_METHOD(Glib::RefPtr<InputStream> open_stream(const std::string& path, ResourceLookupFlags
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_open_stream, errthrow, newin "2,44")
- _WRAP_METHOD(Glib::RefPtr<const Glib::Bytes> lookup_data(const std::string& path, ResourceLookupFlags
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_lookup_data, errthrow, newin "2,44")
+ _WRAP_METHOD(Glib::RefPtr<InputStream> open_stream(const std::string& path, ResourceLookupFlags
lookup_flags = ResourceLookupFlags::NONE) const, g_resource_open_stream, errthrow, newin "2,44")
+ _WRAP_METHOD(Glib::RefPtr<const Glib::Bytes> lookup_data(const std::string& path, ResourceLookupFlags
lookup_flags = ResourceLookupFlags::NONE) const, g_resource_lookup_data, errthrow, newin "2,44")
#m4 _CONVERSION(`char**',`std::vector<std::string>',`Glib::ArrayHandler<std::string>::array_to_vector($3,
Glib::OWNERSHIP_DEEP)')
- _WRAP_METHOD(std::vector<std::string> enumerate_children(const std::string& path, ResourceLookupFlags
lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE) const, g_resource_enumerate_children, errthrow, newin "2,44")
+ _WRAP_METHOD(std::vector<std::string> enumerate_children(const std::string& path, ResourceLookupFlags
lookup_flags = ResourceLookupFlags::NONE) const, g_resource_enumerate_children, errthrow, newin "2,44")
/** Looks for a file at the specified @a path in the resource and
* if found returns information about it.
@@ -155,7 +155,7 @@ public:
* @param lookup_flags A ResourceLookupFlags.
* @throw Gio::ResourceError if the file was not found.
*/
- void get_info(const std::string& path, gsize& size, ResourceFlags& flags, ResourceLookupFlags lookup_flags
= RESOURCE_LOOKUP_FLAGS_NONE) const;
+ void get_info(const std::string& path, gsize& size, ResourceFlags& flags, ResourceLookupFlags lookup_flags
= ResourceLookupFlags::NONE) const;
_IGNORE(g_resource_get_info)
/** Looks for a file at the specified @a path in the resource.
@@ -168,7 +168,7 @@ public:
* @param lookup_flags A ResourceLookupFlags.
* @throw Gio::ResourceError if the file was not found.
*/
- void get_file_exists(const std::string& path, ResourceLookupFlags lookup_flags =
RESOURCE_LOOKUP_FLAGS_NONE) const;
+ void get_file_exists(const std::string& path, ResourceLookupFlags lookup_flags =
ResourceLookupFlags::NONE) const;
/** Looks for a file at the specified @a path in the resource.
*
@@ -181,14 +181,14 @@ public:
* @param lookup_flags A ResourceLookupFlags.
* @return <tt>true</tt> if the file was found, <tt>false</tt> if there were errors.
*/
- bool get_file_exists_nothrow(const std::string& path, ResourceLookupFlags lookup_flags =
RESOURCE_LOOKUP_FLAGS_NONE) const;
+ bool get_file_exists_nothrow(const std::string& path, ResourceLookupFlags lookup_flags =
ResourceLookupFlags::NONE) const;
// 'register' is a keyword. Can't be the name of a method.
_WRAP_METHOD(void register_global(), g_resources_register, newin "2,44")
_WRAP_METHOD(void unregister_global(), g_resources_unregister, newin "2,44")
- _WRAP_METHOD(static Glib::RefPtr<InputStream> open_stream_global(const std::string& path,
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_open_stream, errthrow, newin
"2,44")
- _WRAP_METHOD(static Glib::RefPtr<const Glib::Bytes> lookup_data_global(const std::string& path,
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_lookup_data, errthrow, newin
"2,44")
- _WRAP_METHOD(static std::vector<std::string> enumerate_children_global(const std::string& path,
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE), g_resources_enumerate_children, errthrow,
newin "2,44")
+ _WRAP_METHOD(static Glib::RefPtr<InputStream> open_stream_global(const std::string& path,
ResourceLookupFlags lookup_flags = ResourceLookupFlags::NONE), g_resources_open_stream, errthrow, newin
"2,44")
+ _WRAP_METHOD(static Glib::RefPtr<const Glib::Bytes> lookup_data_global(const std::string& path,
ResourceLookupFlags lookup_flags = ResourceLookupFlags::NONE), g_resources_lookup_data, errthrow, newin
"2,44")
+ _WRAP_METHOD(static std::vector<std::string> enumerate_children_global(const std::string& path,
ResourceLookupFlags lookup_flags = ResourceLookupFlags::NONE), g_resources_enumerate_children, errthrow,
newin "2,44")
/** Looks for a file at the specified @a path in the set of
* globally registered resources and if found returns information about it.
@@ -203,7 +203,7 @@ public:
* @param lookup_flags A ResourceLookupFlags.
* @throw Gio::ResourceError if the file was not found.
*/
- static void get_info_global(const std::string& path, gsize& size, ResourceFlags& flags,
ResourceLookupFlags lookup_flags = RESOURCE_LOOKUP_FLAGS_NONE);
+ static void get_info_global(const std::string& path, gsize& size, ResourceFlags& flags,
ResourceLookupFlags lookup_flags = ResourceLookupFlags::NONE);
_IGNORE(g_resources_get_info)
/** Looks for a file at the specified @a path in the set of
@@ -217,7 +217,7 @@ public:
* @param lookup_flags A ResourceLookupFlags.
* @throw Gio::ResourceError if the file was not found.
*/
- static void get_file_exists_global(const std::string& path, ResourceLookupFlags lookup_flags =
RESOURCE_LOOKUP_FLAGS_NONE);
+ static void get_file_exists_global(const std::string& path, ResourceLookupFlags lookup_flags =
ResourceLookupFlags::NONE);
/** Looks for a file at the specified @a path in the set of
* globally registered resources.
@@ -231,7 +231,7 @@ public:
* @param lookup_flags A ResourceLookupFlags.
* @return <tt>true</tt> if the file was found, <tt>false</tt> if there were errors.
*/
- static bool get_file_exists_global_nothrow(const std::string& path, ResourceLookupFlags lookup_flags =
RESOURCE_LOOKUP_FLAGS_NONE);
+ static bool get_file_exists_global_nothrow(const std::string& path, ResourceLookupFlags lookup_flags =
ResourceLookupFlags::NONE);
_IGNORE(g_static_resource_init, g_static_resource_fini, g_static_resource_get_resource)dnl//Used only by
the glib-compile-resources command
};
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index 7370f4e..e47088b 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -181,8 +181,8 @@ public:
_IGNORE(g_settings_range_check)
#m4 _CONVERSION(`Glib::ObjectBase*',`gpointer',(gpointer)$3->gobj())
- _WRAP_METHOD(void bind(const Glib::ustring& key, Glib::ObjectBase* object, const Glib::ustring& property,
SettingsBindFlags flags=SETTINGS_BIND_DEFAULT), g_settings_bind)
- void bind(const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, SettingsBindFlags
flags=SETTINGS_BIND_DEFAULT);
+ _WRAP_METHOD(void bind(const Glib::ustring& key, Glib::ObjectBase* object, const Glib::ustring& property,
SettingsBindFlags flags = SettingsBindFlags::DEFAULT), g_settings_bind)
+ void bind(const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, SettingsBindFlags
flags = SettingsBindFlags::DEFAULT);
// TODO: implement bind_with_mapping
_WRAP_METHOD(void bind_writable(const Glib::ustring& key, Glib::ObjectBase* object, const Glib::ustring&
property, bool inverted=false), g_settings_bind_writable)
void bind_writable(const Glib::ustring& key, const Glib::PropertyProxy_Base& property_proxy, bool
inverted=false);
diff --git a/gio/src/tlsdatabase.hg b/gio/src/tlsdatabase.hg
index 85fdba1..ace2c31 100644
--- a/gio/src/tlsdatabase.hg
+++ b/gio/src/tlsdatabase.hg
@@ -61,31 +61,31 @@ 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_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{.?},
TlsDatabaseVerifyFlags flags{.} = TLS_DATABASE_VERIFY_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{.?},
TlsDatabaseVerifyFlags flags{.} = TLS_DATABASE_VERIFY_NONE) const, g_tls_database_verify_chain_async,
slot_name slot, slot_callback SignalProxy_async_callback)
+ _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{.?},
TlsDatabaseVerifyFlags flags{.} = TlsDatabaseVerifyFlags::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{.?},
TlsDatabaseVerifyFlags flags{.} = TlsDatabaseVerifyFlags::NONE) const, g_tls_database_verify_chain_async,
slot_name slot, slot_callback SignalProxy_async_callback)
_WRAP_METHOD(TlsCertificateFlags verify_chain_finish(const Glib::RefPtr<AsyncResult>& result),
g_tls_database_verify_chain_finish, errthrow)
- _WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_issuer(const Glib::RefPtr<const
TlsCertificate>& certificate, const Glib::RefPtr<TlsInteraction>& interaction{?}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = TLS_DATABASE_LOOKUP_NONE),
g_tls_database_lookup_certificate_issuer, errthrow)
- _WRAP_METHOD(Glib::RefPtr<const TlsCertificate> lookup_certificate_issuer(const Glib::RefPtr<const
TlsCertificate>& certificate, const Glib::RefPtr<TlsInteraction>& interaction{?}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = TLS_DATABASE_LOOKUP_NONE)
const, g_tls_database_lookup_certificate_issuer, errthrow, constversion)
+ _WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_issuer(const Glib::RefPtr<const
TlsCertificate>& certificate, const Glib::RefPtr<TlsInteraction>& interaction{?}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = TlsDatabaseLookupFlags::NONE),
g_tls_database_lookup_certificate_issuer, errthrow)
+ _WRAP_METHOD(Glib::RefPtr<const TlsCertificate> lookup_certificate_issuer(const Glib::RefPtr<const
TlsCertificate>& certificate, const Glib::RefPtr<TlsInteraction>& interaction{?}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = TlsDatabaseLookupFlags::NONE)
const, g_tls_database_lookup_certificate_issuer, errthrow, constversion)
- _WRAP_METHOD(void lookup_certificate_issuer_async(const Glib::RefPtr<const TlsCertificate>& certificate,
const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = TLS_DATABASE_LOOKUP_NONE),
g_tls_database_lookup_certificate_issuer_async, slot_name slot, slot_callback SignalProxy_async_callback)
+ _WRAP_METHOD(void lookup_certificate_issuer_async(const Glib::RefPtr<const TlsCertificate>& certificate,
const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = TlsDatabaseLookupFlags::NONE),
g_tls_database_lookup_certificate_issuer_async, slot_name slot, slot_callback SignalProxy_async_callback)
_WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_issuer_finish(const
Glib::RefPtr<AsyncResult>& result), g_tls_database_lookup_certificate_issuer_finish, errthrow)
#m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<TlsCertificate> >',`Glib::ListHandler<
Glib::RefPtr<TlsCertificate> >::list_to_vector($3, Glib::OWNERSHIP_DEEP)')
- _WRAP_METHOD(std::vector< Glib::RefPtr<TlsCertificate> > lookup_certificates_issued_by(const
Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn, const Glib::RefPtr<TlsInteraction>& interaction{?}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = Gio::TLS_DATABASE_LOOKUP_NONE),
g_tls_database_lookup_certificates_issued_by, errthrow)
+ _WRAP_METHOD(std::vector< Glib::RefPtr<TlsCertificate> > lookup_certificates_issued_by(const
Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn, const Glib::RefPtr<TlsInteraction>& interaction{?}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} =
Gio::TlsDatabaseLookupFlags::NONE), g_tls_database_lookup_certificates_issued_by, errthrow)
#m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<const TlsCertificate> >',`Glib::ListHandler<
Glib::RefPtr<const TlsCertificate> >::list_to_vector($3, Glib::OWNERSHIP_DEEP)')
- _WRAP_METHOD(std::vector< Glib::RefPtr<const TlsCertificate> > lookup_certificates_issued_by(const
Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn, const Glib::RefPtr<TlsInteraction>& interaction{?}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = Gio::TLS_DATABASE_LOOKUP_NONE)
const, g_tls_database_lookup_certificates_issued_by, errthrow)
+ _WRAP_METHOD(std::vector< Glib::RefPtr<const TlsCertificate> > lookup_certificates_issued_by(const
Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn, const Glib::RefPtr<TlsInteraction>& interaction{?}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} =
Gio::TlsDatabaseLookupFlags::NONE) const, g_tls_database_lookup_certificates_issued_by, errthrow)
- _WRAP_METHOD(void lookup_certificates_issued_by_async(const Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn,
const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = Gio::TLS_DATABASE_LOOKUP_NONE),
g_tls_database_lookup_certificates_issued_by_async, slot_name slot, slot_callback SignalProxy_async_callback)
+ _WRAP_METHOD(void lookup_certificates_issued_by_async(const Glib::RefPtr<Glib::ByteArray>& issuer_raw_dn,
const Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} =
Gio::TlsDatabaseLookupFlags::NONE), g_tls_database_lookup_certificates_issued_by_async, slot_name slot,
slot_callback SignalProxy_async_callback)
_WRAP_METHOD(std::vector< Glib::RefPtr<TlsCertificate> > lookup_certificates_issued_by_finish(const
Glib::RefPtr<AsyncResult>& result), g_tls_database_lookup_certificates_issued_by_finish, errthrow)
_WRAP_METHOD(Glib::ustring create_certificate_handle(const Glib::RefPtr<const TlsCertificate>&
certificate) const, g_tls_database_create_certificate_handle)
- _WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_for_handle(const Glib::ustring& handle, const
Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?},
TlsDatabaseLookupFlags flags{.} = TLS_DATABASE_LOOKUP_NONE), g_tls_database_lookup_certificate_for_handle,
errthrow)
- _WRAP_METHOD(Glib::RefPtr<const TlsCertificate> lookup_certificate_for_handle(const Glib::ustring& handle,
const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?},
TlsDatabaseLookupFlags flags{.} = TLS_DATABASE_LOOKUP_NONE) const,
g_tls_database_lookup_certificate_for_handle, errthrow, constversion)
+ _WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_for_handle(const Glib::ustring& handle, const
Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?},
TlsDatabaseLookupFlags flags{.} = TlsDatabaseLookupFlags::NONE),
g_tls_database_lookup_certificate_for_handle, errthrow)
+ _WRAP_METHOD(Glib::RefPtr<const TlsCertificate> lookup_certificate_for_handle(const Glib::ustring& handle,
const Glib::RefPtr<TlsInteraction>& interaction{?}, const Glib::RefPtr<Cancellable>& cancellable{.?},
TlsDatabaseLookupFlags flags{.} = TlsDatabaseLookupFlags::NONE) const,
g_tls_database_lookup_certificate_for_handle, errthrow, constversion)
- _WRAP_METHOD(void lookup_certificate_for_handle_async(const Glib::ustring& handle, const
Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = TLS_DATABASE_LOOKUP_NONE),
g_tls_database_lookup_certificate_for_handle_async, slot_name slot, slot_callback SignalProxy_async_callback)
+ _WRAP_METHOD(void lookup_certificate_for_handle_async(const Glib::ustring& handle, const
Glib::RefPtr<TlsInteraction>& interaction{?}, const SlotAsyncReady& slot{callback}, const
Glib::RefPtr<Cancellable>& cancellable{.?}, TlsDatabaseLookupFlags flags{.} = TlsDatabaseLookupFlags::NONE),
g_tls_database_lookup_certificate_for_handle_async, slot_name slot, slot_callback SignalProxy_async_callback)
_WRAP_METHOD(Glib::RefPtr<TlsCertificate> lookup_certificate_for_handle_finish(const
Glib::RefPtr<AsyncResult>& result), g_tls_database_lookup_certificate_for_handle_finish, errthrow)
#m4 _CONVERSION(`GTlsCertificate*',`const Glib::RefPtr<TlsCertificate>&',`Glib::wrap($3, true)')
diff --git a/gio/src/tlspassword.hg b/gio/src/tlspassword.hg
index 841d11a..cdf9d61 100644
--- a/gio/src/tlspassword.hg
+++ b/gio/src/tlspassword.hg
@@ -34,11 +34,11 @@ class TlsPassword : public Glib::Object
_CLASS_GOBJECT(TlsPassword, GTlsPassword, G_TLS_PASSWORD, Glib::Object, GObject)
protected:
- _WRAP_CTOR(TlsPassword(const Glib::ustring& description{.}, TlsPasswordFlags flags{.} =
Gio::TLS_PASSWORD_NONE), g_tls_password_new)
+ _WRAP_CTOR(TlsPassword(const Glib::ustring& description{.}, TlsPasswordFlags flags{.} =
Gio::TlsPasswordFlags::NONE), g_tls_password_new)
public:
_WRAP_METHOD_DOCS_ONLY(g_tls_password_new)
- _WRAP_CREATE(const Glib::ustring& description{.}, TlsPasswordFlags flags{.} = Gio::TLS_PASSWORD_NONE)
+ _WRAP_CREATE(const Glib::ustring& description{.}, TlsPasswordFlags flags{.} = Gio::TlsPasswordFlags::NONE)
_WRAP_METHOD(const guchar* get_value(gsize& length{?}) const, g_tls_password_get_value)
diff --git a/gio/src/unixsocketaddress.hg b/gio/src/unixsocketaddress.hg
index cea8669..54e0fe2 100644
--- a/gio/src/unixsocketaddress.hg
+++ b/gio/src/unixsocketaddress.hg
@@ -57,7 +57,7 @@ protected:
//TODO: Possibly add when g_unix_socket_address_new_with_type() does not do
//more than call g_object_new() (maybe file a bug).
- //_WRAP_CTOR(UnixSocketAddress(const std::string& path, int path_len = -1, UnixSocketAddressType type =
Gio::UNIX_SOCKET_ADDRESS_PATH), g_unix_socket_address_new_with_type)
+ //_WRAP_CTOR(UnixSocketAddress(const std::string& path, int path_len = -1, UnixSocketAddressType type =
Gio::UnixSocketAddressType::PATH), g_unix_socket_address_new_with_type)
public:
_WRAP_METHOD_DOCS_ONLY(g_unix_socket_address_new)
@@ -66,11 +66,11 @@ public:
//TODO: Add when the above constructor is included, removing the handwritten
//create() method for it below.
//_WRAP_METHOD_DOCS_ONLY(g_unix_socket_address_new_with_type)
- //_WRAP_CREATE(const std::string& path, int path_len = -1, UnixSocketAddressType type =
Gio::UNIX_SOCKET_ADDRESS_PATH)
+ //_WRAP_CREATE(const std::string& path, int path_len = -1, UnixSocketAddressType type =
Gio::UnixSocketAddressType::PATH)
_WRAP_METHOD_DOCS_ONLY(g_unix_socket_address_new_with_type)
static Glib::RefPtr<UnixSocketAddress> create(const std::string& path,
- UnixSocketAddressType type = Gio::UNIX_SOCKET_ADDRESS_ABSTRACT,
+ UnixSocketAddressType type = Gio::UnixSocketAddressType::ABSTRACT,
int path_len = -1);
// Deprecated.
diff --git a/gio/src/volume.hg b/gio/src/volume.hg
index 475d6b1..feac426 100644
--- a/gio/src/volume.hg
+++ b/gio/src/volume.hg
@@ -98,7 +98,7 @@ public:
* @param cancellable A cancellable object which can be used to cancel the operation.
* @param flags Flags affecting the operation.
*/
- void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountMountFlags flags = MountMountFlags::NONE);
/** Mounts a volume.
* This is an asynchronous operation, and is finished by calling mount_finish() with the AsyncResult data
returned in the callback slot.
@@ -107,20 +107,20 @@ public:
* @param slot A callback which will be called when the operation is completed or canceled.
* @param flags Flags affecting the operation.
*/
- void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountMountFlags flags = MountMountFlags::NONE);
/** Mounts a volume.
*
* @param mount_operation A mount operation.
* @param flags Flags affecting the operation.
*/
- void mount(const Glib::RefPtr<MountOperation>& mount_operation, MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount(const Glib::RefPtr<MountOperation>& mount_operation, MountMountFlags flags =
MountMountFlags::NONE);
/** Mounts a volume.
*
* @param flags Flags affecting the operation.
*/
- void mount(MountMountFlags flags = MOUNT_MOUNT_NONE);
+ void mount(MountMountFlags flags = MountMountFlags::NONE);
_IGNORE(g_volume_mount)
@@ -128,12 +128,12 @@ public:
g_volume_mount_finish,
errthrow)
- void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags
flags = MOUNT_UNMOUNT_NONE);
- void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MOUNT_UNMOUNT_NONE);
+ void eject(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags
flags = MountUnmountFlags::NONE);
+ void eject(const SlotAsyncReady& slot, MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot,
MountUnmountFlags flags = MountUnmountFlags::NONE);
+ void eject(const Glib::RefPtr<MountOperation>& mount_operation, MountUnmountFlags flags =
MountUnmountFlags::NONE);
_IGNORE(g_volume_eject)
_IGNORE(g_volume_eject_with_operation)
diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc
index 2e23526..cd6c43d 100644
--- a/glib/glibmm/dispatcher.cc
+++ b/glib/glibmm/dispatcher.cc
@@ -222,10 +222,10 @@ DispatchNotifier::DispatchNotifier(const Glib::RefPtr<MainContext>& context)
// The following code is equivalent to
// context_->signal_io().connect(
- // sigc::mem_fun(*this, &DispatchNotifier::pipe_io_handler), fd, Glib::IO_IN);
+ // sigc::mem_fun(*this, &DispatchNotifier::pipe_io_handler), fd, Glib::IOCondition::IN);
// except for source->set_can_recurse(true).
- const auto source = IOSource::create(fd, Glib::IO_IN);
+ const auto source = IOSource::create(fd, Glib::IOCondition::IN);
// If the signal emission in pipe_io_handler() starts a new main loop,
// the event source shall not be blocked while that loop runs. (E.g. while
@@ -404,10 +404,10 @@ DispatchNotifier::pipe_is_empty()
#ifdef G_OS_WIN32
return notify_queue_.empty();
#else
- PollFD poll_fd(fd_receiver_, Glib::IO_IN);
+ PollFD poll_fd(fd_receiver_, Glib::IOCondition::IN);
// GPollFD*, number of file descriptors to poll, timeout (ms)
g_poll(poll_fd.gobj(), 1, 0);
- return (poll_fd.get_revents() & Glib::IO_IN) == 0;
+ return static_cast<int>(poll_fd.get_revents() & Glib::IOCondition::IN) == 0;
#endif
}
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index 47478a1..1f51e51 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -334,7 +334,7 @@ PollFD::PollFD(PollFD::fd_t fd)
PollFD::PollFD(PollFD::fd_t fd, IOCondition events)
{
gobject_.fd = fd;
- gobject_.events = events;
+ gobject_.events = static_cast<decltype(gobject_.events)>(events);
gobject_.revents = 0;
}
@@ -1278,7 +1278,7 @@ IOSource::prepare(int& timeout)
bool
IOSource::check()
{
- return ((poll_fd_.get_revents() & poll_fd_.get_events()) != 0);
+ return static_cast<int>(poll_fd_.get_revents() & poll_fd_.get_events()) != 0;
}
bool
diff --git a/glib/glibmm/main.h b/glib/glibmm/main.h
index 4252103..3306500 100644
--- a/glib/glibmm/main.h
+++ b/glib/glibmm/main.h
@@ -48,10 +48,10 @@ public:
void set_fd(fd_t fd) { gobject_.fd = fd; }
fd_t get_fd() const { return gobject_.fd; }
- void set_events(IOCondition events) { gobject_.events = events; }
+ void set_events(IOCondition events) { gobject_.events = static_cast<decltype(gobject_.events)>(events); }
IOCondition get_events() const { return static_cast<IOCondition>(gobject_.events); }
- void set_revents(IOCondition revents) { gobject_.revents = revents; }
+ void set_revents(IOCondition revents) { gobject_.revents =
static_cast<decltype(gobject_.revents)>(revents); }
IOCondition get_revents() const { return static_cast<IOCondition>(gobject_.revents); }
GPollFD* gobj() { return &gobject_; }
diff --git a/glib/glibmm/property.h b/glib/glibmm/property.h
index d7cd91b..ca8cde9 100644
--- a/glib/glibmm/property.h
+++ b/glib/glibmm/property.h
@@ -132,9 +132,9 @@ private:
*
* This Property class currently supports the name, nick name, description default value and flags.
* The minimum and maximum bounds are set to the full range of the value.
- * Because of internal implementation, flags shouldn't be set to values: Glib::PARAM_STATIC_NAME,
- * Glib::PARAM_STATIC_NICK, Glib::PARAM_STATIC_BLURB, Glib::PARAM_CONSTRUCT and
- * Glib::PARAM_CONSTRUCT_ONLY.
+ * Because of internal implementation, flags shouldn't be set to values: Glib::ParamFlags::STATIC_NAME,
+ * Glib::ParamFlags::STATIC_NICK, Glib::ParamFlags::STATIC_BLURB, Glib::ParamFlags::CONSTRUCT and
+ * Glib::ParamFlags::CONSTRUCT_ONLY.
*
* The class information must be installed into the GObject system once per
* property, but this is handled automatically.
@@ -332,7 +332,7 @@ public:
template <class T>
Property<T>::Property(Glib::Object& object, const Glib::ustring& name)
-: Property(object, name, Glib::ustring(), Glib::ustring(), Glib::PARAM_READWRITE)
+: Property(object, name, Glib::ustring(), Glib::ustring(), Glib::ParamFlags::READWRITE)
{
}
@@ -340,7 +340,7 @@ template <class T>
Property<T>::Property(Glib::Object& object, const Glib::ustring& name,
const typename Property<T>::PropertyType& default_value)
: Property(object, name, default_value, Glib::ustring(),
- Glib::ustring(), Glib::PARAM_READWRITE)
+ Glib::ustring(), Glib::ParamFlags::READWRITE)
{
}
@@ -349,7 +349,7 @@ Property<T>::Property(Glib::Object& object, const Glib::ustring& name,
const Glib::ustring& nick, const Glib::ustring& blurb, Glib::ParamFlags flags)
: PropertyBase(object, ValueType::value_type())
{
- flags |= Glib::PARAM_READWRITE;
+ flags |= Glib::ParamFlags::READWRITE;
if (!lookup_property(name))
install_property(static_cast<ValueType&>(value_).create_param_spec(name, nick, blurb, flags));
@@ -361,7 +361,7 @@ Property<T>::Property(Glib::Object& object, const Glib::ustring& name, const Pro
:
PropertyBase(object, ValueType::value_type())
{
- flags |= Glib::PARAM_READWRITE;
+ flags |= Glib::ParamFlags::READWRITE;
static_cast<ValueType&>(value_).set(default_value);
@@ -410,7 +410,7 @@ Property<T>::get_proxy()
template <class T>
Property_ReadOnly<T>::Property_ReadOnly(Glib::Object& object, const Glib::ustring& name)
-: Property_ReadOnly(object, name, Glib::ustring(), Glib::ustring(), Glib::PARAM_READABLE)
+: Property_ReadOnly(object, name, Glib::ustring(), Glib::ustring(), Glib::ParamFlags::READABLE)
{
}
@@ -418,7 +418,7 @@ template <class T>
Property_ReadOnly<T>::Property_ReadOnly(Glib::Object& object, const Glib::ustring& name,
const typename Property_ReadOnly<T>::PropertyType& default_value)
: Property_ReadOnly(object, name, default_value, Glib::ustring(), Glib::ustring(),
- Glib::PARAM_READABLE)
+ Glib::ParamFlags::READABLE)
{
}
@@ -427,8 +427,8 @@ Property_ReadOnly<T>::Property_ReadOnly(Glib::Object& object, const Glib::ustrin
const Glib::ustring& nick, const Glib::ustring& blurb, Glib::ParamFlags flags)
: PropertyBase(object, ValueType::value_type())
{
- flags |= Glib::PARAM_READABLE;
- flags &= ~Glib::PARAM_WRITABLE;
+ flags |= Glib::ParamFlags::READABLE;
+ flags &= ~Glib::ParamFlags::WRITABLE;
if (!lookup_property(name))
install_property(static_cast<ValueType&>(value_).create_param_spec(name, nick, blurb, flags));
@@ -439,8 +439,8 @@ Property_ReadOnly<T>::Property_ReadOnly(Glib::Object& object, const Glib::ustrin
const Glib::ustring& nick, const Glib::ustring& blurb, Glib::ParamFlags flags)
: PropertyBase(object, ValueType::value_type())
{
- flags |= Glib::PARAM_READABLE;
- flags &= ~Glib::PARAM_WRITABLE;
+ flags |= Glib::ParamFlags::READABLE;
+ flags &= ~Glib::ParamFlags::WRITABLE;
static_cast<ValueType&>(value_).set(default_value);
@@ -473,7 +473,7 @@ Property_ReadOnly<T>::get_proxy()
template <class T>
Property_WriteOnly<T>::Property_WriteOnly(Glib::Object& object, const Glib::ustring& name)
: Property_WriteOnly(object, name, Glib::ustring(),
- Glib::ustring(), Glib::PARAM_WRITABLE)
+ Glib::ustring(), Glib::ParamFlags::WRITABLE)
{
}
@@ -481,7 +481,7 @@ template <class T>
Property_WriteOnly<T>::Property_WriteOnly(Glib::Object& object, const Glib::ustring& name,
const typename Property_WriteOnly<T>::PropertyType& default_value)
: Property_WriteOnly(object, name, default_value, Glib::ustring(),
- Glib::ustring(), Glib::PARAM_WRITABLE)
+ Glib::ustring(), Glib::ParamFlags::WRITABLE)
{
}
@@ -490,8 +490,8 @@ Property_WriteOnly<T>::Property_WriteOnly(Glib::Object& object, const Glib::ustr
const Glib::ustring& nick, const Glib::ustring& blurb, Glib::ParamFlags flags)
: PropertyBase(object, ValueType::value_type())
{
- flags |= Glib::PARAM_WRITABLE;
- flags &= ~Glib::PARAM_READABLE;
+ flags |= Glib::ParamFlags::WRITABLE;
+ flags &= ~Glib::ParamFlags::READABLE;
if (!lookup_property(name))
install_property(static_cast<ValueType&>(value_).create_param_spec(name, nick, blurb, flags));
@@ -503,8 +503,8 @@ Property_WriteOnly<T>::Property_WriteOnly(Glib::Object& object, const Glib::ustr
const Glib::ustring& nick, const Glib::ustring& blurb, Glib::ParamFlags flags)
: PropertyBase(object, ValueType::value_type())
{
- flags |= Glib::PARAM_WRITABLE;
- flags &= ~Glib::PARAM_READABLE;
+ flags |= Glib::ParamFlags::WRITABLE;
+ flags &= ~Glib::ParamFlags::READABLE;
static_cast<ValueType&>(value_).set(default_value);
diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h
index 7cd19f0..0aee963 100644
--- a/glib/glibmm/ustring.h
+++ b/glib/glibmm/ustring.h
@@ -611,7 +611,7 @@ public:
bool is_ascii() const;
/*! "Normalize" the %Unicode character representation of the string. */
- ustring normalize(NormalizeMode mode = NORMALIZE_DEFAULT_COMPOSE) const;
+ ustring normalize(NormalizeMode mode = NormalizeMode::DEFAULT_COMPOSE) const;
//! @}
//! @name Character case conversion.
diff --git a/glib/glibmm/value.h b/glib/glibmm/value.h
index 9afc426..9f66381 100644
--- a/glib/glibmm/value.h
+++ b/glib/glibmm/value.h
@@ -305,7 +305,7 @@ class Value_Enum : public ValueBase_Enum
public:
using CppType = T;
- void set(CppType data) { set_enum(data); }
+ void set(CppType data) { set_enum(static_cast<int>(data)); }
CppType get() const { return CppType(get_enum()); }
};
@@ -318,7 +318,7 @@ class Value_Flags : public ValueBase_Flags
public:
using CppType = T;
- void set(CppType data) { set_flags(data); }
+ void set(CppType data) { set_flags(static_cast<int>(data)); }
CppType get() const { return CppType(get_flags()); }
};
diff --git a/glib/src/binding.hg b/glib/src/binding.hg
index db2baa1..9129893 100644
--- a/glib/src/binding.hg
+++ b/glib/src/binding.hg
@@ -140,7 +140,7 @@ public:
static Glib::RefPtr<Binding> bind_property_value(
const PropertyProxy_Base& source_property,
const PropertyProxy_Base& target_property,
- BindingFlags flags = BINDING_DEFAULT,
+ BindingFlags flags = BindingFlags::DEFAULT,
const SlotTransform& transform_to = SlotTransform(),
const SlotTransform& transform_from = SlotTransform());
@@ -161,7 +161,7 @@ public:
static Glib::RefPtr<Binding> bind_property(
const PropertyProxy_Base& source_property,
const PropertyProxy_Base& target_property,
- BindingFlags flags = BINDING_DEFAULT)
+ BindingFlags flags = BindingFlags::DEFAULT)
{
return bind_property_value(source_property, target_property, flags);
}
diff --git a/glib/src/date.ccg b/glib/src/date.ccg
index ad23886..7aac7a4 100644
--- a/glib/src/date.ccg
+++ b/glib/src/date.ccg
@@ -230,12 +230,22 @@ Date::get_weekday() const
return (Date::Weekday)g_date_get_weekday(&gobject_);
}
+int Date::get_weekday_as_int() const
+{
+ return g_date_get_weekday(&gobject_);
+}
+
Date::Month
Date::get_month() const
{
return (Date::Month)g_date_get_month(&gobject_);
}
+int Date::get_month_as_int() const
+{
+ return g_date_get_month(&gobject_);
+}
+
Date::Year
Date::get_year() const
{
diff --git a/glib/src/date.hg b/glib/src/date.hg
index e5c0ca6..1f674c1 100644
--- a/glib/src/date.hg
+++ b/glib/src/date.hg
@@ -37,9 +37,9 @@ public:
using Day = guint8 ;
using Year = guint16;
- _WRAP_ENUM(Month, GDateMonth, s#^DATE_##, NO_GTYPE, get_type_func=)
- _WRAP_ENUM(Weekday, GDateWeekday, s#^DATE_##, NO_GTYPE)
- _WRAP_ENUM(DMY, GDateDMY, s#^DATE_##, NO_GTYPE)
+ _WRAP_ENUM(Month, GDateMonth, NO_GTYPE)
+ _WRAP_ENUM(Weekday, GDateWeekday, NO_GTYPE)
+ _WRAP_ENUM(DMY, GDateDMY, NO_GTYPE)
static const Day BAD_DAY = 0;
static const Year BAD_YEAR = 0;
@@ -277,11 +277,21 @@ public:
*/
Weekday get_weekday() const;
+ /** Returns the day of the week for a Date. The date must be valid.
+ * @return Day of the week as an int. Monday=1 .. Sunday=7.
+ */
+ int get_weekday_as_int() const;
+
/** Returns the month of the year. The date must be valid.
* @return Month of the year as a Date::Month.
*/
Month get_month() const;
+ /** Returns the month of the year. The date must be valid.
+ * @return Month of the year as an int. January=1 .. December=12.
+ */
+ int get_month_as_int() const;
+
/** Returns the year of a Date. The date must be valid.
* @return Year in which the date falls.
*/
diff --git a/glib/src/glib_docs_override.xml b/glib/src/glib_docs_override.xml
index 9eee106..4a32ecd 100644
--- a/glib/src/glib_docs_override.xml
+++ b/glib/src/glib_docs_override.xml
@@ -1,4 +1,19 @@
<root>
+ <substitute_type_name from="GDateMonth" to="Glib::Date::Month" />
+ <substitute_type_name from="GDateWeekday" to="Glib::Date::Weekday" />
+ <substitute_type_name from="GDateDMY" to="Glib::Date::DMY" />
+ <substitute_enumerator_name from_prefix="G_DATE_" to_prefix="Glib::Date::" />
+ <substitute_enumerator_name from_prefix="G_PARAM_" to_prefix="Glib::ParamFlags::" />
+ <substitute_enumerator_name from_prefix="G_REGEX_MATCH_" to_prefix="Glib::RegexMatchFlags::" />
+ <substitute_enumerator_name from_prefix="G_REGEX_" to_prefix="Glib::RegexCompileFlags::" />
+ <substitute_enumerator_name from_prefix="G_SPAWN_ERROR_" to_prefix="Glib::SpawnError::" />
+ <substitute_enumerator_name from_prefix="G_TIME_TYPE_" to_prefix="Glib::TimeType::" />
+ <substitute_enumerator_name from_prefix="G_UNICODE_BREAK_" to_prefix="Glib::UnicodeBreakType::" />
+ <substitute_enumerator_name from_prefix="G_NORMALIZE_" to_prefix="Glib::NormalizeMode::" />
+ <!-- These are preprocessor defines. Don't substitute. -->
+ <substitute_enumerator_name from="G_PARAM_STATIC_STRINGS" to="G_PARAM_STATIC_STRINGS" />
+ <substitute_enumerator_name from_prefix="G_VARIANT_TYPE_" to_prefix="G_VARIANT_TYPE_" />
+
<function name="g_option_context_set_summary">
<parameters>
<parameter name="context">
diff --git a/glib/src/iochannel.hg b/glib/src/iochannel.hg
index b5c4eb9..63b0c54 100644
--- a/glib/src/iochannel.hg
+++ b/glib/src/iochannel.hg
@@ -35,8 +35,8 @@ namespace Glib
class Source;
class IOSource;
-_WRAP_ENUM(SeekType, GSeekType, NO_GTYPE, s#^SEEK_#SEEK_TYPE_#)
-_WRAP_ENUM(IOStatus, GIOStatus, NO_GTYPE)
+_WRAP_ENUM(SeekType, GSeekType, NO_GTYPE)
+_WRAP_ENUM(IOStatus, GIOStatus, NO_GTYPE, s#^EOF$#ENDOFFILE#)
_WRAP_ENUM(IOFlags, GIOFlags, NO_GTYPE)
@@ -203,8 +203,8 @@ public:
/** Reads all the remaining data from the file.
* @retval str The resulting string.
- * @return Glib::IO_STATUS_NORMAL on success. This function never
- * returns Glib::IO_STATUS_EOF.
+ * @return Glib::IOStatus::NORMAL on success. This function never
+ * returns Glib::IOStatus::ENDOFFILE.
* @throw Glib::IOChannelError
* @throw Glib::ConvertError
*/
@@ -214,7 +214,7 @@ public:
/** Write a string to the I/O channel.
* Note that this method does not return the number of characters written.
* If the channel is blocking and the returned value is
- * Glib::IO_STATUS_NORMAL, the whole string was written.
+ * Glib::IOStatus::NORMAL, the whole string was written.
* @param str the string to write.
* @return The status of the operation.
* @throw Glib::IOChannelError
@@ -243,14 +243,14 @@ public:
/** Seek the I/O channel to a specific position.
* @param offset The offset in bytes from the position specified by @a type.
- * @param type A SeekType. The type Glib::SEEK_TYPE_CUR is only allowed in
+ * @param type A SeekType. The type Glib::SeekType::CUR is only allowed in
* those cases where a call to set_encoding() is allowed. See the
* documentation for set_encoding() for details.
* @return The status of the operation.
* @throw Glib::IOChannelError
* @throw Glib::ConvertError
*/
- _WRAP_METHOD(IOStatus seek(gint64 offset, SeekType type = SEEK_TYPE_SET),
+ _WRAP_METHOD(IOStatus seek(gint64 offset, SeekType type = SeekType::SET),
g_io_channel_seek_position, errthrow)
/** Flush the buffers of the I/O channel.
@@ -306,10 +306,10 @@ public:
*
* A buffered channel can only be set unbuffered if the channel's internal
* buffers have been flushed. Newly created channels or channels which have
- * returned Glib::IO_STATUS_EOF not require such a flush. For write-only
+ * returned Glib::IOStatus::ENDOFFILE not require such a flush. For write-only
* channels, a call to flush() is sufficient. For all other channels, the
* buffers may be flushed by a call to seek(). This includes the possibility
- * of seeking with seek type Glib::SEEK_TYPE_CUR and an offset of zero. Note
+ * of seeking with seek type Glib::SeekType::CUR and an offset of zero. Note
* that this means that socket-based channels cannot be set unbuffered once
* they have had data read from them.
*
@@ -362,21 +362,21 @@ public:
* -# The channel is a file, and the file pointer was just repositioned by a
* call to seek_position(). (This flushes all the internal buffers.)
* -# The current encoding is <tt>""</tt> or UTF-8.
- * -# One of the read methods has just returned Glib::IO_STATUS_EOF (or, in
- * the case of read_to_end(), Glib::IO_STATUS_NORMAL).
- * -# The read() method has returned Glib::IO_STATUS_AGAIN or thrown
+ * -# One of the read methods has just returned Glib::IOStatus::ENDOFFILE (or, in
+ * the case of read_to_end(), Glib::IOStatus::NORMAL).
+ * -# The read() method has returned Glib::IOStatus::AGAIN or thrown
* a Glib::Error exception. This may be useful in the case of
* ConvertError::ILLEGAL_SEQUENCE. Returning one of these statuses
* from read_line() or read_to_end() does <em>not</em> guarantee that
* the encoding can be changed.
*
* Channels which do not meet one of the above conditions cannot call
- * seek_position() with a seek type of Glib::SEEK_TYPE_CUR and, if they
+ * seek_position() with a seek type of Glib::SeekType::CUR and, if they
* are "seekable", cannot call write() after calling one of the API
* "read" methods.
*
* @param encoding The encoding name, or <tt>""</tt> for binary.
- * @return Glib::IO_STATUS_NORMAL if the encoding was successfully set.
+ * @return Glib::IOStatus::NORMAL if the encoding was successfully set.
* @throw Glib::IOChannelError
*/
IOStatus set_encoding(const std::string& encoding = std::string());
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index 651b089..c2f8659 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -128,7 +128,7 @@ public:
KeyFile(GKeyFile* castitem, bool takes_ownership = false);
public:
- _WRAP_METHOD(bool load_from_file(const std::string& file, KeyFileFlags flags = Glib::KEY_FILE_NONE),
g_key_file_load_from_file, errthrow)
+ _WRAP_METHOD(bool load_from_file(const std::string& file, KeyFileFlags flags = Glib::KeyFileFlags::NONE),
g_key_file_load_from_file, errthrow)
/** Loads a KeyFile from memory
* @param data The data to use as a KeyFile
@@ -136,7 +136,7 @@ public:
* @return true if the KeyFile was successfully loaded, false otherwise
* @throw Glib::KeyFileError
*/
- bool load_from_data(const Glib::ustring& data, KeyFileFlags flags = Glib::KEY_FILE_NONE);
+ bool load_from_data(const Glib::ustring& data, KeyFileFlags flags = Glib::KeyFileFlags::NONE);
_IGNORE(g_key_file_load_from_data)
#m4 _CONVERSION(`const std::vector<std::string>& ', `const gchar**', `const_cast<const gchar**>($3.data())')
@@ -144,7 +144,7 @@ public:
_IGNORE(g_key_file_load_from_dirs)
_WRAP_METHOD_DOCS_ONLY(g_key_file_load_from_dirs)
- bool load_from_dirs(const std::string& file, const std::vector<std::string>& search_dirs, std::string&
full_path, KeyFileFlags flags = Glib::KEY_FILE_NONE);
+ bool load_from_dirs(const std::string& file, const std::vector<std::string>& search_dirs, std::string&
full_path, KeyFileFlags flags = Glib::KeyFileFlags::NONE);
/** Looks for a KeyFile named @a file in the paths returned from
* g_get_user_data_dir() and g_get_system_data_dirs() and loads them
@@ -157,7 +157,7 @@ public:
* @throw Glib::KeyFileError
* @throw Glib::FileError
*/
- bool load_from_data_dirs(const std::string& file, std::string& full_path, KeyFileFlags flags =
Glib::KEY_FILE_NONE);
+ bool load_from_data_dirs(const std::string& file, std::string& full_path, KeyFileFlags flags =
Glib::KeyFileFlags::NONE);
_IGNORE(g_key_file_load_from_data_dirs)
/** Outputs the KeyFile as a string
diff --git a/glib/src/miscutils.hg b/glib/src/miscutils.hg
index 312ddb4..05efa84 100644
--- a/glib/src/miscutils.hg
+++ b/glib/src/miscutils.hg
@@ -22,7 +22,7 @@ _DEFS(glibmm,glib)
namespace Glib
{
-_WRAP_ENUM(UserDirectory, GUserDirectory, NO_GTYPE)
+_WRAP_ENUM(UserDirectory, GUserDirectory, NO_GTYPE, s#^DIRECTORY_##)
_WRAP_ENUM(FormatSizeFlags, GFormatSizeFlags, NO_GTYPE)
/** @defgroup MiscUtils Miscellaneous Utility Functions
@@ -464,7 +464,7 @@ std::string find_program_in_path(const std::string& program);
* 3292528 bytes will be converted into the string "3.2 MB".
*
* The prefix units base is 1000 (i.e. 1 kB is 1000 bytes), unless the
- * Glib::FORMAT_SIZE_IEC_UNITS flag is set.
+ * Glib::FormatSizeFlags::IEC_UNITS flag is set.
*
* @param size A size in bytes.
* @param flags Flags to modify the output.
@@ -472,7 +472,7 @@ std::string find_program_in_path(const std::string& program);
*
* @newin{2,46}
*/
-Glib::ustring format_size(guint64 size, FormatSizeFlags flags = FORMAT_SIZE_DEFAULT);
+Glib::ustring format_size(guint64 size, FormatSizeFlags flags = FormatSizeFlags::DEFAULT);
/** @} group MiscUtils */
diff --git a/glib/src/spawn.hg b/glib/src/spawn.hg
index 4e3d180..85d7ed2 100644
--- a/glib/src/spawn.hg
+++ b/glib/src/spawn.hg
@@ -50,7 +50,7 @@ using SlotSpawnChildSetup = sigc::slot<void()>;
* The first string in @a argv is of
* course the name of the program to execute. By default, the name of
* the program must be a full path; the PATH shell variable
- * will only be searched if you pass the SPAWN_SEARCH_PATH flag.
+ * will only be searched if you pass the SpawnFlags::SEARCH_PATH flag.
*
* On Windows, note that all the string or string vector arguments to
* this function and the other spawn*() functions are in UTF-8, the
@@ -92,7 +92,7 @@ using SlotSpawnChildSetup = sigc::slot<void()>;
* the child's environment.
*
* @a flags should be the bitwise OR of any flags you want to affect the
- * function's behaviour. The SPAWN_DO_NOT_REAP_CHILD flags means that
+ * function's behaviour. The SpawnFlags::DO_NOT_REAP_CHILD flags means that
* the child will not automatically be reaped; you must use a
* ChildWatch source to be notified about the death of the child
* process. Eventually you must call spawn_close_pid() on the
@@ -106,19 +106,19 @@ using SlotSpawnChildSetup = sigc::slot<void()>;
* PAWN_LEAVE_DESCRIPTORS_OPEN means that the parent's open file
* descriptors will be inherited by the child; otherwise all
* descriptors except stdin/stdout/stderr will be closed before
- * calling exec() in the child. SPAWN_SEARCH_PATH
+ * calling exec() in the child. SpawnFlags::SEARCH_PATH
* means that argv[0] need not be an absolute path, it
* will be looked for in the user's PATH.
- * SPAWN_STDOUT_TO_DEV_NULL means that the child's standard output will
+ * SpawnFlags::STDOUT_TO_DEV_NULL means that the child's standard output will
* be discarded, instead of going to the same location as the parent's
* standard output. If you use this flag, @a standard_output must be nullptr.
- * SPAWN_STDERR_TO_DEV_NULL means that the child's standard error
+ * SpawnFlags::STDERR_TO_DEV_NULL means that the child's standard error
* will be discarded, instead of going to the same location as the parent's
* standard error. If you use this flag, @a standard_error must be nullptr.
- * SPAWN_CHILD_INHERITS_STDIN means that the child will inherit the parent's
+ * SpawnFlags::CHILD_INHERITS_STDIN means that the child will inherit the parent's
* standard input (by default, the child's standard input is attached to
* /dev/null). If you use this flag, @a standard_input must be nullptr.
- * G_SPAWN_FILE_AND_ARGV_ZERO means that the first element of @a argv is
+ * SpawnFlags::FILE_AND_ARGV_ZERO means that the first element of @a argv is
* the file to execute, while the remaining elements are the
* actual argument vector to pass to the file. Normally
* spawn_async_with_pipes() uses argv[0] as the file to execute, and
@@ -141,9 +141,9 @@ using SlotSpawnChildSetup = sigc::slot<void()>;
* If non-nullptr, @a child_pid will on Unix be filled with the child's
* process ID. You can use the process ID to send signals to the
* child, or to use child_watch_add() (or waitpid()) if you specified the
- * SPAWN_DO_NOT_REAP_CHILD flag. On Windows, @a child_pid will be
+ * SpawnFlags::DO_NOT_REAP_CHILD flag. On Windows, @a child_pid will be
* filled with a handle to the child process only if you specified the
- * SPAWN_DO_NOT_REAP_CHILD flag. You can then access the child
+ * SpawnFlags::DO_NOT_REAP_CHILD flag. You can then access the child
* process using the Win32 API, for example wait for its termination
* with the WaitFor*() functions, or examine its
* exit code with GetExitCodeProcess(). You should close the handle
@@ -157,14 +157,14 @@ using SlotSpawnChildSetup = sigc::slot<void()>;
* pipe won't be created.
*
* If @a standard_input is nullptr, the child's standard input is attached to
- * /dev/null unless SPAWN_CHILD_INHERITS_STDIN is set.
+ * /dev/null unless SpawnFlags::CHILD_INHERITS_STDIN is set.
*
* If @a standard_error is nullptr, the child's standard error goes to the same
- * location as the parent's standard error unless SPAWN_STDERR_TO_DEV_NULL
+ * location as the parent's standard error unless SpawnFlags::STDERR_TO_DEV_NULL
* is set.
*
* If @a standard_output is nullptr, the child's standard output goes to the same
- * location as the parent's standard output unless SPAWN_STDOUT_TO_DEV_NULL
+ * location as the parent's standard output unless SpawnFlags::STDOUT_TO_DEV_NULL
* is set.
*
* If @a child_pid is not nullptr and an error does not occur then the returned
@@ -195,7 +195,7 @@ using SlotSpawnChildSetup = sigc::slot<void()>;
void spawn_async_with_pipes(const std::string& working_directory,
const std::vector<std::string>& argv,
const std::vector<std::string>& envp,
- SpawnFlags flags = SPAWN_DEFAULT,
+ SpawnFlags flags = SpawnFlags::DEFAULT,
const SlotSpawnChildSetup& child_setup = SlotSpawnChildSetup(),
Pid* child_pid = nullptr,
int* standard_input = nullptr,
@@ -221,7 +221,7 @@ void spawn_async_with_pipes(const std::string& working_directory,
*/
void spawn_async_with_pipes(const std::string& working_directory,
const std::vector<std::string>& argv,
- SpawnFlags flags = SPAWN_DEFAULT,
+ SpawnFlags flags = SpawnFlags::DEFAULT,
const SlotSpawnChildSetup& child_setup = SlotSpawnChildSetup(),
Pid* child_pid = nullptr,
int* standard_input = nullptr,
@@ -252,7 +252,7 @@ void spawn_async_with_pipes(const std::string& working_directory,
void spawn_async(const std::string& working_directory,
const std::vector<std::string>& argv,
const std::vector<std::string>& envp,
- SpawnFlags flags = SPAWN_DEFAULT,
+ SpawnFlags flags = SpawnFlags::DEFAULT,
const SlotSpawnChildSetup& child_setup = SlotSpawnChildSetup(),
Pid* child_pid = nullptr);
@@ -271,20 +271,20 @@ void spawn_async(const std::string& working_directory,
*/
void spawn_async(const std::string& working_directory,
const std::vector<std::string>& argv,
- SpawnFlags flags = SPAWN_DEFAULT,
+ SpawnFlags flags = SpawnFlags::DEFAULT,
const SlotSpawnChildSetup& child_setup = SlotSpawnChildSetup(),
Pid* child_pid = nullptr);
/** Executes a child synchronously (waits for the child to exit before returning).
* All output from the child is stored in @a standard_output and @a standard_error,
* if those parameters are non-nullptr. Note that you must set the
- * SPAWN_STDOUT_TO_DEV_NULL and SPAWN_STDERR_TO_DEV_NULL flags when
+ * SpawnFlags::STDOUT_TO_DEV_NULL and SpawnFlags::STDERR_TO_DEV_NULL flags when
* passing nullptr for @a standard_output and @a standard_error.
* If @a exit_status is non-nullptr, the exit status of the child is stored
* there as it would be returned by waitpid(); standard UNIX macros such
* as WIFEXITED() and WEXITSTATUS() must be used to evaluate the exit status.
* Note that this function calls waitpid() even if @a exit_status is nullptr, and
- * does not accept the SPAWN_DO_NOT_REAP_CHILD flag.
+ * does not accept the SpawnFlags::DO_NOT_REAP_CHILD flag.
* If an error occurs, no data is returned in @a standard_output,
* @a standard_error, or @a exit_status.
*
@@ -310,7 +310,7 @@ void spawn_async(const std::string& working_directory,
void spawn_sync(const std::string& working_directory,
const std::vector<std::string>& argv,
const std::vector<std::string>& envp,
- SpawnFlags flags = SPAWN_DEFAULT,
+ SpawnFlags flags = SpawnFlags::DEFAULT,
const SlotSpawnChildSetup& child_setup = SlotSpawnChildSetup(),
std::string* standard_output = nullptr,
std::string* standard_error = nullptr,
@@ -334,7 +334,7 @@ void spawn_sync(const std::string& working_directory,
*/
void spawn_sync(const std::string& working_directory,
const std::vector<std::string>& argv,
- SpawnFlags flags = SPAWN_DEFAULT,
+ SpawnFlags flags = SpawnFlags::DEFAULT,
const SlotSpawnChildSetup& child_setup = SlotSpawnChildSetup(),
std::string* standard_output = nullptr,
std::string* standard_error = nullptr,
@@ -343,8 +343,8 @@ void spawn_sync(const std::string& working_directory,
/** A simple version of spawn_async() that parses a command line with
* shell_parse_argv() and passes it to spawn_async(). It runs a
* command line in the background. Unlike spawn_async(), the
- * SPAWN_SEARCH_PATH flag is enabled, other flags are not. Note
- * that SPAWN_SEARCH_PATH can have security implications, so
+ * SpawnFlags::SEARCH_PATH flag is enabled, other flags are not. Note
+ * that SpawnFlags::SEARCH_PATH can have security implications, so
* consider using spawn_async() directly if appropriate.
*
* The same concerns on Windows apply as for spawn_command_line_sync().
@@ -362,8 +362,8 @@ void spawn_command_line_async(const std::string& command_line);
/** A simple version of spawn_sync() with little-used parameters
* removed, taking a command line instead of an argument vector. See
* spawn_sync() for full details. @a command_line will be parsed by
- * shell_parse_argv(). Unlike spawn_sync(), the SPAWN_SEARCH_PATH flag
- * is enabled. Note that SPAWN_SEARCH_PATH can have security
+ * shell_parse_argv(). Unlike spawn_sync(), the SpawnFlags::SEARCH_PATH flag
+ * is enabled. Note that SpawnFlags::SEARCH_PATH can have security
* implications, so consider using spawn_sync() directly if
* appropriate.
*
diff --git a/glib/src/value_basictypes.cc.m4 b/glib/src/value_basictypes.cc.m4
index f2448dc..82b2233 100644
--- a/glib/src/value_basictypes.cc.m4
+++ b/glib/src/value_basictypes.cc.m4
@@ -48,7 +48,7 @@ $1 Value<$1>::get() const
GParamSpec* Value<$1>::create_param_spec(const Glib::ustring& name) const
{
return create_param_spec(name, Glib::ustring(), Glib::ustring(),
- Glib::PARAM_READWRITE);
+ Glib::ParamFlags::READWRITE);
}
GParamSpec* Value<$1>::create_param_spec(const Glib::ustring& name, const Glib::ustring& nick,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
