[dconf] Switch explicit types to var types
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf] Switch explicit types to var types
- Date: Sat, 6 Apr 2013 03:55:12 +0000 (UTC)
commit b885fc9e06470e6304291a6f75c456b286887825
Author: Robert Ancell <robert ancell canonical com>
Date: Sat Apr 6 16:33:07 2013 +1300
Switch explicit types to var types
editor/dconf-model.vala | 12 +++++++-----
editor/dconf-view.vala | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/editor/dconf-model.vala b/editor/dconf-model.vala
index 8d0700a..8b43d60 100644
--- a/editor/dconf-model.vala
+++ b/editor/dconf-model.vala
@@ -254,7 +254,7 @@ public class Directory : GLib.Object
string[] tokens = path.split("/", 2);
string name = tokens[0];
- Directory directory = get_child(name);
+ var directory = get_child(name);
directory.load_schema(schema, tokens[1]);
}
}
@@ -696,10 +696,11 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel
public bool iter_next(ref Gtk.TreeIter iter)
{
- Directory directory = get_directory(iter);
+ var directory = get_directory(iter);
if (directory.index >= directory.parent.children.length() - 1)
return false;
set_iter(ref iter, directory.parent.children.nth_data(directory.index+1));
+
return true;
}
@@ -707,7 +708,7 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel
{
iter = Gtk.TreeIter();
- Directory directory = get_directory(parent);
+ var directory = get_directory(parent);
if (directory.children.length() == 0)
return false;
set_iter(ref iter, directory.children.nth_data(0));
@@ -729,10 +730,11 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel
{
iter = Gtk.TreeIter();
- Directory directory = get_directory(parent);
+ var directory = get_directory(parent);
if (n >= directory.children.length())
return false;
set_iter(ref iter, directory.children.nth_data(n));
+
return true;
}
@@ -740,7 +742,7 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel
{
iter = Gtk.TreeIter();
- Directory directory = get_directory(child);
+ var directory = get_directory(child);
if (directory.parent == root)
return false;
diff --git a/editor/dconf-view.vala b/editor/dconf-view.vala
index c83b53f..f4d07d4 100644
--- a/editor/dconf-view.vala
+++ b/editor/dconf-view.vala
@@ -270,7 +270,7 @@ private class KeyValueRenderer: Gtk.CellRenderer
private void spin_edited_cb(Gtk.CellRendererText renderer, string path, string text)
{
- Key key = get_key_from_path(path);
+ var key = get_key_from_path(path);
switch (key.type_string)
{
case "y":
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]