GNOME.org
 

[shotwell] Fix compile warnings with vala git

commit 417aecadbcb8d0ce0ff34f20d13774f538efe5c0
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Jul 8 09:43:47 2016 +0200

    Fix compile warnings with vala git

 plugins/shotwell-data-imports/FSpotImporter.vala   |    4 ++--
 plugins/shotwell-data-imports/FSpotMetaTable.vala  |    2 +-
 .../shotwell-data-imports/FSpotPhotoTagsTable.vala |    2 +-
 .../FSpotPhotoVersionsTable.vala                   |    2 +-
 .../shotwell-data-imports/FSpotPhotosTable.vala    |    2 +-
 plugins/shotwell-data-imports/FSpotRollsTable.vala |    4 ++--
 plugins/shotwell-data-imports/FSpotTagsTable.vala  |   12 ++++++------
 .../GalleryConnector.vala                          |    6 +++---
 plugins/shotwell-publishing/PiwigoPublishing.vala  |    2 +-
 src/Box.vala                                       |    2 +-
 src/db/Db.vala                                     |    2 +-
 src/plugins/PublishingInterfaces.vala              |    8 ++++----
 12 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/plugins/shotwell-data-imports/FSpotImporter.vala 
b/plugins/shotwell-data-imports/FSpotImporter.vala
index bd408cc..145fd7b 100644
--- a/plugins/shotwell-data-imports/FSpotImporter.vala
+++ b/plugins/shotwell-data-imports/FSpotImporter.vala
@@ -252,8 +252,8 @@ public class FSpotImportableEvent : Spit.DataImports.ImportableEvent, GLib.Objec
 }
 
 public class FSpotImportableRating : Spit.DataImports.ImportableRating, GLib.Object {
-    public static const int REJECTED = -1;
-    public static const int UNRATED = 0;
+    public const int REJECTED = -1;
+    public const int UNRATED = 0;
     
     private int rating_value;
     
diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.vala 
b/plugins/shotwell-data-imports/FSpotMetaTable.vala
index 264fe85..e28d2e6 100644
--- a/plugins/shotwell-data-imports/FSpotMetaTable.vala
+++ b/plugins/shotwell-data-imports/FSpotMetaTable.vala
@@ -81,7 +81,7 @@ public class FSpotMetaTable : FSpotDatabaseTable<FSpotMetaRow> {
 }
 
 public class FSpotMetaBehavior : FSpotTableBehavior<FSpotMetaRow>, Object {
-    public static const string TABLE_NAME = "Meta";
+    public const string TABLE_NAME = "Meta";
     
     private static FSpotMetaBehavior instance;
     
diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala 
b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
index d4e8202..afc67ec 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
@@ -18,7 +18,7 @@ public class FSpotPhotoTagRow : Object {
  * This class represents the F-Spot photo_tags table.
  */
 public class FSpotPhotoTagsTable : FSpotDatabaseTable<FSpotPhotoTagRow> {
-    public static const string TABLE_NAME = "Photo_Tags";
+    public const string TABLE_NAME = "Photo_Tags";
     
     public FSpotPhotoTagsTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
         base(db);
diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala 
b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
index 35b913b..4c500fe 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
@@ -23,7 +23,7 @@ public class FSpotPhotoVersionRow : Object {
  * This class represents the F-Spot photo_versions table.
  */
 public class FSpotPhotoVersionsTable : FSpotDatabaseTable<FSpotPhotoVersionRow> {
-    public static const string TABLE_NAME = "Photo_versions";
+    public const string TABLE_NAME = "Photo_versions";
 
     public FSpotPhotoVersionsTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
         base(db);
diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.vala 
b/plugins/shotwell-data-imports/FSpotPhotosTable.vala
index fdf4c00..39329d4 100644
--- a/plugins/shotwell-data-imports/FSpotPhotosTable.vala
+++ b/plugins/shotwell-data-imports/FSpotPhotosTable.vala
@@ -25,7 +25,7 @@ public class FSpotPhotoRow : Object {
  * This class represents the F-Spot photos table.
  */
 public class FSpotPhotosTable : FSpotDatabaseTable<FSpotPhotoRow> {
-    public static const string TABLE_NAME = "Photos";
+    public const string TABLE_NAME = "Photos";
     
     public FSpotPhotosTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
         base(db);
diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.vala 
b/plugins/shotwell-data-imports/FSpotRollsTable.vala
index 850b47f..8a5ee8c 100644
--- a/plugins/shotwell-data-imports/FSpotRollsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotRollsTable.vala
@@ -18,8 +18,8 @@ public class FSpotRollRow : Object {
  * This class represents the F-Spot rolls table.
  */
 public class FSpotRollsTable : FSpotDatabaseTable<FSpotRollRow> {
-    public static const string TABLE_NAME = "Rolls";
-    public static const string TABLE_NAME_PRE_V5 = "Imports";
+    public const string TABLE_NAME = "Rolls";
+    public const string TABLE_NAME_PRE_V5 = "Imports";
     
     public FSpotRollsTable(Sqlite.Database db, FSpotDatabaseBehavior db_behavior) {
         base(db);
diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.vala 
b/plugins/shotwell-data-imports/FSpotTagsTable.vala
index 8ac9807..7660154 100644
--- a/plugins/shotwell-data-imports/FSpotTagsTable.vala
+++ b/plugins/shotwell-data-imports/FSpotTagsTable.vala
@@ -22,13 +22,13 @@ public class FSpotTagRow : Object {
  * This class represents the F-Spot tags table.
  */
 public class FSpotTagsTable : FSpotDatabaseTable<FSpotTagRow> {
-    public static const string TABLE_NAME = "Tags";
+    public const string TABLE_NAME = "Tags";
     
-    public static const string PREFIX_STOCK_ICON = "stock_icon:";
-    public static const string STOCK_ICON_FAV    = "stock_icon:emblem-favorite";
-    public static const string STOCK_ICON_PEOPLE = "stock_icon:emblem-people";
-    public static const string STOCK_ICON_PLACES = "stock_icon:emblem-places";
-    public static const string STOCK_ICON_EVENTS = "stock_icon:emblem-event";
+    public const string PREFIX_STOCK_ICON = "stock_icon:";
+    public const string STOCK_ICON_FAV    = "stock_icon:emblem-favorite";
+    public const string STOCK_ICON_PEOPLE = "stock_icon:emblem-people";
+    public const string STOCK_ICON_PLACES = "stock_icon:emblem-places";
+    public const string STOCK_ICON_EVENTS = "stock_icon:emblem-event";
     
     private FSpotTableBehavior<FSpotPhotoTagRow> photo_tags_behavior;
     
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.vala 
b/plugins/shotwell-publishing-extras/GalleryConnector.vala
index 2642b3a..3fe3eea 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.vala
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -5,9 +5,9 @@
  */
 
 
-static const string G3_VERSION = "0.1";
+const string G3_VERSION = "0.1";
 
-static const string G3_LICENSE = """
+const string G3_LICENSE = """
 The Gallery3Publishing module is free software; you can redistribute it
 and/or modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either version 2.1
@@ -24,7 +24,7 @@ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 02110-1301 USA
 """;
 
-static const string WEBSITE_URL =
+const string WEBSITE_URL =
     "https://github.com/sappjw/shotwell-gallery3";;
 
 // This module's Spit.Module
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala 
b/plugins/shotwell-publishing/PiwigoPublishing.vala
index a5a1323..fdb40e2 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -63,7 +63,7 @@ internal class Category {
     public string comment;
     public string display_name;
     public string uppercats;
-    public static const int NO_ID = -1;
+    public const int NO_ID = -1;
 
     public Category(int id, string name, string uppercats, string? comment = "") {
         this.id = id;
diff --git a/src/Box.vala b/src/Box.vala
index a1067bc..eaf70a0 100644
--- a/src/Box.vala
+++ b/src/Box.vala
@@ -36,7 +36,7 @@ public enum BoxComplements {
 }
 
 public struct Box {
-    public static const int HAND_GRENADES = 12;
+    public const int HAND_GRENADES = 12;
     
     public int left;
     public int top;
diff --git a/src/db/Db.vala b/src/db/Db.vala
index d536b41..e4f83bf 100644
--- a/src/db/Db.vala
+++ b/src/db/Db.vala
@@ -6,7 +6,7 @@
 
 namespace Db {
 
-public static const string IN_MEMORY_NAME = ":memory:";
+public const string IN_MEMORY_NAME = ":memory:";
 
 private string? filename = null;
 
diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala
index 6f06cba..2bbb8d8 100644
--- a/src/plugins/PublishingInterfaces.vala
+++ b/src/plugins/PublishingInterfaces.vala
@@ -513,10 +513,10 @@ public interface PluginHost : GLib.Object, Spit.HostInterface {
  */
 public interface Publishable : GLib.Object {
 
-    public static const string PARAM_STRING_BASENAME    = "basename";
-    public static const string PARAM_STRING_TITLE       = "title";
-    public static const string PARAM_STRING_COMMENT     = "comment";
-    public static const string PARAM_STRING_EVENTCOMMENT= "eventcomment";
+    public const string PARAM_STRING_BASENAME    = "basename";
+    public const string PARAM_STRING_TITLE       = "title";
+    public const string PARAM_STRING_COMMENT     = "comment";
+    public const string PARAM_STRING_EVENTCOMMENT= "eventcomment";
 
     /**
      * Returns a handle to the file on disk to which this publishable's data has been
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]