From 57d4715f4806f2a8caac4bca519d878381a3356c Mon Sep 17 00:00:00 2001 From: JucaBlues Date: Mon, 9 Feb 2009 02:44:19 +0000 Subject: [PATCH] =?utf8?q?gcc=20warning=20cleanup=20warning:=20deprecated?= =?utf8?q?=20conversion=20from=20string=20constant=20to=20=E2=80=98char*?= =?utf8?q?=E2=80=99/'gchar*'?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/dialogs/swatches.cpp | 14 +++++++------- src/extension/internal/filter/filter.cpp | 4 ++-- src/ui/view/view-widget.cpp | 2 +- src/ui/widget/selected-style.cpp | 2 +- src/widgets/gradient-image.cpp | 2 +- src/widgets/icon.cpp | 2 +- src/widgets/ruler.cpp | 22 +++++++++++----------- src/widgets/sp-color-slider.cpp | 2 +- src/widgets/sp-widget.cpp | 2 +- src/widgets/sp-xmlview-tree.cpp | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index 0d9daaf60..4b2976a62 100644 --- 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 048207332..3dd6d31bd 100644 --- 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 36c97af2f..d1f9d677c 100644 --- 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 3da613416..90ef79b92 100644 --- 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 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, -- 2.30.2