diff options
-rw-r--r-- | gio/src/actionmap.ccg | 4 | ||||
-rw-r--r-- | gio/src/application.ccg | 4 | ||||
-rw-r--r-- | gio/src/dbusaddress.ccg | 12 | ||||
-rw-r--r-- | gio/src/dbussubtreevtable.ccg | 4 | ||||
-rw-r--r-- | gio/src/file.ccg | 46 | ||||
-rw-r--r-- | gio/src/loadableicon.ccg | 4 | ||||
-rw-r--r-- | gio/src/proxyresolver.ccg | 2 | ||||
-rw-r--r-- | glib/src/variant.ccg | 12 |
8 files changed, 44 insertions, 44 deletions
diff --git a/gio/src/actionmap.ccg b/gio/src/actionmap.ccg index a294bddc..20194d43 100644 --- a/gio/src/actionmap.ccg +++ b/gio/src/actionmap.ccg @@ -77,7 +77,7 @@ namespace { static void on_action_radio_string(const Glib::VariantBase& parameter, const Gio::ActionMap::ActivateWithStringParameterSlot& slot) { //TODO: This syntax is odd: - const Glib::Variant<Glib::ustring> variantDerived = + const auto variantDerived = parameter.cast_dynamic< Glib::Variant<Glib::ustring> >(parameter); const auto str = variantDerived.get(); slot(str); @@ -99,7 +99,7 @@ namespace { static void on_action_radio_int(const Glib::VariantBase& parameter, const Gio::ActionMap::ActivateWithIntParameterSlot& slot) { //TODO: This syntax is odd: - const Glib::Variant<int> variantDerived = + const auto variantDerived = parameter.cast_dynamic< Glib::Variant<int> >(parameter); const auto str = variantDerived.get(); slot(str); diff --git a/gio/src/application.ccg b/gio/src/application.ccg index 8543d201..3eccdda6 100644 --- a/gio/src/application.ccg +++ b/gio/src/application.ccg @@ -73,7 +73,7 @@ static void Application_signal_open_callback(GApplication* self, GFile** files, { try { - if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) { + if(const auto slot = Glib::SignalProxyNormal::data_to_slot(data)) { (*static_cast<SlotType*>(slot))(vec_files, hint_str); return; } @@ -106,7 +106,7 @@ static void Application_signal_open_notify_callback(GApplication* self, GFile** { try { - if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) + if(const auto slot = Glib::SignalProxyNormal::data_to_slot(data)) { (*static_cast<SlotType*>(slot))(vec_files, hint_str); return; diff --git a/gio/src/dbusaddress.ccg b/gio/src/dbusaddress.ccg index 2bcb7d7c..a8b1fd3b 100644 --- a/gio/src/dbusaddress.ccg +++ b/gio/src/dbusaddress.ccg @@ -65,7 +65,7 @@ Glib::RefPtr<IOStream> get_stream_finish(const Glib::RefPtr<AsyncResult>& res, GError* gerror = 0; gchar* g_out_guid = 0; - Glib::RefPtr<IOStream> result = + auto result = Glib::wrap(g_dbus_address_get_stream_finish(Glib::unwrap(res), &g_out_guid, &gerror)); @@ -80,7 +80,7 @@ Glib::RefPtr<IOStream> get_stream_finish(const Glib::RefPtr<AsyncResult>& res) { GError* gerror = 0; - Glib::RefPtr<IOStream> result = + auto result = Glib::wrap(g_dbus_address_get_stream_finish(Glib::unwrap(res), 0, &gerror)); @@ -96,7 +96,7 @@ Glib::RefPtr<IOStream> get_stream_sync(const std::string& address, GError* gerror = 0; gchar* g_out_guid = 0; - Glib::RefPtr<IOStream> result = + auto result = Glib::wrap(g_dbus_address_get_stream_sync(address.c_str(), &g_out_guid, Glib::unwrap(cancellable), &gerror)); @@ -113,7 +113,7 @@ Glib::RefPtr<IOStream> get_stream_sync(const std::string& address, GError* gerror = 0; gchar* g_out_guid = 0; - Glib::RefPtr<IOStream> result = + auto result = Glib::wrap(g_dbus_address_get_stream_sync(address.c_str(), &g_out_guid, 0, &gerror)); @@ -129,7 +129,7 @@ Glib::RefPtr<IOStream> get_stream_sync(const std::string& address, { GError* gerror = 0; - Glib::RefPtr<IOStream> result = + auto result = Glib::wrap(g_dbus_address_get_stream_sync(address.c_str(), 0, Glib::unwrap(cancellable), &gerror)); @@ -143,7 +143,7 @@ Glib::RefPtr<IOStream> get_stream_sync(const std::string& address) { GError* gerror = 0; - Glib::RefPtr<IOStream> result = + auto result = Glib::wrap(g_dbus_address_get_stream_sync(address.c_str(), 0, 0, &gerror)); if(gerror) diff --git a/gio/src/dbussubtreevtable.ccg b/gio/src/dbussubtreevtable.ccg index 5e726cc5..da8dd753 100644 --- a/gio/src/dbussubtreevtable.ccg +++ b/gio/src/dbussubtreevtable.ccg @@ -44,7 +44,7 @@ static char** DBusSubtreeVTable_Enumerate_giomm_callback( try { - std::vector<Glib::ustring> result = + auto result = (*the_slot)(Glib::wrap(connection, true), sender, object_path); // This will be freed by the caller. @@ -77,7 +77,7 @@ static GDBusInterfaceInfo** DBusSubtreeVTable_Introspect_giomm_callback( try { - std::vector< Glib::RefPtr<Gio::DBus::InterfaceInfo> > result = + auto result = (*the_slot)(Glib::wrap(connection, true), sender, object_path, node); // This will be freed by the caller, along with unreferencing its members. diff --git a/gio/src/file.ccg b/gio/src/file.ccg index 56516ea1..f94511e4 100644 --- a/gio/src/file.ccg +++ b/gio/src/file.ccg @@ -138,7 +138,7 @@ SignalProxy_load_partial_contents_ready_callback(GObject*, GAsyncResult* res, vo try { - Glib::RefPtr<Gio::AsyncResult> result = Glib::wrap(res, true /* take copy */); + auto result = Glib::wrap(res, true /* take copy */); (*the_slot)(result); } catch(...) @@ -441,7 +441,7 @@ FileType File::query_file_type(FileQueryInfoFlags flags) const Glib::RefPtr<FileInfo> File::query_info(const Glib::RefPtr<Cancellable>& cancellable, const std::string& attributes, FileQueryInfoFlags flags) const { GError* gerror = 0; - Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_query_info(const_cast<GFile*>(gobj()), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_query_info(const_cast<GFile*>(gobj()), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -451,7 +451,7 @@ Glib::RefPtr<FileInfo> File::query_info(const Glib::RefPtr<Cancellable>& cancell Glib::RefPtr<FileInfo> File::query_info(const std::string& attributes, FileQueryInfoFlags flags) const { GError* gerror = 0; - Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_query_info(const_cast<GFile*>(gobj()), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_query_info(const_cast<GFile*>(gobj()), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -496,7 +496,7 @@ File::query_info_async(const SlotAsyncReady& slot, const std::string& attributes Glib::RefPtr<FileInfo> File::query_filesystem_info(const Glib::RefPtr<Cancellable>& cancellable, const std::string& attributes) { GError* gerror = 0; - Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_query_filesystem_info(gobj(), attributes.c_str(), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_query_filesystem_info(gobj(), attributes.c_str(), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -506,7 +506,7 @@ Glib::RefPtr<FileInfo> File::query_filesystem_info(const Glib::RefPtr<Cancellabl Glib::RefPtr<FileInfo> File::query_filesystem_info(const std::string& attributes) { GError* gerror = 0; - Glib::RefPtr<FileInfo> retvalue = Glib::wrap(g_file_query_filesystem_info(gobj(), attributes.c_str(), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_query_filesystem_info(gobj(), attributes.c_str(), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -548,7 +548,7 @@ File::query_filesystem_info_async(const SlotAsyncReady& slot, const std::string& Glib::RefPtr<FileEnumerator> File::enumerate_children(const Glib::RefPtr<Cancellable>& cancellable, const std::string& attributes, FileQueryInfoFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileEnumerator> retvalue = Glib::wrap(g_file_enumerate_children(gobj(), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_enumerate_children(gobj(), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -558,7 +558,7 @@ Glib::RefPtr<FileEnumerator> File::enumerate_children(const Glib::RefPtr<Cancell Glib::RefPtr<FileEnumerator> File::enumerate_children(const std::string& attributes, FileQueryInfoFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileEnumerator> retvalue = Glib::wrap(g_file_enumerate_children(gobj(), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_enumerate_children(gobj(), attributes.c_str(), ((GFileQueryInfoFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1505,7 +1505,7 @@ File::replace_contents_bytes_async(const SlotAsyncReady& slot, Glib::RefPtr<FileOutputStream> File::replace(const Glib::RefPtr<Cancellable>& cancellable, const std::string& etag, bool make_backup, FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1515,7 +1515,7 @@ Glib::RefPtr<FileOutputStream> File::replace(const Glib::RefPtr<Cancellable>& ca Glib::RefPtr<FileOutputStream> File::replace(const std::string& etag, bool make_backup, FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1526,7 +1526,7 @@ Glib::RefPtr<FileOutputStream> File::replace(const std::string& etag, bool make_ Glib::RefPtr<FileIOStream> File::replace_readwrite(const Glib::RefPtr<Cancellable>& cancellable, const std::string& etag, bool make_backup, FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_replace_readwrite(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_replace_readwrite(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1536,7 +1536,7 @@ Glib::RefPtr<FileIOStream> File::replace_readwrite(const Glib::RefPtr<Cancellabl Glib::RefPtr<FileIOStream> File::replace_readwrite(const std::string& etag, bool make_backup, FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_replace_readwrite(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_replace_readwrite(gobj(), etag.empty() ? 0 : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1548,7 +1548,7 @@ Glib::RefPtr<FileIOStream> File::replace_readwrite(const std::string& etag, bool Glib::RefPtr<FileMonitor> File::monitor_directory(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor_directory(gobj(), ((GFileMonitorFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_monitor_directory(gobj(), ((GFileMonitorFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1558,7 +1558,7 @@ Glib::RefPtr<FileMonitor> File::monitor_directory(const Glib::RefPtr<Cancellable Glib::RefPtr<FileMonitor> File::monitor_directory(FileMonitorFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor_directory(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_monitor_directory(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1568,7 +1568,7 @@ Glib::RefPtr<FileMonitor> File::monitor_directory(FileMonitorFlags flags) Glib::RefPtr<FileMonitor> File::monitor_file(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor_file(gobj(), ((GFileMonitorFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_monitor_file(gobj(), ((GFileMonitorFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1578,7 +1578,7 @@ Glib::RefPtr<FileMonitor> File::monitor_file(const Glib::RefPtr<Cancellable>& ca Glib::RefPtr<FileMonitor> File::monitor_file(FileMonitorFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor_file(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_monitor_file(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1589,7 +1589,7 @@ Glib::RefPtr<FileMonitor> File::monitor_file(FileMonitorFlags flags) Glib::RefPtr<FileMonitor> File::monitor(const Glib::RefPtr<Cancellable>& cancellable, FileMonitorFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor(gobj(), ((GFileMonitorFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_monitor(gobj(), ((GFileMonitorFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1599,7 +1599,7 @@ Glib::RefPtr<FileMonitor> File::monitor(const Glib::RefPtr<Cancellable>& cancell Glib::RefPtr<FileMonitor> File::monitor(FileMonitorFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileMonitor> retvalue = Glib::wrap(g_file_monitor(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_monitor(gobj(), ((GFileMonitorFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1811,7 +1811,7 @@ File::copy_attributes(const Glib::RefPtr<File>& destination, FileCopyFlags flags Glib::RefPtr<FileOutputStream> File::create_file(const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_create(gobj(), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_create(gobj(), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1821,7 +1821,7 @@ Glib::RefPtr<FileOutputStream> File::create_file(const Glib::RefPtr<Cancellable> Glib::RefPtr<FileOutputStream> File::create_file(FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_create(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_create(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1831,7 +1831,7 @@ Glib::RefPtr<FileOutputStream> File::create_file(FileCreateFlags flags) Glib::RefPtr<FileIOStream> File::create_file_readwrite(const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_create_readwrite(gobj(), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_create_readwrite(gobj(), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1841,7 +1841,7 @@ Glib::RefPtr<FileIOStream> File::create_file_readwrite(const Glib::RefPtr<Cancel Glib::RefPtr<FileIOStream> File::create_file_readwrite(FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileIOStream> retvalue = Glib::wrap(g_file_create_readwrite(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_create_readwrite(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1851,7 +1851,7 @@ Glib::RefPtr<FileIOStream> File::create_file_readwrite(FileCreateFlags flags) Glib::RefPtr<FileOutputStream> File::append_to(const Glib::RefPtr<Cancellable>& cancellable, FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_append_to(gobj(), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + auto retvalue = Glib::wrap(g_file_append_to(gobj(), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1861,7 +1861,7 @@ Glib::RefPtr<FileOutputStream> File::append_to(const Glib::RefPtr<Cancellable>& Glib::RefPtr<FileOutputStream> File::append_to(FileCreateFlags flags) { GError* gerror = 0; - Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_append_to(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror))); + auto retvalue = Glib::wrap(g_file_append_to(gobj(), ((GFileCreateFlags)(flags)), 0, &(gerror))); if(gerror) ::Glib::Error::throw_exception(gerror); diff --git a/gio/src/loadableicon.ccg b/gio/src/loadableicon.ccg index 20281191..c11a44b7 100644 --- a/gio/src/loadableicon.ccg +++ b/gio/src/loadableicon.ccg @@ -30,7 +30,7 @@ LoadableIcon::load(int size, Glib::ustring& type, const Glib::RefPtr<Cancellable { char* c_type; GError* gerror = 0; - Glib::RefPtr<InputStream> retval = + auto retval = Glib::wrap(g_loadable_icon_load(gobj(), size, &c_type, @@ -51,7 +51,7 @@ LoadableIcon::load(int size, Glib::ustring& type) { char* c_type; GError* gerror = 0; - Glib::RefPtr<InputStream> retval = + auto retval = Glib::wrap(g_loadable_icon_load(gobj(), size, &c_type, diff --git a/gio/src/proxyresolver.ccg b/gio/src/proxyresolver.ccg index 72cad04e..01a93b81 100644 --- a/gio/src/proxyresolver.ccg +++ b/gio/src/proxyresolver.ccg @@ -30,7 +30,7 @@ namespace Gio std::vector<Glib::ustring> ProxyResolver::lookup(const Glib::ustring& uri) { GError* gerror = 0; - std::vector<Glib::ustring> retvalue = + 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); diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg index af64f619..7523db5b 100644 --- a/glib/src/variant.ccg +++ b/glib/src/variant.ccg @@ -287,7 +287,7 @@ const VariantType& Variant<VariantBase>::variant_type() Variant<VariantBase> Variant<VariantBase>::create(const VariantBase& data) { - Variant<VariantBase> result = Variant<VariantBase>(g_variant_new_variant(const_cast<GVariant*>(data.gobj()))); + auto result = Variant<VariantBase>(g_variant_new_variant(const_cast<GVariant*>(data.gobj()))); return result; } @@ -318,7 +318,7 @@ const VariantType& Variant<Glib::ustring>::variant_type() Variant<Glib::ustring> Variant<Glib::ustring>::create(const Glib::ustring& data) { - Variant<Glib::ustring> result = + auto result = Variant<Glib::ustring>(g_variant_new_string(data.c_str())); return result; } @@ -374,7 +374,7 @@ const VariantType& Variant<std::string>::variant_type() Variant<std::string> Variant<std::string>::create(const std::string& data) { - Variant<std::string> result = + auto result = Variant<std::string>(g_variant_new_bytestring(data.c_str())); return result; } @@ -458,7 +458,7 @@ Variant<type_vec_ustring>::create(const type_vec_ustring& data) } // Create the variant using the builder. - Variant<type_vec_ustring> result = + auto result = Variant<type_vec_ustring>(g_variant_new( array_variant_type.get_string().c_str(), builder)); @@ -540,7 +540,7 @@ Variant<type_vec_string>::create(const type_vec_string& data) // Create the variant using g_variant_new_bytestring_array() (passing the // newly constructed array. - Variant<type_vec_string> result = + auto result = Variant<type_vec_string>(g_variant_new_bytestring_array(str_array, data.size())); @@ -565,7 +565,7 @@ Variant<type_vec_string>::create_from_object_paths(const type_vec_string& data) // Create the variant using g_variant_new_objv() (passing the // newly constructed array. - Variant<type_vec_string> result = + auto result = Variant<type_vec_string>(g_variant_new_objv(str_array, data.size())); g_strfreev(str_array); |