gcc warning cleanup

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

diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index 0d9daaf604f36f21bba2126cf948dd17c0e5c110..4b2976a620e4ba020fd260f3dabf20eba33bc643 100644 (file)
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -102,11 +102,11 @@ typedef enum {
 
 static const GtkTargetEntry sourceColorEntries[] = {
 #if ENABLE_MAGIC_COLORS
-//    {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID},
-    {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
+//    {(gchar*) "application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID},
+    {(gchar*) "application/x-inkscape-color", 0, APP_X_INKY_COLOR},
 #endif // ENABLE_MAGIC_COLORS
-    {"application/x-color", 0, APP_X_COLOR},
-    {"text/plain", 0, TEXT_DATA},
+    {(gchar*) "application/x-color", 0, APP_X_COLOR},
+    {(gchar*) "text/plain", 0, TEXT_DATA},
 };
 
 void ColorItem::_dragGetColorData( GtkWidget *widget,
@@ -349,10 +349,10 @@ static void dieDieDie( GtkObject *obj, gpointer user_data )
 
 static const GtkTargetEntry destColorTargets[] = {
 #if ENABLE_MAGIC_COLORS
-//    {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID},
-    {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
+//    {(gchar*) "application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID},
+    {(gchar*) "application/x-inkscape-color", 0, APP_X_INKY_COLOR},
 #endif // ENABLE_MAGIC_COLORS
-    {"application/x-color", 0, APP_X_COLOR},
+    {(gchar*) "application/x-color", 0, APP_X_COLOR},
 };
 
 #include "color.h" // for SP_RGBA32_U_COMPOSE

diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 048207332eb80789907023ac972bdd4113db8623..3dd6d31bd1f57c6462aabf4c82e0858704ed67fe 100644 (file)
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -111,8 +111,8 @@ Filter::merge_filters (Inkscape::XML::Node * to, Inkscape::XML::Node * from, Ink
        }
 }
 
-#define FILTER_SRC_GRAPHIC       "fbSourceGraphic"
-#define FILTER_SRC_GRAPHIC_ALPHA "fbSourceGraphicAlpha"
+#define FILTER_SRC_GRAPHIC       (gchar*) "fbSourceGraphic"
+#define FILTER_SRC_GRAPHIC_ALPHA (gchar*) "fbSourceGraphicAlpha"
 
 void
 Filter::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache)

diff --git a/src/ui/view/view-widget.cpp b/src/ui/view/view-widget.cpp
index 36c97af2f032643c2cd7b8a0b749aef3e6b1715f..d1f9d677c7abe7aa01407a1f822e479eeee82c6a 100644 (file)
--- a/src/ui/view/view-widget.cpp
+++ b/src/ui/view/view-widget.cpp
@@ -33,7 +33,7 @@ GtkType sp_view_widget_get_type(void)
     
     if (!type) {
         GtkTypeInfo info = {
-            "SPViewWidget",
+            (gchar*) "SPViewWidget",
             sizeof(SPViewWidget),
             sizeof(SPViewWidgetClass),
             (GtkClassInitFunc) sp_view_widget_class_init,

diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 3da613416a477c8143e9e67f9507cd2ce9bd8ced..90ef79b92f993a2ff12d8b47860c2a435e44d44a 100644 (file)
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -87,7 +87,7 @@ typedef enum {
 } ui_drop_target_info;
 
 static GtkTargetEntry ui_drop_target_entries [] = {
-    {"application/x-color", 0, APP_X_COLOR}
+    {(gchar*) "application/x-color", 0, APP_X_COLOR}
 };
 
 #define ENTRIES_SIZE(n) sizeof(n)/sizeof(n[0])

diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index e9277a55ba55ebcdbd06e38fe2c024b12935b5cb..d13e8fd1224e8754aa35c480ee920fb8fba812f5 100644 (file)
--- 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 5aad614b4e60aec2478e32cc2a7bac4aae15befb..dccd0916e48d50e027b3e88a9a579920b1871549 100644 (file)
--- 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 6ab7c8394024499582d97732a323df1954f9a06b..d4ff91f3cc60e852b90f4df7e00c49292a0c9d56 100644 (file)
--- 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 0f792edff3bd43f1a13579e59811ea725a15c07c..14a7fb5b2a8665789a71a5127abfb2a8baeb8712 100644 (file)
--- 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 40f1514cd9a32c221fd4ee1cd852d54a9c4e1c61..afa707904b423f56528e4c6a70a174ae37a9b3d6 100644 (file)
--- 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 293f7aa1355b2a0a9b984af289ec4aed2554e116..d9d208857868b329ecd53dfb36ac60426b624615 100644 (file)
--- 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,