[folks] Fix 'static const' warnings with vala 0.33.1

From: Rico Tzschichholz <ricotz src gnome org>
To: commits-list gnome org
Cc:
Subject: [folks] Fix 'static const' warnings with vala 0.33.1
Date: Wed, 14 Sep 2016 06:46:40 +0000 (UTC)
commit 14e22d6b8b186d3068be3479cf8be0d41dfcbf32
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Sep 14 08:46:25 2016 +0200

    Fix 'static const' warnings with vala 0.33.1

 backends/eds/eds-backend.vala                      |    2 +-
 backends/eds/lib/edsf-persona-store.vala           |    2 +-
 backends/eds/lib/edsf-persona.vala                 |   20 ++--
 backends/key-file/kf-persona-store.vala            |    2 +-
 .../telepathy/lib/tpf-persona-store-cache.vala     |    2 +-
 backends/tracker/lib/trf-persona-store.vala        |    4 +-
 backends/tracker/lib/trf-util.vala                 |  120 ++++++++++----------
 folks/abstract-field-details.vala                  |    8 +-
 folks/build-conf.vapi                              |   26 ++--
 folks/individual-aggregator.vala                   |    6 +-
 folks/individual.vala                              |    2 +-
 folks/object-cache.vala                            |    4 +-
 folks/persona-store.vala                           |    2 +-
 folks/query.vala                                   |    6 +-
 folks/url-details.vala                             |    8 +-
 tests/folks/backend-loading.vala                   |    2 +-
 tests/lib/libsocialweb/backend.vala                |    6 +-
 tests/lib/tracker/backend.vala                     |    4 +-
 tests/libsocialweb/aggregation.vala                |    4 +-
 tools/import.vala                                  |    4 +-
 20 files changed, 117 insertions(+), 117 deletions(-)
---
diff --git a/backends/eds/eds-backend.vala b/backends/eds/eds-backend.vala
index 1f9a304..fe297be 100644
--- a/backends/eds/eds-backend.vala
+++ b/backends/eds/eds-backend.vala
@@ -39,7 +39,7 @@ internal extern static async E.SourceRegistry create_source_registry (GLib.Cance
  */
 public class Folks.Backends.Eds.Backend : Folks.Backend
 {
-  private static const string _use_address_books =
+  private const string _use_address_books =
       "FOLKS_BACKEND_EDS_USE_ADDRESS_BOOKS";
   private bool _is_prepared = false;
   private bool _prepare_pending = false; /* used for unprepare() too */
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 83ffbb5..3244553 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -68,7 +68,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
    * the msgid to the msgstr unchanged). */
   internal const string android_favourite_group_name = N_("Starred in Android");
 
-  internal static const string anti_links_attribute_name = "X-FOLKS-ANTI-LINKS";
+  internal const string anti_links_attribute_name = "X-FOLKS-ANTI-LINKS";
 
   /**
    * The type of persona store this is.
diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala
index c7bcf12..6d21ef2 100644
--- a/backends/eds/lib/edsf-persona.vala
+++ b/backends/eds/lib/edsf-persona.vala
@@ -61,7 +61,7 @@ public class Edsf.Persona : Folks.Persona,
    *
    * @since 0.6.0
    */
-  public static const string[] phone_fields = {
+  public const string[] phone_fields = {
     "assistant_phone", "business_phone", "business_phone_2", "callback_phone",
     "car_phone", "company_phone", "home_phone", "home_phone_2", "isdn_phone",
     "mobile_phone", "other_phone", "primary_phone"
@@ -71,7 +71,7 @@ public class Edsf.Persona : Folks.Persona,
    *
    * @since 0.6.0
    */
-  public static const string[] address_fields = {
+  public const string[] address_fields = {
     "address_home", "address_other", "address_work"
   };
   /**
@@ -79,7 +79,7 @@ public class Edsf.Persona : Folks.Persona,
    *
    * @since 0.6.0
    */
-  public static const string[] email_fields = {
+  public const string[] email_fields = {
     "email_1", "email_2", "email_3", "email_4"
   };
 
@@ -90,7 +90,7 @@ public class Edsf.Persona : Folks.Persona,
    */
   [Deprecated (since = "0.6.3",
       replacement = "Folks.UrlFieldDetails.PARAM_TYPE_BLOG")]
-  public static const string[] url_properties = {
+  public const string[] url_properties = {
     "blog_url", "fburl", "homepage_url", "video_url"
   };
 
@@ -104,7 +104,7 @@ public class Edsf.Persona : Folks.Persona,
       string folks_type;
     }
 
-  internal static const UrlTypeMapping[] _url_properties =
+  internal const UrlTypeMapping[] _url_properties =
     {
       { "homepage_url", UrlFieldDetails.PARAM_TYPE_HOME_PAGE },
       { "blog_url", UrlFieldDetails.PARAM_TYPE_BLOG },
@@ -122,7 +122,7 @@ public class Edsf.Persona : Folks.Persona,
    *
    * @since 0.9.7
    */
-  public static const string folks_field_attribute_name = "X-FOLKS-FIELD";
+  public const string folks_field_attribute_name = "X-FOLKS-FIELD";
 
   /**
    * The vCard attribute used to specify a Contact's gender
@@ -136,7 +136,7 @@ public class Edsf.Persona : Folks.Persona,
    *
    * @since 0.6.0
    */
-  public static const string gender_attribute_name = "X-GENDER";
+  public const string gender_attribute_name = "X-GENDER";
 
   /**
    * The value used to define the male gender for the
@@ -147,7 +147,7 @@ public class Edsf.Persona : Folks.Persona,
    *
    * @since 0.6.0
    */
-  public static const string gender_male = "M";
+  public const string gender_male = "M";
 
   /**
    * The value used to define the female gender for the
@@ -158,7 +158,7 @@ public class Edsf.Persona : Folks.Persona,
    *
    * @since 0.6.0
    */
-  public static const string gender_female = "F";
+  public const string gender_female = "F";
 
   private const string[] _linkable_properties =
     {
@@ -726,7 +726,7 @@ public class Edsf.Persona : Folks.Persona,
       yield ((Edsf.PersonaStore) this.store)._set_system_groups (this, system_groups);
     }
 
-  private static const string GOOGLE_PERSONAL_GROUP_NAME = "Contacts";
+  private const string GOOGLE_PERSONAL_GROUP_NAME = "Contacts";
 
   /**
    * Change whether this contact belongs to the personal group or not.
diff --git a/backends/key-file/kf-persona-store.vala b/backends/key-file/kf-persona-store.vala
index 86c61f7..47d3f63 100644
--- a/backends/key-file/kf-persona-store.vala
+++ b/backends/key-file/kf-persona-store.vala
@@ -49,7 +49,7 @@ public class Folks.Backends.Kf.PersonaStore : Folks.PersonaStore
       null /* FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=682698 */
     };
 
-  internal static const string anti_links_key_name = "__anti-links";
+  internal const string anti_links_key_name = "__anti-links";
 
   /**
    * {@inheritDoc}
diff --git a/backends/telepathy/lib/tpf-persona-store-cache.vala 
b/backends/telepathy/lib/tpf-persona-store-cache.vala
index 26296d0..4fce9b5 100644
--- a/backends/telepathy/lib/tpf-persona-store-cache.vala
+++ b/backends/telepathy/lib/tpf-persona-store-cache.vala
@@ -56,7 +56,7 @@ internal class Tpf.PersonaStoreCache : Folks.ObjectCache<Tpf.Persona>
    * get_serialised_object_type(). This must be modified whenever that variant
    * type or its semantics are changed, since that would necessitate a cache
    * refresh. */
-  private static const uint8 _FILE_FORMAT_VERSION = 2;
+  private const uint8 _FILE_FORMAT_VERSION = 2;
 
   internal PersonaStoreCache (PersonaStore store)
     {
diff --git a/backends/tracker/lib/trf-persona-store.vala b/backends/tracker/lib/trf-persona-store.vala
index 0ee8383..77ec6cf 100644
--- a/backends/tracker/lib/trf-persona-store.vala
+++ b/backends/tracker/lib/trf-persona-store.vala
@@ -168,12 +168,12 @@ public class Trf.PersonaStore : Folks.PersonaStore
   private bool _is_prepared = false;
   private bool _prepare_pending = false;
   private bool _is_quiescent = false;
-  private static const int _default_timeout = 100;
+  private const int _default_timeout = 100;
   private Resources _resources_object;
   private Tracker.Sparql.Connection _connection;
   private static Gee.TreeMap<string, string> _urn_prefix = null;
   private static Gee.TreeMap<string, int> _prefix_tracker_id = null;
-  private static const string _INITIAL_QUERY =
+  private const string _INITIAL_QUERY =
     "SELECT " +
     "tracker:id(?_contact) " +
     "nco:fullname(?_contact) " +
diff --git a/backends/tracker/lib/trf-util.vala b/backends/tracker/lib/trf-util.vala
index 5f4849a..53d48e6 100644
--- a/backends/tracker/lib/trf-util.vala
+++ b/backends/tracker/lib/trf-util.vala
@@ -96,69 +96,69 @@ internal class Trf.AfflInfo : Object
 
 public class Trf.OntologyDefs : Object
 {
-  public static const string DEFAULT_CONTACT_URN =
+  public const string DEFAULT_CONTACT_URN =
   "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#default-contact-me";;
-  public static const string PERSON_CLASS =
+  public const string PERSON_CLASS =
   "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#PersonContact";;
-  public static const string NCO_FULLNAME = "nco:fullname";
-  public static const string NCO_FAMILY = "nco:nameFamily";
-  public static const string NCO_GIVEN = "nco:nameGiven";
-  public static const string NCO_ADDITIONAL = "nco:nameAdditional";
-  public static const string NCO_SUFFIX = "nco:nameHonorificSuffix";
-  public static const string NCO_PREFIX = "nco:nameHonorificPrefix";
-  public static const string NCO_NICKNAME = "nco:nickname";
-  public static const string RDF_TYPE = "ns:type";
-  public static const string NCO_PERSON = "nco:PersonContact";
-  public static const string NCO_URL = "nco:url";
-  public static const string NCO_WEBSITE = "nco:websiteUrl";
-  public static const string NCO_BLOG = "nco:blogUrl";
-  public static const string NAO_FAVORITE = "nao:predefined-tag-favorite";
-  public static const string NAO_TAG = "nao:hasTag";
-  public static const string NAO_PROPERTY = "nao:Property";
-  public static const string NAO_HAS_PROPERTY = "nao:hasProperty";
-  public static const string NAO_PROPERTY_NAME = "nao:propertyName";
-  public static const string NAO_PROPERTY_VALUE = "nao:propertyValue";
-  public static const string NCO_HAS_EMAIL = "nco:hasEmailAddress";
-  public static const string NCO_EMAIL = "nco:EmailAddress";
-  public static const string NCO_EMAIL_PROP = "nco:emailAddress";
-  public static const string NCO_HAS_PHONE = "nco:hasPhoneNumber";
-  public static const string NCO_PHONE = "nco:PhoneNumber";
-  public static const string NCO_PHONE_PROP = "nco:phoneNumber";
-  public static const string NCO_HAS_AFFILIATION = "nco:hasAffiliation";
-  public static const string NCO_AFFILIATION = "nco:Affiliation";
-  public static const string NCO_BIRTHDAY = "nco:birthDate";
-  public static const string NCO_NOTE = "nco:note";
-  public static const string NCO_GENDER = "nco:gender";
-  public static const string NCO_MALE = "nco:gender-male";
-  public static const string NCO_FEMALE = "nco:gender-female";
-  public static const string NCO_PHOTO = "nco:photo";
-  public static const string NIE_URL = "nie:url";
-  public static const string NFO_IMAGE = "nfo:Image";
-  public static const string NIE_DATAOBJECT = "nie:DataObject";
-  public static const string NCO_IMADDRESS = "nco:IMAddress";
-  public static const string NCO_HAS_IMADDRESS = "nco:hasIMAddress";
-  public static const string NCO_IMPROTOCOL = "nco:imProtocol";
-  public static const string NCO_IMID = "nco:imID";
-  public static const string NCO_IM_NICKNAME = "nco:imNickname";
-  public static const string NCO_POSTAL_ADDRESS = "nco:PostalAddress";
-  public static const string NCO_HAS_POSTAL_ADDRESS = "nco:hasPostalAddress";
-  public static const string NCO_POBOX = "nco:pobox";
-  public static const string NCO_DISTRICT = "nco:district";
-  public static const string NCO_COUNTY = "nco:county";
-  public static const string NCO_LOCALITY = "nco:locality";
-  public static const string NCO_POSTALCODE = "nco:postalcode";
-  public static const string NCO_STREET_ADDRESS = "nco:streetAddress";
-  public static const string NCO_ADDRESS_LOCATION = "nco:addressLocation";
-  public static const string NCO_EXTENDED_ADDRESS = "nco:extendedAddress";
-  public static const string NCO_COUNTRY = "nco:country";
-  public static const string NCO_REGION = "nco:region";
-  public static const string NCO_ROLE = "nco:role";
-  public static const string NCO_TITLE = "nco:title";
-  public static const string NCO_ORG = "nco:org";
-  public static const string NCO_URL_PREFIX =
+  public const string NCO_FULLNAME = "nco:fullname";
+  public const string NCO_FAMILY = "nco:nameFamily";
+  public const string NCO_GIVEN = "nco:nameGiven";
+  public const string NCO_ADDITIONAL = "nco:nameAdditional";
+  public const string NCO_SUFFIX = "nco:nameHonorificSuffix";
+  public const string NCO_PREFIX = "nco:nameHonorificPrefix";
+  public const string NCO_NICKNAME = "nco:nickname";
+  public const string RDF_TYPE = "ns:type";
+  public const string NCO_PERSON = "nco:PersonContact";
+  public const string NCO_URL = "nco:url";
+  public const string NCO_WEBSITE = "nco:websiteUrl";
+  public const string NCO_BLOG = "nco:blogUrl";
+  public const string NAO_FAVORITE = "nao:predefined-tag-favorite";
+  public const string NAO_TAG = "nao:hasTag";
+  public const string NAO_PROPERTY = "nao:Property";
+  public const string NAO_HAS_PROPERTY = "nao:hasProperty";
+  public const string NAO_PROPERTY_NAME = "nao:propertyName";
+  public const string NAO_PROPERTY_VALUE = "nao:propertyValue";
+  public const string NCO_HAS_EMAIL = "nco:hasEmailAddress";
+  public const string NCO_EMAIL = "nco:EmailAddress";
+  public const string NCO_EMAIL_PROP = "nco:emailAddress";
+  public const string NCO_HAS_PHONE = "nco:hasPhoneNumber";
+  public const string NCO_PHONE = "nco:PhoneNumber";
+  public const string NCO_PHONE_PROP = "nco:phoneNumber";
+  public const string NCO_HAS_AFFILIATION = "nco:hasAffiliation";
+  public const string NCO_AFFILIATION = "nco:Affiliation";
+  public const string NCO_BIRTHDAY = "nco:birthDate";
+  public const string NCO_NOTE = "nco:note";
+  public const string NCO_GENDER = "nco:gender";
+  public const string NCO_MALE = "nco:gender-male";
+  public const string NCO_FEMALE = "nco:gender-female";
+  public const string NCO_PHOTO = "nco:photo";
+  public const string NIE_URL = "nie:url";
+  public const string NFO_IMAGE = "nfo:Image";
+  public const string NIE_DATAOBJECT = "nie:DataObject";
+  public const string NCO_IMADDRESS = "nco:IMAddress";
+  public const string NCO_HAS_IMADDRESS = "nco:hasIMAddress";
+  public const string NCO_IMPROTOCOL = "nco:imProtocol";
+  public const string NCO_IMID = "nco:imID";
+  public const string NCO_IM_NICKNAME = "nco:imNickname";
+  public const string NCO_POSTAL_ADDRESS = "nco:PostalAddress";
+  public const string NCO_HAS_POSTAL_ADDRESS = "nco:hasPostalAddress";
+  public const string NCO_POBOX = "nco:pobox";
+  public const string NCO_DISTRICT = "nco:district";
+  public const string NCO_COUNTY = "nco:county";
+  public const string NCO_LOCALITY = "nco:locality";
+  public const string NCO_POSTALCODE = "nco:postalcode";
+  public const string NCO_STREET_ADDRESS = "nco:streetAddress";
+  public const string NCO_ADDRESS_LOCATION = "nco:addressLocation";
+  public const string NCO_EXTENDED_ADDRESS = "nco:extendedAddress";
+  public const string NCO_COUNTRY = "nco:country";
+  public const string NCO_REGION = "nco:region";
+  public const string NCO_ROLE = "nco:role";
+  public const string NCO_TITLE = "nco:title";
+  public const string NCO_ORG = "nco:org";
+  public const string NCO_URL_PREFIX =
       "<http://www.semanticdesktop.org/ontologies/2007/03/22/";;
-  public static const string NAO_URL_PREFIX =
+  public const string NAO_URL_PREFIX =
       "<http://www.semanticdesktop.org/ontologies/2007/08/15/";;
-  public static const string RDF_URL_PREFIX =
+  public const string RDF_URL_PREFIX =
       "<http://www.w3.org/1999/02/";;
 }
diff --git a/folks/abstract-field-details.vala b/folks/abstract-field-details.vala
index 00a0c51..ed28cd2 100644
--- a/folks/abstract-field-details.vala
+++ b/folks/abstract-field-details.vala
@@ -57,7 +57,7 @@ public abstract class Folks.AbstractFieldDetails<T> : Object
    *
    * @since 0.6.3
    */
-  public static const string PARAM_TYPE = "type";
+  public const string PARAM_TYPE = "type";
 
   /**
    * Parameter value for home-related field values.
@@ -66,7 +66,7 @@ public abstract class Folks.AbstractFieldDetails<T> : Object
    *
    * @since 0.6.3
    */
-  public static const string PARAM_TYPE_HOME = "home";
+  public const string PARAM_TYPE_HOME = "home";
 
   /**
    * Parameter value for work-related field values.
@@ -75,7 +75,7 @@ public abstract class Folks.AbstractFieldDetails<T> : Object
    *
    * @since 0.6.3
    */
-  public static const string PARAM_TYPE_WORK = "work";
+  public const string PARAM_TYPE_WORK = "work";
 
   /**
    * Parameter value for miscellaneous field values.
@@ -84,7 +84,7 @@ public abstract class Folks.AbstractFieldDetails<T> : Object
    *
    * @since 0.6.3
    */
-  public static const string PARAM_TYPE_OTHER = "other";
+  public const string PARAM_TYPE_OTHER = "other";
 
   private T _value;
   /**
diff --git a/folks/build-conf.vapi b/folks/build-conf.vapi
index f8d157d..a3ee20d 100644
--- a/folks/build-conf.vapi
+++ b/folks/build-conf.vapi
@@ -25,25 +25,25 @@
 public class Folks.BuildConf
 {
   [CCode (cname = "BACKEND_DIR")]
-  public static const string BACKEND_DIR;
+  public const string BACKEND_DIR;
 
   [CCode (cname = "PACKAGE_NAME")]
-  public static const string PACKAGE_NAME;
+  public const string PACKAGE_NAME;
 
   [CCode (cname = "PACKAGE_VERSION")]
-  public static const string PACKAGE_VERSION;
+  public const string PACKAGE_VERSION;
 
   [CCode (cname = "PACKAGE_STRING")]
-  public static const string PACKAGE_STRING;
+  public const string PACKAGE_STRING;
 
   [CCode (cname = "PACKAGE_DATADIR")]
-  public static const string PACKAGE_DATADIR;
+  public const string PACKAGE_DATADIR;
 
   [CCode (cname = "GETTEXT_PACKAGE")]
-  public static const string GETTEXT_PACKAGE;
+  public const string GETTEXT_PACKAGE;
 
   [CCode (cname = "LOCALE_DIR")]
-  public static const string LOCALE_DIR;
+  public const string LOCALE_DIR;
 
   [CCode (cname = "HAVE_EDS")]
   public static bool HAVE_EDS;
@@ -64,20 +64,20 @@ public class Folks.BuildConf
   public static bool HAVE_TRACKER;
 
   [CCode (cname = "TRACKER_SPARQL_MAJOR")]
-  public static const string TRACKER_SPARQL_MAJOR;
+  public const string TRACKER_SPARQL_MAJOR;
 
   [CCode (cname = "ABS_TOP_BUILDDIR")]
-  public static const string ABS_TOP_BUILDDIR;
+  public const string ABS_TOP_BUILDDIR;
 
   [CCode (cname = "ABS_TOP_SRCDIR")]
-  public static const string ABS_TOP_SRCDIR;
+  public const string ABS_TOP_SRCDIR;
 
   [CCode (cname = "PKGLIBEXECDIR")]
-  public static const string PKGLIBEXECDIR;
+  public const string PKGLIBEXECDIR;
 
   [CCode (cname = "INSTALLED_TESTS_DIR")]
-  public static const string INSTALLED_TESTS_DIR;
+  public const string INSTALLED_TESTS_DIR;
 
   [CCode (cname = "INSTALLED_TESTS_META_DIR")]
-  public static const string INSTALLED_TESTS_META_DIR;
+  public const string INSTALLED_TESTS_META_DIR;
 }
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index f2c253f..718f694 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -148,8 +148,8 @@ public class Folks.IndividualAggregator : Object
   private Debug _debug;
   private string _configured_primary_store_type_id;
   private string _configured_primary_store_id;
-  private static const string _FOLKS_GSETTINGS_SCHEMA = "org.freedesktop.folks";
-  private static const string _PRIMARY_STORE_CONFIG_KEY = "primary-store";
+  private const string _FOLKS_GSETTINGS_SCHEMA = "org.freedesktop.folks";
+  private const string _PRIMARY_STORE_CONFIG_KEY = "primary-store";
 
   /* The number of persona stores and backends we're waiting to become
    * quiescent. Once these both reach 0, we should be in a quiescent state.
@@ -167,7 +167,7 @@ public class Folks.IndividualAggregator : Object
    * reach quiescence. */
   private uint _quiescent_timeout_id = 0;
 
-  private static const uint _QUIESCENT_TIMEOUT = 30; /* seconds */
+  private const uint _QUIESCENT_TIMEOUT = 30; /* seconds */
 
   /* We use this to know if the primary PersonaStore has been explicitly
    * set by the user (either via GSettings or an env variable). If that is the
diff --git a/folks/individual.vala b/folks/individual.vala
index 88d6437..3e3aa7d 100644
--- a/folks/individual.vala
+++ b/folks/individual.vala
@@ -1321,7 +1321,7 @@ public class Folks.Individual : Object,
    * having to mess about with delegates.
    *
    * All keys in this array must be unique. */
-  private static const _Notifier _notifiers[] =
+  private const _Notifier _notifiers[] =
     {
       { "alias", Individual._notify_alias_cb },
       { "avatar", Individual._notify_avatar_cb },
diff --git a/folks/object-cache.vala b/folks/object-cache.vala
index 3c31924..aeb7d61 100644
--- a/folks/object-cache.vala
+++ b/folks/object-cache.vala
@@ -42,13 +42,13 @@ public abstract class Folks.ObjectCache<T> : Object
    * of a cache file. They can't be stored as part of the Variant which forms
    * the rest of the file, as to interpret the Variant its entire type has to
    * be known — which depends on the version numbers. */
-  private static const uint8 _FILE_FORMAT_VERSION = 1;
+  private const uint8 _FILE_FORMAT_VERSION = 1;
 
   /* The length of the version header at the beginning of the file. This has
    * to be a multiple of 8 to keep Variant's alignment code happy.
    * As documented above, currently only the first two bytes of this header
    * are used (for version numbers). */
-  private static const size_t _HEADER_WIDTH = 8; /* bytes */
+  private const size_t _HEADER_WIDTH = 8; /* bytes */
 
   private File _cache_directory;
   private File _cache_file;
diff --git a/folks/persona-store.vala b/folks/persona-store.vala
index 30941c1..a1d43f8 100644
--- a/folks/persona-store.vala
+++ b/folks/persona-store.vala
@@ -355,7 +355,7 @@ public abstract class Folks.PersonaStore : Object
    *
    * @since 0.5.0
    */
-  private static const string _PERSONA_DETAIL[] = {
+  private const string _PERSONA_DETAIL[] = {
     "alias",
     "avatar",
     "birthday",
diff --git a/folks/query.vala b/folks/query.vala
index 9b844ef..0ea1dda 100644
--- a/folks/query.vala
+++ b/folks/query.vala
@@ -45,7 +45,7 @@ public abstract class Folks.Query : Object
    *
    * @since 0.11.0
    */
-  public static const string MATCH_FIELDS_NAMES[] =
+  public const string MATCH_FIELDS_NAMES[] =
     {
       "alias",
       "full-name",
@@ -63,7 +63,7 @@ public abstract class Folks.Query : Object
    *
    * @since 0.11.0
    */
-  public static const string MATCH_FIELDS_ADDRESSES[] =
+  public const string MATCH_FIELDS_ADDRESSES[] =
     {
       "email-addresses",
       "im-addresses",
@@ -83,7 +83,7 @@ public abstract class Folks.Query : Object
    *
    * @since 0.11.0
    */
-  public static const string MATCH_FIELDS_MISC[] =
+  public const string MATCH_FIELDS_MISC[] =
     {
       "groups",
       "roles",
diff --git a/folks/url-details.vala b/folks/url-details.vala
index 7a505a1..117fec2 100644
--- a/folks/url-details.vala
+++ b/folks/url-details.vala
@@ -41,7 +41,7 @@ public class Folks.UrlFieldDetails : AbstractFieldDetails<string>
    *
    * @since 0.6.3
    */
-  public static const string PARAM_TYPE_HOME_PAGE = "x-home-page";
+  public const string PARAM_TYPE_HOME_PAGE = "x-home-page";
 
   /**
    * Parameter value for URLs for the contact's personal or professional blog.
@@ -50,7 +50,7 @@ public class Folks.UrlFieldDetails : AbstractFieldDetails<string>
    *
    * @since 0.6.3
    */
-  public static const string PARAM_TYPE_BLOG = "x-blog";
+  public const string PARAM_TYPE_BLOG = "x-blog";
 
   /**
    * Parameter value for URLs for the contact's social networking profile.
@@ -59,7 +59,7 @@ public class Folks.UrlFieldDetails : AbstractFieldDetails<string>
    *
    * @since 0.6.3
    */
-  public static const string PARAM_TYPE_PROFILE = "x-profile";
+  public const string PARAM_TYPE_PROFILE = "x-profile";
 
   /**
    * Parameter value for URLs for the contact's personal or professional FTP
@@ -69,7 +69,7 @@ public class Folks.UrlFieldDetails : AbstractFieldDetails<string>
    *
    * @since 0.6.3
    */
-  public static const string PARAM_TYPE_FTP = "x-ftp";
+  public const string PARAM_TYPE_FTP = "x-ftp";
 
   /**
    * Create a new UrlFieldDetails.
diff --git a/tests/folks/backend-loading.vala b/tests/folks/backend-loading.vala
index b84a881..3cffdb8 100644
--- a/tests/folks/backend-loading.vala
+++ b/tests/folks/backend-loading.vala
@@ -23,7 +23,7 @@ using Folks;
 public class BackendLoadingTests : TpfTest.MixedTestCase
 {
   private MainLoop main_loop;
-  private static const string STORE_FILE_PATH = "folks-test-backend-store.ini";
+  private const string STORE_FILE_PATH = "folks-test-backend-store.ini";
 
   public BackendLoadingTests ()
     {
diff --git a/tests/lib/libsocialweb/backend.vala b/tests/lib/libsocialweb/backend.vala
index 96d04ce..35c1d75 100644
--- a/tests/lib/libsocialweb/backend.vala
+++ b/tests/lib/libsocialweb/backend.vala
@@ -359,9 +359,9 @@ public class LibsocialwebTest.LibsocialwebServerTest : Object
 
 public class LibsocialwebTest.Backend
 {
-  public static const string LIBSOCIALWEB_IFACE = "org.gnome.libsocialweb";
-  public static const string LIBSOCIALWEB_PATH = "/org/gnome/libsocialweb";
-  public static const string LIBSOCIALWEB_BUS_NAME = "org.gnome.libsocialweb";
+  public const string LIBSOCIALWEB_IFACE = "org.gnome.libsocialweb";
+  public const string LIBSOCIALWEB_PATH = "/org/gnome/libsocialweb";
+  public const string LIBSOCIALWEB_BUS_NAME = "org.gnome.libsocialweb";
 
   public bool debug { get; set; }
   private LibsocialwebServerTest? _lsw_server;
diff --git a/tests/lib/tracker/backend.vala b/tests/lib/tracker/backend.vala
index b5c5544..25cafa0 100644
--- a/tests/lib/tracker/backend.vala
+++ b/tests/lib/tracker/backend.vala
@@ -28,8 +28,8 @@ errordomain TrackerTest.BackendSetupError
 
 public class TrackerTest.Backend
 {
-  public static const string URN = "urn:contact";
-  public static const string URLS = "nco:urls";
+  public const string URN = "urn:contact";
+  public const string URLS = "nco:urls";
   public bool debug { get; set; }
   private GLib.List<Gee.HashMap<string, string>> _contacts;
   private Tracker.Sparql.Connection? _connection;
diff --git a/tests/libsocialweb/aggregation.vala b/tests/libsocialweb/aggregation.vala
index 009bde9..2027e87 100644
--- a/tests/libsocialweb/aggregation.vala
+++ b/tests/libsocialweb/aggregation.vala
@@ -25,9 +25,9 @@ using GLib;
 
 public class AggregationTests : LibsocialwebTest.TestCase
 {
-  private static const string STORE_FILE_PATH =
+  private const string STORE_FILE_PATH =
       "folks-test-libsocialweb-aggregation-store.ini";
-  private static const string KF_RELATIONSHIPS_FILE_PATH =
+  private const string KF_RELATIONSHIPS_FILE_PATH =
       "folks-test-libsocialweb-aggregation-relationships.ini";
 
   public AggregationTests ()
diff --git a/tools/import.vala b/tools/import.vala
index 3ceab9e..0375529 100644
--- a/tools/import.vala
+++ b/tools/import.vala
@@ -36,9 +36,9 @@ public class Folks.ImportTool : Object
   private static string source;
   private static string source_filename;
 
-  private static const string DEFAULT_SOURCE = "pidgin";
+  private const string DEFAULT_SOURCE = "pidgin";
 
-  private static const OptionEntry[] options =
+  private const OptionEntry[] options =
     {
       { "source", 's', 0, OptionArg.STRING, ref ImportTool.source,
           N_("Source backend name (default: 'pidgin')"), "name" },
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]