[glibmm] Gio::Resolver: Change ResolverRecordType to Resolver::RecordType.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Gio::Resolver: Change ResolverRecordType to Resolver::RecordType.
- Date: Tue, 18 Apr 2017 20:04:04 +0000 (UTC)
commit 439fb427a4cfed9c4f2b6d27680a9b3f014e6803
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Apr 18 18:22:44 2017 +0200
Gio::Resolver: Change ResolverRecordType to Resolver::RecordType.
gio/src/resolver.ccg | 4 ++--
gio/src/resolver.hg | 10 +++++-----
tools/m4/convert_gio.m4 | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gio/src/resolver.ccg b/gio/src/resolver.ccg
index df3e0df..7838f19 100644
--- a/gio/src/resolver.ccg
+++ b/gio/src/resolver.ccg
@@ -111,7 +111,7 @@ Resolver::lookup_service_async(const Glib::ustring& service, const Glib::ustring
}
void
-Resolver::lookup_records_async(const Glib::ustring& rrname, ResolverRecordType record_type,
+Resolver::lookup_records_async(const Glib::ustring& rrname, RecordType record_type,
const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable)
{
auto slot_copy = new SlotAsyncReady(slot);
@@ -123,7 +123,7 @@ Resolver::lookup_records_async(const Glib::ustring& rrname, ResolverRecordType r
void
Resolver::lookup_records_async(
- const Glib::ustring& rrname, ResolverRecordType record_type, const SlotAsyncReady& slot)
+ const Glib::ustring& rrname, RecordType record_type, const SlotAsyncReady& slot)
{
auto slot_copy = new SlotAsyncReady(slot);
diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg
index 3b16224..b360f5c 100644
--- a/gio/src/resolver.hg
+++ b/gio/src/resolver.hg
@@ -36,8 +36,6 @@ class VariantContainerBase;
namespace Gio
{
-_WRAP_ENUM(ResolverRecordType, GResolverRecordType)
-
/** Asynchronous and cancellable DNS resolver
*
* Resolver provides cancellable synchronous and asynchronous DNS resolution,
@@ -59,6 +57,8 @@ class Resolver
protected:
public:
+ _WRAP_ENUM(RecordType, GResolverRecordType)
+
static Glib::RefPtr<Resolver> get_default();
_IGNORE(g_resolver_get_default)
static void set_default(const Glib::RefPtr<Resolver>& resolver);
@@ -141,7 +141,7 @@ public:
#m4
_CONVERSION(`GList*',`std::vector<Glib::VariantContainerBase>',`Glib::ListHandler<Glib::VariantContainerBase>::list_to_vector($3,
Glib::OWNERSHIP_DEEP)')
- _WRAP_METHOD(std::vector<Glib::VariantContainerBase> lookup_records(const Glib::ustring& rrname,
ResolverRecordType record_type, const Glib::RefPtr<Cancellable>& cancellable{?}), g_resolver_lookup_records,
errthrow)
+ _WRAP_METHOD(std::vector<Glib::VariantContainerBase> lookup_records(const Glib::ustring& rrname,
RecordType record_type, const Glib::RefPtr<Cancellable>& cancellable{?}), g_resolver_lookup_records, errthrow)
/** Begins asynchronously performing a DNS lookup for the given @a rrname,
* and eventually calls @a slot, which must call lookup_records_finish() to
@@ -154,13 +154,13 @@ public:
* @newin{2,36}
*/
void lookup_records_async(const Glib::ustring& rrname,
- ResolverRecordType record_type, const SlotAsyncReady& slot,
+ RecordType record_type, const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable);
_IGNORE(g_resolver_lookup_records_async)
/// A non-cancellable version of lookup_records_async().
void lookup_records_async(const Glib::ustring& rrname,
- ResolverRecordType record_type, const SlotAsyncReady& slot);
+ RecordType record_type, const SlotAsyncReady& slot);
_WRAP_METHOD(std::vector<Glib::VariantContainerBase> lookup_records_finish(const
Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_records_finish, errthrow)
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index bc975e7..88a7f29 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -62,7 +62,7 @@ _CONV_GIO_ENUM(NetworkConnectivity)
_CONV_GIO_INCLASS_ENUM(Notification,Priority)
_CONV_GIO_INCLASS_ENUM(OutputStream,SpliceFlags)
_CONV_GIO_ENUM(PasswordSave)
-_CONV_GIO_ENUM(ResolverRecordType)
+_CONV_GIO_INCLASS_ENUM(Resolver,RecordType)
_CONV_GIO_ENUM(ResourceFlags)
_CONV_GIO_ENUM(ResourceLookupFlags)
_CONV_GIO_ENUM(SettingsBindFlags)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]