clang-plugin: Fix error message formatting in GVariant checker

The Clang QualType formatting adds quotation marks, but our error
messages already contained them. Loath as I am to revert to using ASCII
quotation marks, the formatting provided by QualType is quite good
(since it adds aka information), so drop the old Tartan Unicode
quotation marks.

7 files changed, 60 insertions, 60 deletions

diff --git a/clang-plugin/gvariant-checker.cpp b/clang-plugin/gvariant-checker.cpp
index af9894a..3ed6b99 100644
--- a/clang-plugin/gvariant-checker.cpp
+++ b/clang-plugin/gvariant-checker.cpp
@@ -264,7 +264,7 @@ _consume_variadic_argument (QualType expected_type,
 
 	if (*args_begin == *args_end) {
 		Debug::emit_error ("Expected a GVariant variadic argument of "
-		                   "type ‘%0’ but there wasn’t one.", compiler,
+		                   "type %0 but there wasn’t one.", compiler,
 		                   format_arg_str->getLocStart ())
 		<< expected_type;
 
@@ -293,7 +293,7 @@ _consume_variadic_argument (QualType expected_type,
 	if (is_null_constant && !(flags & CHECK_FLAG_ALLOW_MAYBE) &&
 	    expected_type->isPointerType ()) {
 		Debug::emit_error ("Expected a GVariant variadic argument of "
-		                   "type ‘%0’ but saw NULL instead.", compiler,
+		                   "type %0 but saw NULL instead.", compiler,
 		                   arg->getLocStart ())
 		<< expected_type;
 
@@ -303,8 +303,8 @@ _consume_variadic_argument (QualType expected_type,
 		if (!_compare_types (actual_type, expected_type,
 		                     flags, context)) {
 			Debug::emit_error ("Expected a GVariant variadic "
-			                   "argument of type ‘%0’ but saw one "
-			                   "of type ‘%1’.", compiler,
+			                   "argument of type %0 but saw one "
+			                   "of type %1.", compiler,
 			                   arg->getLocStart ())
 			<< expected_type
 			<< actual_type;
@@ -385,7 +385,7 @@ _check_basic_type_string (const gchar **type_str,
 		Debug::emit_error ("Expected a GVariant basic type string but "
 		                   "saw ‘%0’.", compiler,
 		                   format_arg_str->getLocStart ())
-		<< **type_str;
+		<< std::string (1, **type_str);
 
 		return false;
 	}
@@ -941,7 +941,7 @@ _check_gvariant_format_param (const CallExpr& call,
 
 		if (error_format_str != NULL) {
 			Debug::emit_error ("Unexpected GVariant variadic "
-			                   "argument of type ‘%0’. A ‘%1’ "
+			                   "argument of type %0. A ‘%1’ "
 			                   "GVariant format string should be "
 			                   "added to the format argument to "
 			                   "use it.",
@@ -950,7 +950,7 @@ _check_gvariant_format_param (const CallExpr& call,
 			<< error_format_str;
 		} else {
 			Debug::emit_error ("Unexpected GVariant variadic "
-			                   "argument of type ‘%0’. A GVariant "
+			                   "argument of type %0. A GVariant "
 			                   "format string should be added to "
 			                   "the format argument to use it, but "
 			                   "there is no known GVariant "
diff --git a/tests/gvariant-builder.c b/tests/gvariant-builder.c
index 3ed447f..c882829 100644
--- a/tests/gvariant-builder.c
+++ b/tests/gvariant-builder.c
@@ -19,7 +19,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char *’ but saw one of type ‘int’.
+ * Expected a GVariant variadic argument of type 'char *' but saw one of type 'int'.
  *         g_variant_builder_add (builder, "{ss}", "hi", 15);
  *                                                       ^
  */
@@ -30,7 +30,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char *’ but saw NULL instead.
+ * Expected a GVariant variadic argument of type 'char *' but saw NULL instead.
  *         g_variant_builder_add (builder, "s", FALSE);
  *                                              ^
  */
diff --git a/tests/gvariant-get-child.c b/tests/gvariant-get-child.c
index ed73d62..a53ab27 100644
--- a/tests/gvariant-get-child.c
+++ b/tests/gvariant-get-child.c
@@ -32,7 +32,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘const char **’ but saw one of type ‘guint *’.
+ * Expected a GVariant variadic argument of type 'const char **' but saw one of type 'guint *' (aka 'unsigned int *').
  *         g_variant_get_child (existing_variant, 0, "&s", &not_a_string);
  *                                                         ^
  */
diff --git a/tests/gvariant-get.c b/tests/gvariant-get.c
index 5eccae7..f4f744a 100644
--- a/tests/gvariant-get.c
+++ b/tests/gvariant-get.c
@@ -25,7 +25,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘const char **’ but saw one of type ‘gchar **’.
+ *  Expected a GVariant variadic argument of type 'const char **' but saw one of type 'gchar **' (aka 'char **').
  *         g_variant_get (existing_variant, "(&s&s)", &str1, &str2);
  *                                                    ^
  */
@@ -36,7 +36,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘int *’ but there wasn’t one.
+ * Expected a GVariant variadic argument of type 'int *' but there wasn’t one.
  *         g_variant_get (existing_variant, "invalid");
  *                        ^
  */
@@ -53,7 +53,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char ***’ but saw one of type ‘const gchar ***’.
+ * Expected a GVariant variadic argument of type 'char ***' but saw one of type 'const gchar ***' (aka 'const char ***').
  *         g_variant_get (existing_variant, "^as", &some_str_array);
  *                                                 ^
  */
@@ -71,7 +71,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘const char ***’ but saw one of type ‘gchar ***’.
+ *  Expected a GVariant variadic argument of type 'const char ***' but saw one of type 'gchar ***' (aka 'char ***').
  *         g_variant_get (existing_variant, "^a&s", &some_str_array);
  *                                                  ^
  */
@@ -105,7 +105,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char **’ but saw one of type ‘const gchar **’.
+ * Expected a GVariant variadic argument of type 'char **' but saw one of type 'const gchar **' (aka 'const char **').
  *         g_variant_get (existing_variant, "^ay", &some_byte_str);
  *                                                 ^
  */
@@ -123,7 +123,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘const char **’ but saw one of type ‘gchar **’.
+ * Expected a GVariant variadic argument of type 'const char **' but saw one of type 'gchar **' (aka 'char **').
  *         g_variant_get (existing_variant, "^&ay", &some_byte_str);
  *                                                  ^
  */
@@ -141,7 +141,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char ***’ but saw one of type ‘const gchar ***’.
+ * Expected a GVariant variadic argument of type 'char ***' but saw one of type 'const gchar ***' (aka 'const char ***').
  *         g_variant_get (existing_variant, "^aay", &some_bytes_array);
  *                                                  ^
  */
@@ -159,7 +159,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘const char ***’ but saw one of type ‘gchar ***’.
+ * Expected a GVariant variadic argument of type 'const char ***' but saw one of type 'gchar ***' (aka 'char ***').
  *         g_variant_get (existing_variant, "^a&ay", &some_bytes_array);
  *                                                   ^
  */
@@ -176,7 +176,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariant **’ but saw one of type ‘gchar **’.
+ * Expected a GVariant variadic argument of type 'GVariant **' (aka 'struct _GVariant **') but saw one of type 'gchar **' (aka 'char **').
  *         g_variant_get (existing_variant, "@s", &some_str);
  *                                                ^
  */
@@ -194,7 +194,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘GVariant **’ but saw one of type ‘const GVariant **’.
+ *  Expected a GVariant variadic argument of type 'GVariant **' (aka 'struct _GVariant **') but saw one of type 'const GVariant **' (aka 'const struct _GVariant **').
  *         g_variant_get (existing_variant, "@s", &some_variant);
  *                                                ^
  */
@@ -274,7 +274,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariant **’ but saw one of type ‘const GVariant **’.
+ * Expected a GVariant variadic argument of type 'GVariant **' (aka 'struct _GVariant **') but saw one of type 'const GVariant **' (aka 'const struct _GVariant **').
  *         g_variant_get (existing_variant, "v", &some_var);
  *                                               ^
  */
@@ -291,7 +291,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariant **’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'GVariant **' (aka 'struct _GVariant **') but saw one of type 'char *'.
  *         g_variant_get (existing_variant, "v", "nope");
  *                                               ^
  */
@@ -330,7 +330,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘const char **’ but saw one of type ‘gchar **’.
+ * Expected a GVariant variadic argument of type 'const char **' but saw one of type 'gchar **' (aka 'char **').
  *         g_variant_get (existing_variant, "m&s", &some_str);
  *                                                 ^
  */
@@ -350,7 +350,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariantIter **’ but saw one of type ‘GVariantIter *’.
+ * Expected a GVariant variadic argument of type 'GVariantIter **' (aka 'struct _GVariantIter **') but saw one of type 'GVariantIter *' (aka 'struct _GVariantIter *').
  *         g_variant_get (existing_variant, "as", some_iter);
  *                                                ^
  */
@@ -394,7 +394,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariantIter **’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'GVariantIter **' (aka 'struct _GVariantIter **') but saw one of type 'char *'.
  *         g_variant_get (existing_variant, "au", "nope");
  *                                                ^
  */
@@ -411,7 +411,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘int *’ but saw one of type ‘gchar *’.
+ *  Expected a GVariant variadic argument of type 'int *' but saw one of type 'gchar *' (aka 'char *').
  *         g_variant_get (existing_variant, "b", &some_not_bool);
  *                                               ^
  */
@@ -429,7 +429,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘unsigned char *’ but saw one of type ‘guint *’.
+ * Expected a GVariant variadic argument of type 'unsigned char *' but saw one of type 'guint *' (aka 'unsigned int *').
  *         g_variant_get (existing_variant, "y", &some_uchar);
  *                                               ^
  */
@@ -456,7 +456,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘double *’ but saw one of type ‘gfloat *’.
+ * Expected a GVariant variadic argument of type 'double *' but saw one of type 'gfloat *' (aka 'float *').
  *         g_variant_get (existing_variant, "d", &some_float);
  *                                               ^
  */
@@ -466,7 +466,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘long *’ but saw one of type ‘gint32 *’.
+ * Expected a GVariant variadic argument of type 'long *' but saw one of type 'gint32 *' (aka 'int *').
  *         g_variant_get (existing_variant, "x", &some_int);
  *                                               ^
  */
@@ -484,7 +484,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘long *’ but saw one of type ‘guint64 *’.
+ * Expected a GVariant variadic argument of type 'long *' but saw one of type 'guint64 *' (aka 'unsigned long *').
  *         g_variant_get (existing_variant, "x", &some_uint);
  *                                               ^
  */
diff --git a/tests/gvariant-iter.c b/tests/gvariant-iter.c
index cebe522..37865ff 100644
--- a/tests/gvariant-iter.c
+++ b/tests/gvariant-iter.c
@@ -16,7 +16,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘GVariant **’ but saw one of type ‘gchar **’.
+ *  Expected a GVariant variadic argument of type 'GVariant **' (aka 'struct _GVariant **') but saw one of type 'gchar **' (aka 'char **').
  *         while (g_variant_iter_loop (&iter, "{sv}", &key, &not_a_value)) {
  *                                                          ^
  */
@@ -51,7 +51,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariant **’ but saw one of type ‘gchar **’.
+ * Expected a GVariant variadic argument of type 'GVariant **' (aka 'struct _GVariant **') but saw one of type 'gchar **' (aka 'char **').
  *         while (g_variant_iter_next (&iter, "{sv}", &key, &not_a_value)) {
  *                                                          ^
  */
diff --git a/tests/gvariant-lookup.c b/tests/gvariant-lookup.c
index fde9418..22f53ff 100644
--- a/tests/gvariant-lookup.c
+++ b/tests/gvariant-lookup.c
@@ -44,7 +44,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char **’ but saw one of type ‘guint *’.
+ * Expected a GVariant variadic argument of type 'char **' but saw one of type 'guint *' (aka 'unsigned int *').
  *         g_variant_lookup (existing_variant, "key", "s", &not_a_string);
  *                                                         ^
  */
diff --git a/tests/gvariant-new.c b/tests/gvariant-new.c
index 75e6e0e..f3f2710 100644
--- a/tests/gvariant-new.c
+++ b/tests/gvariant-new.c
@@ -1,7 +1,7 @@
 /* Template: gvariant */
 
 /*
- * Expected a GVariant variadic argument of type ‘char *’ but saw one of type ‘guint’.
+ * Expected a GVariant variadic argument of type 'char *' but saw one of type 'guint' (aka 'unsigned int').
  *         floating_variant = g_variant_new ("(sss)", "hello", my_string, a_little_int_short_and_stout);
  *                                                                        ^
  */
@@ -20,7 +20,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘int’ but there wasn’t one.
+ * Expected a GVariant variadic argument of type 'int' but there wasn’t one.
  *         floating_variant = g_variant_new ("invalid");
  *                                            ^
  */
@@ -43,7 +43,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘int’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'int' but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("b", "nope");
  */
 {
@@ -58,7 +58,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘int’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'int' but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("y", "nope");
  *                                                ^
  */
@@ -82,7 +82,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘int’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'int' but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("n", "nope");
  *                                                ^
  */
@@ -129,7 +129,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘int’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'int' but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("i", "nope");
  *                                                ^
  */
@@ -160,7 +160,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘unsigned int’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'unsigned int' but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("u", "nope");
  *                                                ^
  */
@@ -199,7 +199,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘long’ but saw one of type ‘char *’.
+ *  Expected a GVariant variadic argument of type 'long' but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("x", "nope");
  *                                                ^
  */
@@ -208,7 +208,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘long’ but saw one of type ‘int’.
+ * Expected a GVariant variadic argument of type 'long' but saw one of type 'int'.
  *         floating_variant = g_variant_new ("x", -5);
  *                                                ^
  */
@@ -217,7 +217,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘long’ but saw one of type ‘gint32’.
+ * Expected a GVariant variadic argument of type 'long' but saw one of type 'gint32' (aka 'int').
  *         floating_variant = g_variant_new ("x", some_var);
  *                                                ^
  */
@@ -242,7 +242,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘unsigned long’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'unsigned long' but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("t", "nada");
  *                                                ^
  */
@@ -251,7 +251,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘unsigned long’ but saw one of type ‘unsigned int’.
+ * Expected a GVariant variadic argument of type 'unsigned long' but saw one of type 'unsigned int'.
  *         floating_variant = g_variant_new ("t", 5);
  *                                                ^
  */
@@ -260,7 +260,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘unsigned long’ but saw one of type ‘guint32’.
+ * Expected a GVariant variadic argument of type 'unsigned long' but saw one of type 'guint32' (aka 'unsigned int').
  *         floating_variant = g_variant_new ("t", some_var);
  *                                                ^
  */
@@ -285,7 +285,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘int’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'int' but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("h", "nope");
  *                                                ^
  */
@@ -309,7 +309,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘double’ but saw one of type ‘int’.
+ * Expected a GVariant variadic argument of type 'double' but saw one of type 'int'.
  *         floating_variant = g_variant_new ("d", 5);
  *                                                ^
  */
@@ -347,7 +347,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char *’ but saw one of type ‘int’.
+ * Expected a GVariant variadic argument of type 'char *' but saw one of type 'int'.
  *         floating_variant = g_variant_new ("s", 152);
  *                                                ^
  */
@@ -388,7 +388,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char *’ but saw one of type ‘int’.
+ * Expected a GVariant variadic argument of type 'char *' but saw one of type 'int'.
  *         floating_variant = g_variant_new ("o", 152);
  *                                                ^
  */
@@ -429,7 +429,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char *’ but saw one of type ‘int’.
+ * Expected a GVariant variadic argument of type 'char *' but saw one of type 'int'.
  *         floating_variant = g_variant_new ("g", 152);
  *                                                ^
  */
@@ -523,7 +523,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariant *’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'GVariant *' (aka 'struct _GVariant *') but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("v", "nope");
  *                                                ^
  */
@@ -553,7 +553,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char *’ but saw NULL instead.
+ * Expected a GVariant variadic argument of type 'char *' but saw NULL instead.
  *         floating_variant = g_variant_new ("s", NULL);
  *                                           ^
  */
@@ -570,7 +570,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariant *’ but saw NULL instead.
+ * Expected a GVariant variadic argument of type 'GVariant *' (aka 'struct _GVariant *') but saw NULL instead.
  *         floating_variant = g_variant_new ("@s", NULL);
  *                                           ^
  */
@@ -579,7 +579,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariant *’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'GVariant *' (aka 'struct _GVariant *') but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("@s", "some string");
  *                                                 ^
  */
@@ -612,7 +612,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘char *’ but saw one of type ‘int’.
+ * Expected a GVariant variadic argument of type 'char *' but saw one of type 'int'.
  *         floating_variant = g_variant_new ("{ss}", 5, FALSE);
  *                                                   ^
  */
@@ -632,7 +632,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘char *’ but saw NULL instead.
+ *  Expected a GVariant variadic argument of type 'char *' but saw NULL instead.
  *         floating_variant = g_variant_new ("{ss}", "key", NULL);
  *                                                          ^
  */
@@ -641,7 +641,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘char *’ but saw NULL instead.
+ *  Expected a GVariant variadic argument of type 'char *' but saw NULL instead.
  *         floating_variant = g_variant_new ("{ss}", NULL, "value");
  *                                                   ^
  */
@@ -813,7 +813,7 @@
 }
 
 /*
- * Expected a GVariant variadic argument of type ‘GVariantBuilder *’ but saw one of type ‘char *’.
+ * Expected a GVariant variadic argument of type 'GVariantBuilder *' (aka 'struct _GVariantBuilder *') but saw one of type 'char *'.
  *         floating_variant = g_variant_new ("au", "nope");
  *                                                 ^
  */
@@ -856,7 +856,7 @@
 }
 
 /*
- *  Expected a GVariant variadic argument of type ‘char **’ but saw NULL instead.
+ *  Expected a GVariant variadic argument of type 'char **' but saw NULL instead.
  *         floating_variant = g_variant_new ("^as", NULL);
  *                                                  ^
  */