[vala] vapi: Fix "static consts" warnings



commit 3a251398a9e1d7959088c4f58f5cea1a713db6ed
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Jun 8 20:17:26 2016 +0200

    vapi: Fix "static consts" warnings

 vapi/glib-2.0.vapi                                 |    4 +-
 vapi/gnet-2.0.vapi                                 |   10 +-
 vapi/gstreamer-0.10.vapi                           |    2 +
 vapi/libesmtp.vapi                                 |   98 ++++++++++----------
 .../gstreamer-0.10/gstreamer-0.10-custom.vala      |    2 +-
 5 files changed, 59 insertions(+), 57 deletions(-)
---
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index a618f61..aae3106 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1800,10 +1800,10 @@ namespace GLib {
                public static bool remove_by_user_data (void* user_data);
                [Version (since = "2.32")]
                [CCode (cname = "G_SOURCE_CONTINUE")]
-               public static const bool CONTINUE;
+               public const bool CONTINUE;
                [Version (since = "2.32")]
                [CCode (cname = "G_SOURCE_REMOVE")]
-               public static const bool REMOVE;
+               public const bool REMOVE;
 
                protected abstract bool prepare (out int timeout_);
                protected abstract bool check ();
diff --git a/vapi/gnet-2.0.vapi b/vapi/gnet-2.0.vapi
index d5814f5..b15338c 100644
--- a/vapi/gnet-2.0.vapi
+++ b/vapi/gnet-2.0.vapi
@@ -27,7 +27,7 @@ namespace GNet {
                   unref_function = "gnet_inetaddr_unref")]
        public class InetAddr {
                [CCode(cname = "GNET_INETADDR_MAX_LEN")]
-               public static const uint8 MAX_BYTES;
+               public const uint8 MAX_BYTES;
 
                [CCode(cname = "gnet_inetaddr_new_list")]
                public static GLib.List<InetAddr> new_list(string hostname, int port);
@@ -259,10 +259,10 @@ namespace GNet {
        #if GNET_EXPERIMENTAL
        public class Socks {
                [CCode(cname = "GNET_SOCKS_PORT")]
-               public static const int SOCKS_PORT;
+               public const int SOCKS_PORT;
 
                [CCode(cname = "GNET_SOCKS_VERSION")]
-               public static const int SOCKS_VERSION;
+               public const int SOCKS_VERSION;
 
                [CCode(cname = "gnet_socks_get_enabled")]
                public static bool get_enabled();
@@ -566,7 +566,7 @@ namespace GNet {
                   unref_function = "g_object_unref")]
        public class MD5 {
                [CCode(cname = "GNET_MD5_HASH_LENGTH")]
-               public static const int HASH_LENGTH;
+               public const int HASH_LENGTH;
 
                [CCode(cname = "gnet_md5_equal")]
                public static bool equal(MD5 m1, MD5 m2);
@@ -603,7 +603,7 @@ namespace GNet {
                   unref_function = "g_object_unref")]
        public class SHA {
                [CCode(cname = "GNET_SHA_HASH_LENGTH")]
-               public static const int HASH_LENGTH;
+               public const int HASH_LENGTH;
 
                [CCode(cname = "gnet_sha_equal")]
                public static bool equal(SHA s1, SHA s2);
diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 6163f5e..89befbb 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -665,6 +665,8 @@ namespace Gst {
        [Compact]
        public class IndexEntry {
                public Gst.IndexEntryType type;
+               [CCode (cname = "GST_INDEX_ID_INVALID")]
+               public const int ID_INVALID;
                [CCode (cname = "GST_INDEX_ASSOC_FLAGS")]
                public Gst.AssocFlags assoc_flags ();
                [CCode (cname = "GST_INDEX_ASSOC_FORMAT")]
diff --git a/vapi/libesmtp.vapi b/vapi/libesmtp.vapi
index 6df20d6..dfe51b3 100644
--- a/vapi/libesmtp.vapi
+++ b/vapi/libesmtp.vapi
@@ -271,105 +271,105 @@ namespace Smtp {
        }
 
        [CCode (cname="SMTP_EV_CONNECT")]
-       public static const uint EV_CONNECT;
+       public const uint EV_CONNECT;
        [CCode (cname="SMTP_EV_MAILSTATUS")]
-       public static const uint EV_MAILSTATUS;
+       public const uint EV_MAILSTATUS;
        [CCode (cname="SMTP_EV_RCPTSTATUS")]
-       public static const uint EV_RCPTSTATUS;
+       public const uint EV_RCPTSTATUS;
        [CCode (cname="SMTP_EV_MESSAGEDATA")]
-       public static const uint EV_MESSAGEDATA;
+       public const uint EV_MESSAGEDATA;
        [CCode (cname="SMTP_EV_MESSAGESENT")]
-       public static const uint EV_MESSAGESENT;
+       public const uint EV_MESSAGESENT;
        [CCode (cname="SMTP_EV_DISCONNECT")]
-       public static const uint EV_DISCONNECT;
+       public const uint EV_DISCONNECT;
        [CCode (cname="SMTP_EV_ETRNSTATUS")]
-       public static const uint EV_ETRNSTATUS;
+       public const uint EV_ETRNSTATUS;
        [CCode (cname="SMTP_EV_EXTNA_DSN")]
-       public static const uint EV_EXTNA_DSN;
+       public const uint EV_EXTNA_DSN;
        [CCode (cname="SMTP_EV_EXTNA_8BITMIME")]
-       public static const uint EV_EXTNA_8BITMIME;
+       public const uint EV_EXTNA_8BITMIME;
        [CCode (cname="SMTP_EV_EXTNA_STARTTLS")]
-       public static const uint EV_EXTNA_STARTTLS;
+       public const uint EV_EXTNA_STARTTLS;
        [CCode (cname="SMTP_EV_EXTNA_ETRN")]
-       public static const uint EV_EXTNA_ETRN;
+       public const uint EV_EXTNA_ETRN;
        [CCode (cname="SMTP_EV_EXTNA_CHUNKING")]
-       public static const uint EV_EXTNA_CHUNKING;
+       public const uint EV_EXTNA_CHUNKING;
        [CCode (cname="SMTP_EV_EXTNA_BINARYMIME")]
-       public static const uint EV_EXTNA_BINARYMIME;
+       public const uint EV_EXTNA_BINARYMIME;
        [CCode (cname="SMTP_EV_DELIVERBY_EXPIRED")]
-       public static const uint EV_DELIVERBY_EXPIRED;
+       public const uint EV_DELIVERBY_EXPIRED;
        [CCode (cname="SMTP_EV_WEAK_CIPHER")]
-       public static const uint EV_WEAK_CIPHER;
+       public const uint EV_WEAK_CIPHER;
        [CCode (cname="SMTP_EV_STARTTLS_OK")]
-       public static const uint EV_STARTTLS_OK;
+       public const uint EV_STARTTLS_OK;
        [CCode (cname="SMTP_EV_INVALID_PEER_CERTIFICATE")]
-       public static const uint EV_INVALID_PEER_CERTIFICATE;
+       public const uint EV_INVALID_PEER_CERTIFICATE;
        [CCode (cname="SMTP_EV_NO_PEER_CERTIFICATE")]
-       public static const uint EV_NO_PEER_CERTIFICATE;
+       public const uint EV_NO_PEER_CERTIFICATE;
        [CCode (cname="SMTP_EV_WRONG_PEER_CERTIFICATE")]
-       public static const uint EV_WRONG_PEER_CERTIFICATE;
+       public const uint EV_WRONG_PEER_CERTIFICATE;
        [CCode (cname="SMTP_EV_NO_CLIENT_CERTIFICATE")]
-       public static const uint EV_NO_CLIENT_CERTIFICATE;
+       public const uint EV_NO_CLIENT_CERTIFICATE;
        [CCode (cname="SMTP_EV_UNUSABLE_CLIENT_CERTIFICATE")]
-       public static const uint EV_UNUSABLE_CLIENT_CERTIFICATE;
+       public const uint EV_UNUSABLE_CLIENT_CERTIFICATE;
        [CCode (cname="SMTP_EV_UNUSABLE_CA_LIST")]
-       public static const uint EV_UNUSABLE_CA_LIST;
+       public const uint EV_UNUSABLE_CA_LIST;
 
        [CCode (cname="Timeout_OVERRIDE_RFC2822_MINIMUM")]
-       public static const long TIMEOUT_OVERRIDE_RFC2822_MINIMUM;
+       public const long TIMEOUT_OVERRIDE_RFC2822_MINIMUM;
 
        [CCode (cname="SMTP_ERR_NOTHING_TO_DO")]
-       public static const uint ERR_NOTHING_TO_DO;
+       public const uint ERR_NOTHING_TO_DO;
        [CCode (cname="SMTP_ERR_DROPPED_CONNECTION")]
-       public static const uint ERR_DROPPED_CONNECTION;
+       public const uint ERR_DROPPED_CONNECTION;
        [CCode (cname="SMTP_ERR_INVALID_RESPONSE_SYNTAX")]
-       public static const uint ERR_INVALID_RESPONSE_SYNTAX;
+       public const uint ERR_INVALID_RESPONSE_SYNTAX;
        [CCode (cname="SMTP_ERR_STATUS_MISMATCH")]
-       public static const uint ERR_STATUS_MISMATCH;
+       public const uint ERR_STATUS_MISMATCH;
        [CCode (cname="SMTP_ERR_INVALID_RESPONSE_STATUS")]
-       public static const uint ERR_INVALID_RESPONSE_STATUS;
+       public const uint ERR_INVALID_RESPONSE_STATUS;
        [CCode (cname="SMTP_ERR_INVAL")]
-       public static const uint ERR_INVAL;
+       public const uint ERR_INVAL;
        [CCode (cname="SMTP_ERR_EXTENSION_NOT_AVAILABLE")]
-       public static const uint ERR_EXTENSION_NOT_AVAILABLE;
+       public const uint ERR_EXTENSION_NOT_AVAILABLE;
        [CCode (cname="SMTP_ERR_HOST_NOT_FOUND")]
-       public static const uint ERR_HOST_NOT_FOUND;
+       public const uint ERR_HOST_NOT_FOUND;
        [CCode (cname="SMTP_ERR_NO_ADDRESS")]
-       public static const uint ERR_NO_ADDRESS;
+       public const uint ERR_NO_ADDRESS;
        [CCode (cname="SMTP_ERR_NO_RECOVERY")]
-       public static const uint ERR_NO_RECOVERY;
+       public const uint ERR_NO_RECOVERY;
        [CCode (cname="SMTP_ERR_TRY_AGAIN")]
-       public static const uint ERR_TRY_AGAIN;
+       public const uint ERR_TRY_AGAIN;
        [CCode (cname="SMTP_ERR_EAI_AGAIN")]
-       public static const uint ERR_EAI_AGAIN;
+       public const uint ERR_EAI_AGAIN;
        [CCode (cname="SMTP_ERR_EAI_FAIL")]
-       public static const uint ERR_EAI_FAIL;
+       public const uint ERR_EAI_FAIL;
        [CCode (cname="SMTP_ERR_EAI_MEMORY")]
-       public static const uint ERR_EAI_MEMORY;
+       public const uint ERR_EAI_MEMORY;
        [CCode (cname="SMTP_ERR_EAI_ADDRFAMILY")]
-       public static const uint ERR_EAI_ADDRFAMILY;
+       public const uint ERR_EAI_ADDRFAMILY;
        [CCode (cname="SMTP_ERR_EAI_NODATA")]
-       public static const uint ERR_EAI_NODATA;
+       public const uint ERR_EAI_NODATA;
        [CCode (cname="SMTP_ERR_EAI_FAMILY")]
-       public static const uint ERR_EAI_FAMILY;
+       public const uint ERR_EAI_FAMILY;
        [CCode (cname="SMTP_ERR_EAI_BADFLAGS")]
-       public static const uint ERR_EAI_BADFLAGS;
+       public const uint ERR_EAI_BADFLAGS;
        [CCode (cname="SMTP_ERR_EAI_NONAME")]
-       public static const uint ERR_EAI_NONAME;
+       public const uint ERR_EAI_NONAME;
        [CCode (cname="SMTP_ERR_EAI_SERVICE")]
-       public static const uint ERR_EAI_SERVICE;
+       public const uint ERR_EAI_SERVICE;
        [CCode (cname="SMTP_ERR_EAI_SOCKTYPE")]
-       public static const uint ERR_EAI_SOCKTYPE;
+       public const uint ERR_EAI_SOCKTYPE;
        [CCode (cname="SMTP_ERR_UNTERMINATED_RESPONSE")]
-       public static const uint ERR_UNTERMINATED_RESPONSE;
+       public const uint ERR_UNTERMINATED_RESPONSE;
        [CCode (cname="SMTP_ERR_CLIENT_ERROR")]
-       public static const uint ERR_CLIENT_ERROR;
+       public const uint ERR_CLIENT_ERROR;
        [CCode (cname="SMTP_CB_READING")]
-       public static const uint CB_READING;
+       public const uint CB_READING;
        [CCode (cname="SMTP_CB_WRITING")]
-       public static const uint CB_WRITING;
+       public const uint CB_WRITING;
        [CCode (cname="SMTP_CB_HEADERS")]
-       public static const uint CB_HEADERS;
+       public const uint CB_HEADERS;
 
        [CCode (cname="AUTH_USER", cheader_filename="auth-client.h")]
        public static uint AUTH_USER;
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala 
b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
index f594be5..589e372 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -122,7 +122,7 @@ namespace Gst {
                [CCode (cname = "GST_INDEX_FORMAT_KEY")]
                public unowned string format_key ();
                [CCode (cname = "GST_INDEX_ID_INVALID")]
-               static const int ID_INVALID;
+               public const int ID_INVALID;
                [CCode (cname = "GST_INDEX_ID_DESCRIPTION")]
                public unowned string id_description ();
        }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]