gui: Fix const-ness warning for measure_to_string() return type.

This fixes the following GCC warning:

src/ui/gui/var-display.c: In function ‘measure_to_string’:
rc/ui/gui/var-display.c:25: warning: return discards qualifiers from
pointer target type

diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c
index 1b9bf71c4764db71d4a3b88fef9ca0035035b68b..26de981fef7a06a16a8891dc59318b108ba8490f 100644 (file)
--- a/src/ui/gui/var-display.c
+++ b/src/ui/gui/var-display.c
@@ -16,7 +16,7 @@
 static const gchar none[] = N_("None");
 
 
-gchar *
+const gchar *
 measure_to_string (const struct variable *var, GError **err)
 {
   const gint measure = var_get_measure (var);

diff --git a/src/ui/gui/var-display.h b/src/ui/gui/var-display.h
index 927e235c21419d48e80875284412dd9268424f3e..62212c8e1e5fdd455d977d03e5d2470be2819603 100644 (file)
--- a/src/ui/gui/var-display.h
+++ b/src/ui/gui/var-display.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2011  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,6 +30,6 @@ extern const gchar *const alignments[n_ALIGNMENTS + 1];
 extern const gchar *const measures[n_MEASURES + 1];
 
 gchar *missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GError **err);
-gchar *measure_to_string (const struct variable *var, GError **err);
+const gchar *measure_to_string (const struct variable *var, GError **err);
 
 #endif

diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index 088083f56b03ab99738a104ec61f08d6b8173568..37f501a41381d2a987af1b270e7eac6c9718ac76 100644 (file)
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -89,9 +89,8 @@ populate_text (PsppireDictView *treeview, gpointer data)
                          text);
   g_free (text);
 
-  text = measure_to_string (var, NULL);
   g_string_append_printf (gstring, _("Measurement Level: %s\n"),
-                         text);
+                         measure_to_string (var, NULL));
 
 
   /* Value Labels */