Fix c++ compiler warnings

const gchar * casts

diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc
index 4c77bb7..90a80d3 100644 (file)
--- a/src/advanced-exif.cc
+++ b/src/advanced-exif.cc
@@ -178,7 +178,7 @@ void advanced_exif_set_fd(GtkWidget *window, FileData *fd)
 }
 
 static GtkTargetEntry advanced_exif_drag_types[] = {
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_exif_drag_types = 1;
 

diff --git a/src/bar-exif.cc b/src/bar-exif.cc
index 7483686..b48dfe7 100644 (file)
--- a/src/bar-exif.cc
+++ b/src/bar-exif.cc
@@ -341,14 +341,14 @@ static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data
  */
 
 static GtkTargetEntry bar_pane_exif_drag_types[] = {
-       { TARGET_APP_EXIF_ENTRY_STRING, GTK_TARGET_SAME_APP, TARGET_APP_EXIF_ENTRY },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>(TARGET_APP_EXIF_ENTRY_STRING), GTK_TARGET_SAME_APP, TARGET_APP_EXIF_ENTRY },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_exif_entry_drag_types = 2;
 
 static GtkTargetEntry bar_pane_exif_drop_types[] = {
        { TARGET_APP_EXIF_ENTRY_STRING, GTK_TARGET_SAME_APP, TARGET_APP_EXIF_ENTRY },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_exif_entry_drop_types = 2;
 

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index c93fbd0..5eeae23 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -94,8 +94,8 @@ enum {
 };
 
 static GtkTargetEntry bar_pane_gps_drop_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_gps_entry_drop_types = 2;
 

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index 709032d..41ffea4 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -526,14 +526,14 @@ static void bar_pane_keywords_changed(GtkTextBuffer *UNUSED(buffer), gpointer da
 
 static GtkTargetEntry bar_pane_keywords_drag_types[] = {
        { TARGET_APP_KEYWORD_PATH_STRING, GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_keywords_drag_types = 2;
 
 
 static GtkTargetEntry bar_pane_keywords_drop_types[] = {
        { TARGET_APP_KEYWORD_PATH_STRING, GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_keywords_drop_types = 2;
 

diff --git a/src/collect-table.cc b/src/collect-table.cc
index 6a28730..f374d91 100644 (file)
--- a/src/collect-table.cc
+++ b/src/collect-table.cc
@@ -2249,14 +2249,14 @@ static GtkWidget *collection_table_drop_menu(CollectTable *ct)
 
 static GtkTargetEntry collection_drag_types[] = {
        { TARGET_APP_COLLECTION_MEMBER_STRING, 0, TARGET_APP_COLLECTION_MEMBER },
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_collection_drag_types = 3;
 
 static GtkTargetEntry collection_drop_types[] = {
        { TARGET_APP_COLLECTION_MEMBER_STRING, 0, TARGET_APP_COLLECTION_MEMBER },
-       { "text/uri-list", 0, TARGET_URI_LIST }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST }
 };
 static gint n_collection_drop_types = 2;
 

diff --git a/src/dnd.cc b/src/dnd.cc
index 22536b0..861fe86 100644 (file)
--- a/src/dnd.cc
+++ b/src/dnd.cc
@@ -26,15 +26,15 @@
 
 
 GtkTargetEntry dnd_file_drag_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 gint dnd_file_drag_types_count = 2;
 
 GtkTargetEntry dnd_file_drop_types[] = {
        { TARGET_APP_COLLECTION_MEMBER_STRING, 0, TARGET_APP_COLLECTION_MEMBER },
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain", 0, TARGET_TEXT_PLAIN },
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN },
 };
 gint dnd_file_drop_types_count = 3;
 

diff --git a/src/dupe.cc b/src/dupe.cc
index 4e55413..d3bd9b1 100644 (file)
--- a/src/dupe.cc
+++ b/src/dupe.cc
@@ -4946,14 +4946,14 @@ static GtkWidget *dupe_confirm_dir_list(DupeWindow *dw, GList *list)
  */
 
 static GtkTargetEntry dupe_drag_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_dupe_drag_types = 2;
 
 static GtkTargetEntry dupe_drop_types[] = {
        { TARGET_APP_COLLECTION_MEMBER_STRING, 0, TARGET_APP_COLLECTION_MEMBER },
-       { "text/uri-list", 0, TARGET_URI_LIST }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST }
 };
 static gint n_dupe_drop_types = 2;
 
@@ -5349,8 +5349,8 @@ static void pop_menu_export(GList *UNUSED(selection_list), gpointer dupe_window,
 {
        const gint index = GPOINTER_TO_INT(data);
        DupeWindow *dw = static_cast<DupeWindow *>(dupe_window);
-       gchar *title = "Export duplicates data";
-       gchar *default_path = "/tmp/";
+       const gchar *title = "Export duplicates data";
+       const gchar *default_path = "/tmp/";
        gchar *file_extension;
        const gchar *stock_id;
        ExportDupesData *edd;

diff --git a/src/image-load-collection.cc b/src/image-load-collection.cc
index 81f99bd..7c0935e 100644 (file)
--- a/src/image-load-collection.cc
+++ b/src/image-load-collection.cc
@@ -143,7 +143,7 @@ static gchar* image_loader_collection_get_format_name(gpointer UNUSED(loader))
 }
 static gchar** image_loader_collection_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/png", NULL};
+       static const gchar *mime[] = {"image/png", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-cr3.cc b/src/image-load-cr3.cc
index 8788c55..b5d18c5 100644 (file)
--- a/src/image-load-cr3.cc
+++ b/src/image-load-cr3.cc
@@ -484,7 +484,7 @@ static gchar* image_loader_cr3_get_format_name(gpointer UNUSED(loader))
 }
 static gchar** image_loader_cr3_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/x-canon-cr3", NULL};
+       static const gchar *mime[] = {"image/x-canon-cr3", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-dds.cc b/src/image-load-dds.cc
index 361e1b6..0192516 100644 (file)
--- a/src/image-load-dds.cc
+++ b/src/image-load-dds.cc
@@ -587,7 +587,7 @@ static gchar* image_loader_dds_get_format_name(gpointer UNUSED(loader))
 }
 static gchar** image_loader_dds_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/vnd-ms.dds", NULL};
+       static const gchar *mime[] = {"image/vnd-ms.dds", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-djvu.cc b/src/image-load-djvu.cc
index 6fdb20b..9f63cfe 100644 (file)
--- a/src/image-load-djvu.cc
+++ b/src/image-load-djvu.cc
@@ -143,7 +143,7 @@ static gchar* image_loader_djvu_get_format_name(gpointer UNUSED(loader))
 
 static gchar** image_loader_djvu_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/vnd.djvu", NULL};
+       static const gchar *mime[] = {"image/vnd.djvu", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-external.cc b/src/image-load-external.cc
index 40a234e..46cd31b 100644 (file)
--- a/src/image-load-external.cc
+++ b/src/image-load-external.cc
@@ -97,7 +97,7 @@ static gchar* image_loader_external_get_format_name(gpointer UNUSED(loader))
 
 static gchar** image_loader_external_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"application/octet-stream", NULL};
+       static const gchar *mime[] = {"application/octet-stream", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-ffmpegthumbnailer.cc b/src/image-load-ffmpegthumbnailer.cc
index 58fe950..bc78e85 100644 (file)
--- a/src/image-load-ffmpegthumbnailer.cc
+++ b/src/image-load-ffmpegthumbnailer.cc
@@ -66,7 +66,7 @@ static gchar* image_loader_ft_get_format_name(gpointer UNUSED(loader))
 
 static gchar** image_loader_ft_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"video/mp4", NULL};
+       static const gchar *mime[] = {"video/mp4", NULL};
        return g_strdupv(mime);}
 
 static gpointer image_loader_ft_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)

diff --git a/src/image-load-heif.cc b/src/image-load-heif.cc
index c877e5a..a0b4938 100644 (file)
--- a/src/image-load-heif.cc
+++ b/src/image-load-heif.cc
@@ -142,7 +142,7 @@ static gchar* image_loader_heif_get_format_name(gpointer UNUSED(loader))
 
 static gchar** image_loader_heif_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/heic", NULL};
+       static const gchar *mime[] = {"image/heic", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-j2k.cc b/src/image-load-j2k.cc
index 2da2ef2..7b022f1 100644 (file)
--- a/src/image-load-j2k.cc
+++ b/src/image-load-j2k.cc
@@ -310,7 +310,7 @@ static gchar* image_loader_j2k_get_format_name(gpointer UNUSED(loader))
 
 static gchar** image_loader_j2k_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/jp2", NULL};
+       static const gchar *mime[] = {"image/jp2", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-jpeg.cc b/src/image-load-jpeg.cc
index abfe6b1..86e7938 100644 (file)
--- a/src/image-load-jpeg.cc
+++ b/src/image-load-jpeg.cc
@@ -446,7 +446,7 @@ static gchar* image_loader_jpeg_get_format_name(gpointer UNUSED(loader))
 }
 static gchar** image_loader_jpeg_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/jpeg", NULL};
+       static const gchar *mime[] = {"image/jpeg", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-jpegxl.cc b/src/image-load-jpegxl.cc
index 1f3edfc..969fa0c 100644 (file)
--- a/src/image-load-jpegxl.cc
+++ b/src/image-load-jpegxl.cc
@@ -211,7 +211,7 @@ static gchar* image_loader_jpegxl_get_format_name(gpointer loader)
 
 static gchar** image_loader_jpegxl_get_format_mime_types(gpointer loader)
 {
-       static gchar *mime[] = {"image/jxl", NULL};
+       static const gchar *mime[] = {"image/jxl", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-pdf.cc b/src/image-load-pdf.cc
index 63dded9..4ad52bb 100644 (file)
--- a/src/image-load-pdf.cc
+++ b/src/image-load-pdf.cc
@@ -123,7 +123,7 @@ static gchar* image_loader_pdf_get_format_name(gpointer UNUSED(loader))
 
 static gchar** image_loader_pdf_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"application/pdf", NULL};
+       static const gchar *mime[] = {"application/pdf", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-psd.cc b/src/image-load-psd.cc
index 2af9e60..611cd33 100644 (file)
--- a/src/image-load-psd.cc
+++ b/src/image-load-psd.cc
@@ -557,7 +557,7 @@ static gchar* image_loader_psd_get_format_name(gpointer UNUSED(loader))
 
 static gchar** image_loader_psd_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"application/psd", NULL};
+       static const gchar *mime[] = {"application/psd", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-svgz.cc b/src/image-load-svgz.cc
index 0f02422..0ade737 100644 (file)
--- a/src/image-load-svgz.cc
+++ b/src/image-load-svgz.cc
@@ -30,7 +30,7 @@ static gchar* image_loader_svgz_get_format_name(gpointer UNUSED(loader))
 }
 static gchar** image_loader_svgz_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/svg", NULL};
+       static const gchar *mime[] = {"image/svg", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-tiff.cc b/src/image-load-tiff.cc
index 6f9844f..9bc95f0 100644 (file)
--- a/src/image-load-tiff.cc
+++ b/src/image-load-tiff.cc
@@ -359,7 +359,7 @@ static gchar* image_loader_tiff_get_format_name(gpointer UNUSED(loader))
 }
 static gchar** image_loader_tiff_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"image/tiff", NULL};
+       static const gchar *mime[] = {"image/tiff", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/image-load-zxscr.cc b/src/image-load-zxscr.cc
index f3a4a8c..0bb3e9f 100644 (file)
--- a/src/image-load-zxscr.cc
+++ b/src/image-load-zxscr.cc
@@ -174,7 +174,7 @@ static gchar *image_loader_zxscr_get_format_name(gpointer UNUSED(loader))
 
 static gchar **image_loader_zxscr_get_format_mime_types(gpointer UNUSED(loader))
 {
-       static gchar *mime[] = {"application/octet-stream", NULL};
+       static const gchar *mime[] = {"application/octet-stream", NULL};
        return g_strdupv(mime);
 }
 

diff --git a/src/osd.cc b/src/osd.cc
index c7f3e49..08f6079 100644 (file)
--- a/src/osd.cc
+++ b/src/osd.cc
@@ -81,7 +81,7 @@ static const gchar *predefined_tags[][2] = {
        {NULL, NULL}};
 
 static GtkTargetEntry osd_drag_types[] = {
-       { "text/plain", GTK_TARGET_SAME_APP, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/plain"), GTK_TARGET_SAME_APP, TARGET_TEXT_PLAIN }
 };
 
 typedef struct _TagData TagData;

diff --git a/src/preferences.cc b/src/preferences.cc
index 5dfb5cc..bc801aa 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -120,7 +120,7 @@ enum {
        FILETYPES_COLUMN_COUNT
 };
 
-gchar *format_class_list[] = {
+const gchar *format_class_list[] = {
        N_("Unknown"),
        N_("Image"),
        N_("RAW Image"),
@@ -772,9 +772,9 @@ static void add_zoom_style_selection_menu(GtkWidget *table, gint column, gint ro
 typedef struct _UseableMouseItems UseableMouseItems;
 struct _UseableMouseItems
 {
-       gchar *name; /* GtkActionEntry terminology */
-       gchar *label;
-       gchar *stock_id;
+       const gchar *name; /* GtkActionEntry terminology */
+       const gchar *label;
+       const gchar *stock_id;
 };
 
 static const UseableMouseItems useable_mouse_items[] = {

diff --git a/src/rcfile.h b/src/rcfile.h
index 05d3df1..729f366 100644 (file)
--- a/src/rcfile.h
+++ b/src/rcfile.h
@@ -37,7 +37,7 @@ void write_uint_option(GString *str, gint indent, const gchar *label, guint n);
 gboolean read_uint_option(const gchar *option, const gchar *label, const gchar *value, guint *n);
 gboolean read_uint_option_clamp(const gchar *option, const gchar *label, const gchar *value, guint *n, guint min, guint max);
 gboolean read_int_option_clamp(const gchar *option, const gchar *label, const gchar *value, gint *n, gint min, gint max);
-void write_int_unit_option(GString *str, gint indent, gchar *label, gint n, gint subunits);
+void write_int_unit_option(GString *str, gint indent, const gchar *label, gint n, gint subunits);
 gboolean read_int_unit_option(const gchar *option, const gchar *label, const gchar *value, gint *n, gint subunits);
 void write_bool_option(GString *str, gint indent, const gchar *label, gint n);
 gboolean read_bool_option(const gchar *option, const gchar *label, const gchar *value, gint *n);

diff --git a/src/search.cc b/src/search.cc
index d8e1691..2bc56a0 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -1491,14 +1491,14 @@ static gboolean search_window_keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey
  */
 
 static GtkTargetEntry result_drag_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_result_drag_types = 2;
 
 static GtkTargetEntry result_drop_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_result_drop_types = 2;
 

diff --git a/src/toolbar.cc b/src/toolbar.cc
index a3c2962..cf93059 100644 (file)
--- a/src/toolbar.cc
+++ b/src/toolbar.cc
@@ -50,8 +50,8 @@ struct _ToolbarButtonData
        GtkWidget *button_label;
        GtkWidget *image;
 
-       gchar *name; /* GtkActionEntry terminology */
-       gchar *stock_id;
+       const gchar *name; /* GtkActionEntry terminology */
+       const gchar *stock_id;
 };
 
 static ToolbarData *toolbarlist[2];
@@ -59,9 +59,9 @@ static ToolbarData *toolbarlist[2];
 typedef struct _UseableToolbarItems UseableToolbarItems;
 struct _UseableToolbarItems
 {
-       gchar *name; /* GtkActionEntry terminology */
-       gchar *label;
-       gchar *stock_id;
+       const gchar *name; /* GtkActionEntry terminology */
+       const gchar *label;
+       const gchar *stock_id;
 };
 
 /** @FIXME Should be created by program from menu_entries[]

diff --git a/src/typedefs.h b/src/typedefs.h
index 7793018..2c7e6b3 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -169,7 +169,7 @@ typedef enum {
        FILE_FORMAT_CLASSES
 } FileFormatClass;
 
-extern gchar *format_class_list[]; /**< defined in preferences.cc */
+extern const gchar *format_class_list[]; /**< defined in preferences.cc */
 
 /**
  * @typedef SecureSaveErrno

diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc
index 61267a0..f8ef298 100644 (file)
--- a/src/ui-bookmark.cc
+++ b/src/ui-bookmark.cc
@@ -93,15 +93,15 @@ enum {
 };
 
 static GtkTargetEntry bookmark_drop_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
        { "x-url/http",    0, TARGET_X_URL },
        { "_NETSCAPE_URL", 0, TARGET_X_URL }
 };
 #define bookmark_drop_types_n 3
 
 static GtkTargetEntry bookmark_drag_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain",    0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"),    0, TARGET_TEXT_PLAIN }
 };
 #define bookmark_drag_types_n 2
 

diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc
index 35ce43f..ba8dbd7 100644 (file)
--- a/src/ui-pathsel.cc
+++ b/src/ui-pathsel.cc
@@ -317,8 +317,8 @@ enum {
 };
 
 static GtkTargetEntry dest_drag_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain",    0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"),    0, TARGET_TEXT_PLAIN }
 };
 #define dest_drag_types_n 2
 

diff --git a/src/utilops.cc b/src/utilops.cc
index 57e9181..ab31bb6 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -41,8 +41,8 @@ static GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget
 
 static GtkTargetEntry target_types[] =
 {
-       {(gchar *)"text/plain", 0, CLIPBOARD_TEXT_PLAIN},
-       {(gchar *)"text/uri-list", 0, CLIPBOARD_TEXT_URI_LIST},
+       {(gchar *)const_cast<gchar *>("text/plain"), 0, CLIPBOARD_TEXT_PLAIN},
+       {(gchar *)const_cast<gchar *>("text/uri-list"), 0, CLIPBOARD_TEXT_URI_LIST},
        {(gchar *)"x-special/gnome-copied-files", 0, CLIPBOARD_X_SPECIAL_GNOME_COPIED_FILES},
        {(gchar *)"UTF8_STRING", 0, CLIPBOARD_UTF8_STRING}
 };
@@ -278,11 +278,11 @@ enum {
 
 typedef struct _UtilityDataMessages UtilityDataMessages;
 struct _UtilityDataMessages {
-       gchar *title;
-       gchar *question;
-       gchar *desc_flist;
-       gchar *desc_source_fd;
-       gchar *fail;
+       const gchar *title;
+       const gchar *question;
+       const gchar *desc_flist;
+       const gchar *desc_source_fd;
+       const gchar *fail;
 };
 
 typedef struct _UtilityData UtilityData;

diff --git a/src/view-dir.cc b/src/view-dir.cc
index 5f169a7..6f5f82a 100644 (file)
--- a/src/view-dir.cc
+++ b/src/view-dir.cc
@@ -782,7 +782,7 @@ void vd_new_folder(ViewDir *vd, FileData *dir_fd)
  */
 
 static GtkTargetEntry vd_dnd_drop_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST }
 };
 static gint vd_dnd_drop_types_count = 1;