Use unowned with Adblock.Subscription and Element in foreach loops

4 files changed, 22 insertions, 21 deletions

diff --git a/extensions/adblock/config.vala b/extensions/adblock/config.vala
index 20199bbf..0102b9c2 100644
--- a/extensions/adblock/config.vala
+++ b/extensions/adblock/config.vala
@@ -77,7 +77,7 @@ namespace Adblock {
 
         void update_filters () {
             var filters = new StringBuilder ();
-            foreach (var sub in subscriptions) {
+            foreach (unowned Subscription sub in subscriptions) {
                 if (!sub.mutable)
                     continue;
                 if (sub.uri.has_prefix ("http:") && !sub.active)
@@ -109,13 +109,13 @@ namespace Adblock {
         }
 
         /* foreach support */
-        public new Subscription? get (uint index) {
+        public new unowned Subscription? get (uint index) {
             return subscriptions.nth_data (index);
         }
         public uint size { get; private set; }
 
         bool contains (Subscription subscription) {
-            foreach (var sub in subscriptions)
+            foreach (unowned Subscription sub in subscriptions)
                 if (sub.uri == subscription.uri)
                     return true;
             return false;
diff --git a/extensions/adblock/extension.vala b/extensions/adblock/extension.vala
index bee108a6..0249e478 100644
--- a/extensions/adblock/extension.vala
+++ b/extensions/adblock/extension.vala
@@ -280,11 +280,12 @@ namespace Adblock {
             var code = new StringBuilder ();
             int blockscnt = 0;
             string? style = null;
-            foreach (Subscription sub in config) {
-                foreach (var feature in sub) {
-                    if (feature is Adblock.Element) {
-                        foreach (var subdomain in domains) {
-                            style = (feature as Adblock.Element).lookup (subdomain);
+            foreach (unowned Subscription sub in config) {
+                foreach (unowned Feature feature in sub) {
+                    var element = feature as Element;
+                    if (element != null) {
+                        foreach (unowned string subdomain in domains) {
+                            style = element.lookup (subdomain);
                             if (style != null) {
                                 code.append (style);
                                 code.append_c (',');
@@ -341,7 +342,7 @@ namespace Adblock {
             load_config ();
             manager = new SubscriptionManager (config);
             status_icon = new StatusIcon (config, manager);
-            foreach (Subscription sub in config) {
+            foreach (unowned Subscription sub in config) {
                 try {
                     sub.parse ();
                 } catch (GLib.Error error) {
@@ -405,7 +406,7 @@ namespace Adblock {
                 return Directive.ALLOW;
 
             Directive? directive = null;
-            foreach (Subscription sub in config) {
+            foreach (unowned Subscription sub in config) {
                 directive = sub.get_directive (request_uri, page_uri);
                 if (directive != null)
                     break;
@@ -550,7 +551,7 @@ filters=http://foo.com;http-//bar.com;https://spam.com;http-://eggs.com;file:///
     assert (config.enabled);
     foreach (var sub in subs) {
         bool found = false;
-        foreach (var subscription in config) {
+        foreach (unowned Adblock.Subscription subscription in config) {
             if (subscription.uri == sub.uri) {
                 assert (subscription.active == sub.active);
                 found = true;
@@ -579,7 +580,7 @@ filters=http://foo.com;http-//bar.com;https://spam.com;http-://eggs.com;file:///
     copy = new Adblock.Config (config.path, null);
     assert (copy.enabled == config.enabled);
     /* Flipping individual active values should be retained after saving */
-    foreach (var sub in config)
+    foreach (unowned Adblock.Subscription sub in config)
         sub.active = !sub.active;
     copy = new Adblock.Config (config.path, null);
     for (uint i = 0; i < config.size; i++) {
diff --git a/extensions/adblock/subscriptions.vala b/extensions/adblock/subscriptions.vala
index 20efb2ea..22fe01d8 100644
--- a/extensions/adblock/subscriptions.vala
+++ b/extensions/adblock/subscriptions.vala
@@ -67,14 +67,14 @@ namespace Adblock {
         }
 
         /* foreach support */
-        public new Feature? get (uint index) {
+        public new unowned Feature? get (uint index) {
             return features.nth_data (index);
         }
         public uint size { get; private set; }
 
         public void clear () {
             cache = new HashTable<string, Directive?> (str_hash, str_equal);
-            foreach (var feature in features)
+            foreach (unowned Feature feature in features)
                 feature.clear ();
             optslist.clear ();
         }
@@ -285,7 +285,7 @@ namespace Adblock {
             debug ("Header '%s' says '%s'", key, value);
             if (key == "Title")
                 title = value;
-            foreach (var feature in features) {
+            foreach (unowned Feature feature in features) {
                 if (feature.header (key, value))
                     break;
             }
@@ -365,7 +365,7 @@ namespace Adblock {
                 valid = true;
             }
 
-            foreach (var feature in features) {
+            foreach (unowned Feature feature in features) {
                 if (!feature.parsed (filter_file))
                     valid = false;
             }
@@ -376,7 +376,7 @@ namespace Adblock {
                 Directive? directive = cache.lookup (request_uri);
                 if (directive != null)
                     return directive;
-                foreach (var feature in features) {
+                foreach (unowned Feature feature in features) {
                     directive = feature.match (request_uri, page_uri);
                     if (directive != null) {
                         debug ("%s gave %s for %s (%s)\n",
diff --git a/extensions/adblock/widgets.vala b/extensions/adblock/widgets.vala
index 27d69ed3..39c39125 100644
--- a/extensions/adblock/widgets.vala
+++ b/extensions/adblock/widgets.vala
@@ -152,9 +152,9 @@ namespace Adblock {
                 Subscription sub;
                 liststore.get (iter, 0, out sub);
                 string status = "";
-                foreach (var feature in sub) {
-                    if (feature is Adblock.Updater) {
-                        var updater = feature as Adblock.Updater;
+                foreach (unowned Feature feature in sub) {
+                    var updater = feature as Adblock.Updater;
+                    if (updater != null) {
                         if (updater.last_updated != null)
                             status = updater.last_updated.format (_("Last update: %x %X"));
                     }
@@ -180,7 +180,7 @@ namespace Adblock {
             treeview.create_pango_layout ("a\nb").get_pixel_size (null, out height);
             scrolled.set_size_request (-1, height * 5);
 
-            foreach (Subscription sub in config)
+            foreach (unowned Subscription sub in config)
                 liststore.insert_with_values (null, 0, 0, sub);
             treeview.button_release_event.connect (button_released);