diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-08-08 09:54:02 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-08-08 09:54:02 +0200 |
commit | 3499d33bea0cd8dd705895830f7e9234d4b22be4 (patch) | |
tree | aa644ecf6d314d0072a21a4e8c845f80ff117304 | |
parent | 0161a74b34dd9651b181a327e282a071f1cfc2a8 (diff) | |
download | vala-3499d33bea0cd8dd705895830f7e9234d4b22be4.tar.gz |
Replace `%s` with `%s' in format strings of output messages
-rw-r--r-- | codegen/valaccodeattribute.vala | 8 | ||||
-rw-r--r-- | vala/valaclass.vala | 6 | ||||
-rw-r--r-- | vala/valafield.vala | 2 | ||||
-rw-r--r-- | vala/valagenieparser.vala | 2 | ||||
-rw-r--r-- | vala/valainterface.vala | 4 | ||||
-rw-r--r-- | vala/valamethod.vala | 4 | ||||
-rw-r--r-- | vala/valaparameter.vala | 4 | ||||
-rw-r--r-- | vala/valaparser.vala | 2 | ||||
-rw-r--r-- | vala/valaproperty.vala | 2 | ||||
-rw-r--r-- | vala/valareturnstatement.vala | 2 | ||||
-rw-r--r-- | vala/valastruct.vala | 2 |
11 files changed, 19 insertions, 19 deletions
diff --git a/codegen/valaccodeattribute.vala b/codegen/valaccodeattribute.vala index fc22c3e72..b6f60498c 100644 --- a/codegen/valaccodeattribute.vala +++ b/codegen/valaccodeattribute.vala @@ -1021,7 +1021,7 @@ public class Vala.CCodeAttribute : AttributeCache { } } if (st.is_simple_type ()) { - Report.error (st.source_reference, "The type `%s` doesn't declare a marshaller type name".printf (st.get_full_name ())); + Report.error (st.source_reference, "The type `%s' doesn't declare a marshaller type name".printf (st.get_full_name ())); } else if (get_ccode_has_type_id (st)) { return "BOXED"; } else { @@ -1107,7 +1107,7 @@ public class Vala.CCodeAttribute : AttributeCache { } } if (st.is_simple_type ()) { - Report.error (st.source_reference, "The type `%s` doesn't declare a GValue get function".printf (st.get_full_name ())); + Report.error (st.source_reference, "The type `%s' doesn't declare a GValue get function".printf (st.get_full_name ())); } else if (get_ccode_has_type_id (st)) { return "g_value_get_boxed"; } else { @@ -1165,7 +1165,7 @@ public class Vala.CCodeAttribute : AttributeCache { } } if (st.is_simple_type ()) { - Report.error (st.source_reference, "The type `%s` doesn't declare a GValue set function".printf (st.get_full_name ())); + Report.error (st.source_reference, "The type `%s' doesn't declare a GValue set function".printf (st.get_full_name ())); } else if (get_ccode_has_type_id (st)) { return "g_value_set_boxed"; } else { @@ -1223,7 +1223,7 @@ public class Vala.CCodeAttribute : AttributeCache { } } if (st.is_simple_type ()) { - Report.error (st.source_reference, "The type `%s` doesn't declare a GValue take function".printf (st.get_full_name ())); + Report.error (st.source_reference, "The type `%s' doesn't declare a GValue take function".printf (st.get_full_name ())); } else if (get_ccode_has_type_id (st)) { return "g_value_take_boxed"; } else { diff --git a/vala/valaclass.vala b/vala/valaclass.vala index 0a44e9789..2167e4e4b 100644 --- a/vala/valaclass.vala +++ b/vala/valaclass.vala @@ -463,14 +463,14 @@ public class Vala.Class : ObjectTypeSymbol { if (!(base_type_reference is ObjectType)) { error = true; - Report.error (source_reference, "base type `%s` of class `%s` is not an object type".printf (base_type_reference.to_string (), get_full_name ())); + Report.error (source_reference, "base type `%s' of class `%s' is not an object type".printf (base_type_reference.to_string (), get_full_name ())); return false; } // check whether base type is at least as accessible as the class if (!context.analyzer.is_type_accessible (this, base_type_reference)) { error = true; - Report.error (source_reference, "base type `%s` is less accessible than class `%s`".printf (base_type_reference.to_string (), get_full_name ())); + Report.error (source_reference, "base type `%s' is less accessible than class `%s'".printf (base_type_reference.to_string (), get_full_name ())); return false; } @@ -566,7 +566,7 @@ public class Vala.Class : ObjectTypeSymbol { foreach (DataType base_type in get_base_types ()) { if (base_type.data_type is Interface) { error = true; - Report.error (source_reference, "compact classes `%s` may not implement interfaces".printf (get_full_name ())); + Report.error (source_reference, "compact classes `%s' may not implement interfaces".printf (get_full_name ())); } } diff --git a/vala/valafield.vala b/vala/valafield.vala index 0227e8a8a..f02b09092 100644 --- a/vala/valafield.vala +++ b/vala/valafield.vala @@ -103,7 +103,7 @@ public class Vala.Field : Variable, Lockable { // check whether field type is at least as accessible as the field if (!context.analyzer.is_type_accessible (this, variable_type)) { error = true; - Report.error (source_reference, "field type `%s` is less accessible than field `%s`".printf (variable_type.to_string (), get_full_name ())); + Report.error (source_reference, "field type `%s' is less accessible than field `%s'".printf (variable_type.to_string (), get_full_name ())); return false; } diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala index 57f041a5e..24c638492 100644 --- a/vala/valagenieparser.vala +++ b/vala/valagenieparser.vala @@ -2402,7 +2402,7 @@ public class Vala.Genie.Parser : CodeVisitor { if (attributes != null) { foreach (Attribute attr in (List<Attribute>) attributes) { if (node.get_attribute (attr.name) != null) { - Report.error (attr.source_reference, "duplicate attribute `%s`".printf (attr.name)); + Report.error (attr.source_reference, "duplicate attribute `%s'".printf (attr.name)); } node.attributes.append (attr); } diff --git a/vala/valainterface.vala b/vala/valainterface.vala index 39242d358..1fda79512 100644 --- a/vala/valainterface.vala +++ b/vala/valainterface.vala @@ -206,7 +206,7 @@ public class Vala.Interface : ObjectTypeSymbol { // check whether prerequisite is at least as accessible as the interface if (!context.analyzer.is_type_accessible (this, prerequisite_reference)) { error = true; - Report.error (source_reference, "prerequisite `%s` is less accessible than interface `%s`".printf (prerequisite_reference.to_string (), get_full_name ())); + Report.error (source_reference, "prerequisite `%s' is less accessible than interface `%s'".printf (prerequisite_reference.to_string (), get_full_name ())); return false; } } @@ -223,7 +223,7 @@ public class Vala.Interface : ObjectTypeSymbol { if (!(class_or_interface is ObjectTypeSymbol)) { error = true; - Report.error (source_reference, "Prerequisite `%s` of interface `%s` is not a class or interface".printf (get_full_name (), class_or_interface.to_string ())); + Report.error (source_reference, "Prerequisite `%s' of interface `%s' is not a class or interface".printf (get_full_name (), class_or_interface.to_string ())); return false; } diff --git a/vala/valamethod.vala b/vala/valamethod.vala index e6d9fb590..1db46ae45 100644 --- a/vala/valamethod.vala +++ b/vala/valamethod.vala @@ -752,7 +752,7 @@ public class Vala.Method : Subroutine, Callable { // check whether error type is at least as accessible as the method if (!context.analyzer.is_type_accessible (this, error_type)) { error = true; - Report.error (source_reference, "error type `%s` is less accessible than method `%s`".printf (error_type.to_string (), get_full_name ())); + Report.error (source_reference, "error type `%s' is less accessible than method `%s'".printf (error_type.to_string (), get_full_name ())); return false; } } @@ -815,7 +815,7 @@ public class Vala.Method : Subroutine, Callable { // check whether return type is at least as accessible as the method if (!context.analyzer.is_type_accessible (this, return_type)) { error = true; - Report.error (source_reference, "return type `%s` is less accessible than method `%s`".printf (return_type.to_string (), get_full_name ())); + Report.error (source_reference, "return type `%s' is less accessible than method `%s'".printf (return_type.to_string (), get_full_name ())); return false; } diff --git a/vala/valaparameter.vala b/vala/valaparameter.vala index bfc340bc5..7c13a7c19 100644 --- a/vala/valaparameter.vala +++ b/vala/valaparameter.vala @@ -173,7 +173,7 @@ public class Vala.Parameter : Variable { if (initializer is NullLiteral && !variable_type.nullable && direction != ParameterDirection.OUT) { - Report.warning (source_reference, "`null' incompatible with parameter type `%s`".printf (variable_type.to_string ())); + Report.warning (source_reference, "`null' incompatible with parameter type `%s'".printf (variable_type.to_string ())); } else if (!(initializer is NullLiteral) && direction == ParameterDirection.OUT) { Report.error (source_reference, "only `null' is allowed as default value for out parameters"); } else if (direction == ParameterDirection.IN && !initializer.value_type.compatible (variable_type)) { @@ -189,7 +189,7 @@ public class Vala.Parameter : Variable { // check whether parameter type is at least as accessible as the method if (!context.analyzer.is_type_accessible (this, variable_type)) { error = true; - Report.error (source_reference, "parameter type `%s` is less accessible than method `%s`".printf (variable_type.to_string (), parent_symbol.get_full_name ())); + Report.error (source_reference, "parameter type `%s' is less accessible than method `%s'".printf (variable_type.to_string (), parent_symbol.get_full_name ())); } } diff --git a/vala/valaparser.vala b/vala/valaparser.vala index e5accb128..c4d8a5313 100644 --- a/vala/valaparser.vala +++ b/vala/valaparser.vala @@ -2220,7 +2220,7 @@ public class Vala.Parser : CodeVisitor { if (attributes != null) { foreach (Attribute attr in (List<Attribute>) attributes) { if (node.get_attribute (attr.name) != null) { - Report.error (attr.source_reference, "duplicate attribute `%s`".printf (attr.name)); + Report.error (attr.source_reference, "duplicate attribute `%s'".printf (attr.name)); } node.attributes.append (attr); } diff --git a/vala/valaproperty.vala b/vala/valaproperty.vala index aa899f636..c873f29d3 100644 --- a/vala/valaproperty.vala +++ b/vala/valaproperty.vala @@ -492,7 +492,7 @@ public class Vala.Property : Symbol, Lockable { // check whether property type is at least as accessible as the property if (!context.analyzer.is_type_accessible (this, property_type)) { error = true; - Report.error (source_reference, "property type `%s` is less accessible than property `%s`".printf (property_type.to_string (), get_full_name ())); + Report.error (source_reference, "property type `%s' is less accessible than property `%s'".printf (property_type.to_string (), get_full_name ())); } if (overrides && base_property == null) { diff --git a/vala/valareturnstatement.vala b/vala/valareturnstatement.vala index 2cb1e6dd5..83e81a2cc 100644 --- a/vala/valareturnstatement.vala +++ b/vala/valareturnstatement.vala @@ -135,7 +135,7 @@ public class Vala.ReturnStatement : CodeNode, Statement { if (return_expression is NullLiteral && !context.analyzer.current_return_type.nullable) { - Report.warning (source_reference, "`null' incompatible with return type `%s`".printf (context.analyzer.current_return_type.to_string ())); + Report.warning (source_reference, "`null' incompatible with return type `%s'".printf (context.analyzer.current_return_type.to_string ())); } add_error_types (return_expression.get_error_types ()); diff --git a/vala/valastruct.vala b/vala/valastruct.vala index 1c4ba768c..4100b4b73 100644 --- a/vala/valastruct.vala +++ b/vala/valastruct.vala @@ -494,7 +494,7 @@ public class Vala.Struct : TypeSymbol { if (!(base_type is ValueType)) { error = true; - Report.error (source_reference, "The base type `%s` of struct `%s` is not a struct".printf (base_type.to_string (), get_full_name ())); + Report.error (source_reference, "The base type `%s' of struct `%s' is not a struct".printf (base_type.to_string (), get_full_name ())); return false; } } |