diff options
| author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
|---|---|---|
| committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
| commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
| tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /gio/src/proxyresolver.ccg | |
| parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
| parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
| download | glibmm-gir-gmmproc.tar.gz | |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'gio/src/proxyresolver.ccg')
| -rw-r--r-- | gio/src/proxyresolver.ccg | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gio/src/proxyresolver.ccg b/gio/src/proxyresolver.ccg index 3fd2d6a8..b5a05845 100644 --- a/gio/src/proxyresolver.ccg +++ b/gio/src/proxyresolver.ccg @@ -29,8 +29,8 @@ namespace Gio std::vector<Glib::ustring> ProxyResolver::lookup(const Glib::ustring& uri) { - GError* gerror = 0; - std::vector<Glib::ustring> retvalue = + GError* gerror = nullptr; + auto retvalue = Glib::ArrayHandler<Glib::ustring>::array_to_vector(g_proxy_resolver_lookup(gobj(), uri.c_str(), 0, &(gerror)), Glib::OWNERSHIP_DEEP); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -43,7 +43,7 @@ void ProxyResolver::lookup_async(const Glib::ustring& uri, const SlotAsyncReady& // Create a copy of the slot. // A pointer to it will be passed through the callback's data parameter // and deleted in the callback. - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_proxy_resolver_lookup_async(gobj(), uri.c_str(), @@ -57,7 +57,7 @@ void ProxyResolver::lookup_async(const Glib::ustring& uri, const SlotAsyncReady& // Create a copy of the slot. // A pointer to it will be passed through the callback's data parameter // and deleted in the callback. - SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); + auto slot_copy = new SlotAsyncReady(slot); g_proxy_resolver_lookup_async(gobj(), uri.c_str(), |