Merge lp:~ricotz/pantheon-photos/syntax-errors into lp:~pantheon-photos/pantheon-photos/trunk

[Rico Tzschichholz]

Fix syntax errors to make it compilable with valac 0.35+

[Danielle Foré (danrabbit)]

As far as I can tell this is good. Been poking and proding and don't see anything broken

review: Approve

=== modified file 'plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala'
--- plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala	2016-02-19 19:55:55 +0000
+++ plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala	2016-11-04 23:20:17 +0000
@@ -305,7 +305,7 @@
 
             if (split_pair.length != 2)
                 host.post_error (new Spit.Publishing.PublishingError.MALFORMED_RESPONSE (
-                                     _ ("'%s' isn't a valid response to an OAuth authentication request")));
+                                     _ ("'%s' isn't a valid response to an OAuth authentication request"), response));
 
             if (split_pair[0] == "oauth_token")
                 oauth_token = split_pair[1];
@@ -315,7 +315,7 @@
 
         if (oauth_token == null || oauth_token_secret == null)
             host.post_error (new Spit.Publishing.PublishingError.MALFORMED_RESPONSE (
-                                 _ ("'%s' isn't a valid response to an OAuth authentication request")));
+                                 _ ("'%s' isn't a valid response to an OAuth authentication request"), response));
 
         session.set_access_phase_credentials (oauth_token, oauth_token_secret);
     }
 
=== modified file 'plugins/pantheon-photos-transitions/CircleEffect.vala'
--- plugins/pantheon-photos-transitions/CircleEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/CircleEffect.vala	2016-11-04 23:20:17 +0000
@@ -47,7 +47,7 @@
     public void paint (Transitions.Visuals visuals, Transitions.Motion motion, Cairo.Context ctx,
                        int width, int height, int frame_number) {
         double alpha = motion.get_alpha (frame_number);
-        int radius = (int) ((alpha) * Math.fmax (width, height));
+        int radius = (int) (alpha * Math.fmax (width, height));
 
         if (visuals.from_pixbuf != null) {
             Gdk.cairo_set_source_pixbuf (ctx, visuals.from_pixbuf, visuals.from_pos.x,
 
=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2016-09-19 21:18:06 +0000
+++ src/CollectionPage.vala	2016-11-04 23:20:17 +0000
@@ -699,7 +699,7 @@
           we can unenhance properly those that were previously enhanced. We also need to sort out non photos */
         Gee.ArrayList<DataView> unenhanced_list = new Gee.ArrayList<DataView> ();
         Gee.ArrayList<DataView> enhanced_list = new Gee.ArrayList<DataView> ();
-        foreach (DataView view in get_view () .get_selected ()) {
+        foreach (DataView view in get_view ().get_selected ()) {
             Photo photo = view.get_source () as Photo;
             if (photo != null && !photo.is_enhanced ())
                 unenhanced_list.add (view);
@@ -713,7 +713,7 @@
         if (unenhanced_list.size == 0) {
             // Just undo if last on stack was enhance
             EnhanceMultipleCommand cmd = get_command_manager ().get_undo_description () as EnhanceMultipleCommand;
-            if (cmd != null && cmd.source_list == get_view () .get_selected ())
+            if (cmd != null && cmd.get_sources () == get_view ().get_selected_sources ())
                 get_command_manager ().undo ();
             else {
                 UnEnhanceMultipleCommand command = new UnEnhanceMultipleCommand (enhanced_list);
@@ -726,7 +726,7 @@
         } else {
             // Just undo if last on stack was unenhance
             UnEnhanceMultipleCommand cmd = get_command_manager ().get_undo_description () as UnEnhanceMultipleCommand;
-            if (cmd != null && cmd.source_list == get_view () .get_selected ())
+            if (cmd != null && cmd.get_sources () == get_view ().get_selected_sources ())
                 get_command_manager ().undo ();
             else {
                 EnhanceMultipleCommand command = new EnhanceMultipleCommand (unenhanced_list);
 
=== modified file 'src/Commands.vala'
--- src/Commands.vala	2016-09-19 21:18:06 +0000
+++ src/Commands.vala	2016-11-04 23:20:17 +0000
@@ -275,7 +275,7 @@
 public abstract class MultipleDataSourceCommand : PageCommand {
     protected const int MIN_OPS_FOR_PROGRESS_WINDOW = 5;
 
-    public Gee.ArrayList<DataSource> source_list = new Gee.ArrayList<DataSource> ();
+    protected Gee.ArrayList<DataSource> source_list = new Gee.ArrayList<DataSource> ();
 
     private string progress_text;
     private string undo_progress_text;
 
=== modified file 'src/MediaDataRepresentation.vala'
--- src/MediaDataRepresentation.vala	2016-09-19 21:18:06 +0000
+++ src/MediaDataRepresentation.vala	2016-11-04 23:20:17 +0000
@@ -397,8 +397,8 @@
 
     public static void count_media (Gee.Collection<MediaSource> media, out int photo_count,
                                     out int video_count) {
-        Gee.ArrayList<MediaSource> photos = new Gee.ArrayList<MediaSource> ();
-        Gee.ArrayList<MediaSource> videos = new Gee.ArrayList<MediaSource> ();
+        var photos = new Gee.ArrayList<LibraryPhoto> ();
+        var videos = new Gee.ArrayList<Video> ();
 
         filter_media (media, photos, videos);
 
 
=== modified file 'src/MediaMonitor.vala'
--- src/MediaMonitor.vala	2014-08-08 21:13:09 +0000
+++ src/MediaMonitor.vala	2016-11-04 23:20:17 +0000
@@ -286,8 +286,8 @@
                                             TransactionController controller, ref int op_count) throws Error {
         Gee.Map<Monitorable, File> set_master_file = null;
         Gee.Map<Monitorable, FileInfo> set_master_file_info = null;
-        Gee.ArrayList<MediaSource> to_offline = null;
-        Gee.ArrayList<MediaSource> to_online = null;
+        Gee.ArrayList<Monitorable> to_offline = null;
+        Gee.ArrayList<Monitorable> to_online = null;
 
         foreach (MonitorableUpdates updates in all_updates) {
             if (op_count >= MAX_OPERATIONS_PER_CYCLE)
 
=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2016-09-19 21:18:06 +0000
+++ src/PhotoPage.vala	2016-11-04 23:20:17 +0000
@@ -3162,7 +3162,7 @@
 
     private void on_flag_unflag () {
         if (has_photo ()) {
-            Gee.ArrayList<DataSource> photo_list = new Gee.ArrayList<DataSource> ();
+            var photo_list = new Gee.ArrayList<MediaSource> ();
             photo_list.add (get_photo ());
             get_command_manager ().execute (new FlagUnflagCommand (photo_list,
                                            ! ((LibraryPhoto) get_photo ()).is_flagged ()));
 
=== modified file 'src/Tag.vala'
--- src/Tag.vala	2014-09-27 09:58:03 +0000
+++ src/Tag.vala	2016-11-04 23:20:17 +0000
@@ -205,7 +205,7 @@
     }
 
     protected override void notify_container_contents_added (ContainerSource container,
-            Gee.Collection<DataSource> added, bool relinking) {
+            Gee.Collection<DataObject> added, bool relinking) {
         Tag tag = (Tag) container;
         Gee.Collection<MediaSource> sources = (Gee.Collection<MediaSource>) added;
 
@@ -233,7 +233,7 @@
     }
 
     protected override void notify_container_contents_removed (ContainerSource container,
-            Gee.Collection<DataSource> removed, bool unlinking) {
+            Gee.Collection<DataObject> removed, bool unlinking) {
         Tag tag = (Tag) container;
         Gee.Collection<MediaSource> sources = (Gee.Collection<MediaSource>) removed;
 
 
=== modified file 'src/core/ContainerSourceCollection.vala'
--- src/core/ContainerSourceCollection.vala	2014-08-08 21:13:09 +0000
+++ src/core/ContainerSourceCollection.vala	2016-11-04 23:20:17 +0000
@@ -18,15 +18,15 @@
     private Gee.HashSet<ContainerSource> holding_tank = new Gee.HashSet<ContainerSource> ();
 
     public virtual signal void container_contents_added (ContainerSource container,
-            Gee.Collection<DataSource> added, bool relinked) {
+            Gee.Collection<DataObject> added, bool relinked) {
     }
 
     public virtual signal void container_contents_removed (ContainerSource container,
-            Gee.Collection<DataSource> removed, bool unlinked) {
+            Gee.Collection<DataObject> removed, bool unlinked) {
     }
 
     public virtual signal void container_contents_altered (ContainerSource container,
-            Gee.Collection<DataSource>? added, bool relinked, Gee.Collection<DataSource>? removed,
+            Gee.Collection<DataObject>? added, bool relinked, Gee.Collection<DataObject>? removed,
             bool unlinked) {
     }
 
@@ -55,7 +55,7 @@
     }
 
     public virtual void notify_container_contents_added (ContainerSource container,
-            Gee.Collection<DataSource> added, bool relinked) {
+            Gee.Collection<DataObject> added, bool relinked) {
         // if container is in holding tank, remove it now and relink to collection
         if (holding_tank.contains (container)) {
             bool removed = holding_tank.remove (container);
@@ -68,12 +68,12 @@
     }
 
     public virtual void notify_container_contents_removed (ContainerSource container,
-            Gee.Collection<DataSource> removed, bool unlinked) {
+            Gee.Collection<DataObject> removed, bool unlinked) {
         container_contents_removed (container, removed, unlinked);
     }
 
     public virtual void notify_container_contents_altered (ContainerSource container,
-            Gee.Collection<DataSource>? added, bool relinked, Gee.Collection<DataSource>? removed,
+            Gee.Collection<DataObject>? added, bool relinked, Gee.Collection<DataObject>? removed,
             bool unlinked) {
         container_contents_altered (container, added, relinked, removed, unlinked);
     }
 
=== modified file 'src/core/ViewCollection.vala'
--- src/core/ViewCollection.vala	2016-09-19 21:18:06 +0000
+++ src/core/ViewCollection.vala	2016-11-04 23:20:17 +0000
@@ -646,7 +646,8 @@
     }
 
     public override void items_altered (Gee.Map<DataObject, Alteration> map) {
-        filter_altered_items (map.keys);
+        // Cast - our DataObjects are DataViews.
+        filter_altered_items((Gee.Collection<DataView>) map.keys);
 
         base.items_altered (map);
     }
 
=== modified file 'src/util/system.vala'
--- src/util/system.vala	2016-02-10 07:45:46 +0000
+++ src/util/system.vala	2016-11-04 23:20:17 +0000
@@ -28,5 +28,5 @@
 }
 
 int posix_wexitstatus (int status) {
-    return (((status) & 0xff00) >> 8);
+    return ((status & 0xff00) >> 8);
 }