gcc warning cleanup

warning: deprecated conversion from string constant to ‘char*’/'gchar*'

(bzr r7253)

6 files changed, 16 insertions, 16 deletions

diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index e9277a55b..d13e8fd12 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -47,7 +47,7 @@ sp_gradient_image_get_type (void)
 	static GtkType type = 0;
 	if (!type) {
 		GtkTypeInfo info = {
-			"SPGradientImage",
+			(gchar*) "SPGradientImage",
 			sizeof (SPGradientImage),
 			sizeof (SPGradientImageClass),
 			(GtkClassInitFunc) sp_gradient_image_class_init,
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 5aad614b4..dccd0916e 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -102,7 +102,7 @@ sp_icon_get_type()
     static GtkType type = 0;
     if (!type) {
         GtkTypeInfo info = {
-            "SPIcon",
+            (gchar*) "SPIcon",
             sizeof(SPIcon),
             sizeof(SPIconClass),
             (GtkClassInitFunc) sp_icon_class_init,
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index 6ab7c8394..d4ff91f3c 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -47,7 +47,7 @@ sp_hruler_get_type (void)
     {
       static const GtkTypeInfo hruler_info =
       {
-        "SPHRuler",
+        (gchar*) "SPHRuler",
         sizeof (SPHRuler),
         sizeof (SPHRulerClass),
         (GtkClassInitFunc) sp_hruler_class_init,
@@ -384,7 +384,7 @@ sp_vruler_get_type (void)
     {
       static const GtkTypeInfo vruler_info =
       {
-	"SPVRuler",
+	(gchar*) "SPVRuler",
 	sizeof (SPVRuler),
 	sizeof (SPVRulerClass),
 	(GtkClassInitFunc) sp_vruler_class_init,
@@ -707,15 +707,15 @@ sp_vruler_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 /// Ruler metrics.
 static GtkRulerMetric const sp_ruler_metrics[] = {
   // NOTE: the order of records in this struct must correspond to the SPMetric enum.
-  {"NONE",  "", 1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {"millimeters",  "mm", PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {"centimeters", "cm", PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {"inches",      "in", PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }},
-  {"feet",        "ft", PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {"points",      "pt", PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {"picas",       "pc", PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {"pixels",      "px", PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
-  {"meters",      "m",  PX_PER_M,  { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  {(gchar*) "NONE",  (gchar*) "", 1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  {(gchar*) "millimeters", (gchar*) "mm", PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  {(gchar*) "centimeters", (gchar*) "cm", PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  {(gchar*) "inches",      (gchar*) "in", PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }},
+  {(gchar*) "feet",        (gchar*) "ft", PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  {(gchar*) "points",      (gchar*) "pt", PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  {(gchar*) "picas",       (gchar*) "pc", PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  {(gchar*) "pixels",      (gchar*) "px", PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
+  {(gchar*) "meters",      (gchar*) "m",  PX_PER_M,  { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }},
 };
 
 void
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 0f792edff..14a7fb5b2 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -62,7 +62,7 @@ sp_color_slider_get_type (void)
 	static GtkType type = 0;
 	if (!type) {
 		GtkTypeInfo info = {
-			"SPColorSlider",
+			(gchar*) "SPColorSlider",
 			sizeof (SPColorSlider),
 			sizeof (SPColorSliderClass),
 			(GtkClassInitFunc) sp_color_slider_class_init,
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 40f1514cd..afa707904 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -49,7 +49,7 @@ sp_widget_get_type (void)
 	static GtkType type = 0;
 	if (!type) {
 		static const GtkTypeInfo info = {
-			"SPWidget",
+			(gchar*) "SPWidget",
 			sizeof (SPWidget),
 			sizeof (SPWidgetClass),
 			(GtkClassInitFunc) sp_widget_class_init,
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index 293f7aa13..d9d208857 100644
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -132,7 +132,7 @@ sp_xmlview_tree_get_type (void)
 
 	if (!type) {
 		static const GtkTypeInfo info = {
-			"SPXMLViewTree",
+			(gchar*) "SPXMLViewTree",
 			sizeof (SPXMLViewTree),
 			sizeof (SPXMLViewTreeClass),
 			(GtkClassInitFunc) sp_xmlview_tree_class_init,