* cocoa.m, ui_screen.c, ui_window.h: Add const.

arakiken · Jan 1, 2025 · 69f1391 · 69f1391
1 parent 540fba4
commit 69f1391
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,7 @@
 2025-01-02  Araki Ken  <arakiken@users.sf.net>
 
+	* cocoa.m, ui_screen.c, ui_window.h: Add const.
+
 	* quartz/ui_scrollbar.c, ui_layout.c: Add const.
 
 	* ui_color.h, */ui_color.c, cocoa.m, ui_bel_mode.[ch],

diff --git a/uitoolkit/quartz/cocoa.m b/uitoolkit/quartz/cocoa.m
@@ -1005,7 +1005,8 @@ - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
 
       ev.type = UI_SELECTION_NOTIFIED;
       for (count = 0; count < [files count]; count++) {
-        ev.data = [[files objectAtIndex:count] UTF8String];
+        /* avoid warning "discard qualifiers" */
+        ev.data = (char*)[[files objectAtIndex:count] UTF8String];
         ev.len = strlen(ev.data);
         ui_window_receive_event(uiwindow, (XEvent *)&ev);
       }

diff --git a/uitoolkit/ui_screen.c b/uitoolkit/ui_screen.c
@@ -1254,7 +1254,7 @@ static void dummy_draw_preedit_str(void *p, vt_char_t *chars, u_int num_chars,
   /* Don't set ui_screen_t::is_preediting = 0. */
 }
 
-static void preedit(ui_window_t *win, char *preedit_text, const char *cur_preedit_text) {
+static void preedit(ui_window_t *win, const char *preedit_text, const char *cur_preedit_text) {
   ef_parser_t *utf8_parser;
   vt_term_t *term = ((ui_screen_t *)win)->term;
 

diff --git a/uitoolkit/ui_window.h b/uitoolkit/ui_window.h
@@ -227,7 +227,7 @@ typedef struct ui_window {
   void (*set_xdnd_config)(struct ui_window *, const char *, const char *, const char *);
   void (*idling)(struct ui_window *);
 #ifdef UIWINDOW_SUPPORTS_PREEDITING
-  void (*preedit)(struct ui_window *, char *, const char *);
+  void (*preedit)(struct ui_window *, const char *, const char *);
 #endif
 
 } ui_window_t;