[tracker] libtracker-data: Fix warnings and errors found by vala master
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] libtracker-data: Fix warnings and errors found by vala master
- Date: Sun, 21 Mar 2010 09:49:54 +0000 (UTC)
commit dec46eb135699b8a348b45107fd495137db091aa
Author: Jürg Billeter <j bitron ch>
Date: Sun Mar 21 10:49:09 2010 +0100
libtracker-data: Fix warnings and errors found by vala master
src/libtracker-data/libtracker-data.vapi | 10 +++++-----
src/libtracker-data/tracker-sparql-query.vala | 6 +++---
src/libtracker-data/tracker-sparql-scanner.vala | 2 +-
src/libtracker-db/libtracker-db.vapi | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/libtracker-data/libtracker-data.vapi b/src/libtracker-data/libtracker-data.vapi
index 7087ed0..65c1cec 100644
--- a/src/libtracker-data/libtracker-data.vapi
+++ b/src/libtracker-data/libtracker-data.vapi
@@ -58,11 +58,11 @@ namespace Tracker {
[CCode (cheader_filename = "libtracker-data/tracker-ontologies.h")]
namespace Ontologies {
- public weak Class get_class_by_uri (string class_uri);
- public weak Property get_property_by_uri (string property_uri);
- public weak Namespace[] get_namespaces ();
- public weak Class[] get_classes ();
- public weak Property[] get_properties ();
+ public unowned Class get_class_by_uri (string class_uri);
+ public unowned Property get_property_by_uri (string property_uri);
+ public unowned Namespace[] get_namespaces ();
+ public unowned Class[] get_classes ();
+ public unowned Property[] get_properties ();
}
[CCode (cheader_filename = "libtracker-data/tracker-data-update.h")]
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index 229eb6d..ae95c30 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -464,7 +464,7 @@ public class Tracker.SparqlQuery : Object {
}
}
- public DBResultSet? execute () throws DBInterfaceError, SparqlError {
+ public DBResultSet? execute () throws DBInterfaceError, SparqlError, DateError {
assert (!update_extensions);
scanner = new SparqlScanner ((char*) query_string, (long) query_string.size ());
@@ -1253,13 +1253,13 @@ public class Tracker.SparqlQuery : Object {
expect (SparqlTokenType.CLOSE_PARENS);
}
- void append_expression_as_string (StringBuilder sql, string expression, PropertyType type) {
+ static void append_expression_as_string (StringBuilder sql, string expression, PropertyType type) {
long begin = sql.len;
sql.append (expression);
convert_expression_to_string (sql, type, begin);
}
- void convert_expression_to_string (StringBuilder sql, PropertyType type, long begin) {
+ static void convert_expression_to_string (StringBuilder sql, PropertyType type, long begin) {
switch (type) {
case PropertyType.STRING:
case PropertyType.INTEGER:
diff --git a/src/libtracker-data/tracker-sparql-scanner.vala b/src/libtracker-data/tracker-sparql-scanner.vala
index e90abb6..20ec669 100644
--- a/src/libtracker-data/tracker-sparql-scanner.vala
+++ b/src/libtracker-data/tracker-sparql-scanner.vala
@@ -876,7 +876,7 @@ public enum Tracker.SparqlTokenType {
WHERE,
WITH;
- public weak string to_string () {
+ public unowned string to_string () {
switch (this) {
case A: return "`a'";
case AS: return "`AS'";
diff --git a/src/libtracker-db/libtracker-db.vapi b/src/libtracker-db/libtracker-db.vapi
index d2a414c..d9a69e7 100644
--- a/src/libtracker-db/libtracker-db.vapi
+++ b/src/libtracker-db/libtracker-db.vapi
@@ -41,7 +41,7 @@ namespace Tracker {
[CCode (cheader_filename = "libtracker-db/tracker-db-manager.h")]
namespace DBManager {
- public weak DBInterface get_db_interface ();
+ public unowned DBInterface get_db_interface ();
}
[CCode (cheader_filename = "libtracker-db/tracker-db-interface.h")]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]