[gnome-commander] Use some C++11 features, remove g_assert call
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Use some C++11 features, remove g_assert call
- Date: Thu, 7 Feb 2019 21:45:42 +0000 (UTC)
commit bc5283e2d3f8c34c6ae0d15aefc1f98ca6cd9a14
Author: Uwe Scholz <u scholz83 gmx de>
Date: Thu Feb 7 22:41:56 2019 +0100
Use some C++11 features, remove g_assert call
src/gnome-cmd-data.cc | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index a39f5b2f..d8e9b361 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1732,7 +1732,7 @@ void GnomeCmdData::save_devices_via_gsettings()
for (; devices; devices = devices->next)
{
- GnomeCmdConDevice *device = GNOME_CMD_CON_DEVICE (devices->data);
+ auto *device = GNOME_CMD_CON_DEVICE (devices->data);
if (device && !gnome_cmd_con_device_get_autovol (device))
{
gchar *icon_path = (gchar *) gnome_cmd_con_device_get_icon_path (device);
@@ -3045,18 +3045,13 @@ void GnomeCmdData::load_devices_from_gsettings()
while ((device = g_variant_iter_next_value (&iter)) != NULL)
{
- gchar *alias, *device_fn, *mountPoint, *iconPath;
+ g_autofree gchar *alias, *device_fn, *mountPoint, *iconPath;
- g_assert (g_variant_is_of_type (device, G_VARIANT_TYPE
(GCMD_SETTINGS_DEVICES_FORMAT_STRING)));
g_variant_get(device, GCMD_SETTINGS_DEVICES_FORMAT_STRING, &alias, &device_fn, &mountPoint,
&iconPath);
gnome_cmd_data.priv->con_list->add (gnome_cmd_con_device_new (alias, device_fn, mountPoint,
iconPath));
g_variant_unref(device);
- g_free (alias);
- g_free (device_fn);
- g_free (mountPoint);
- g_free (iconPath);
}
g_variant_unref(gvDevices);
load_vfs_auto_devices ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]