Rename some color constants and functions for attributes

4 files changed, 30 insertions, 28 deletions

diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c
index c4c7ab446..98b4b4f66 100644
--- a/src/gui/curses/gui-curses-bar-window.c
+++ b/src/gui/curses/gui-curses-bar-window.c
@@ -250,15 +250,15 @@ gui_bar_window_print_string (struct t_gui_bar_window *bar_window,
                         break;
                 }
                 break;
-            case GUI_COLOR_SET_WEECHAT_CHAR:
+            case GUI_COLOR_SET_ATTR_CHAR:
                 string++;
-                gui_window_string_apply_color_set ((unsigned char **)&string,
-                                                   GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar);
+                gui_window_string_apply_color_set_attr ((unsigned char **)&string,
+                                                        GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar);
                 break;
-            case GUI_COLOR_REMOVE_WEECHAT_CHAR:
+            case GUI_COLOR_REMOVE_ATTR_CHAR:
                 string++;
-                gui_window_string_apply_color_remove ((unsigned char **)&string,
-                                                      GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar);
+                gui_window_string_apply_color_remove_attr ((unsigned char **)&string,
+                                                           GUI_BAR_WINDOW_OBJECTS(bar_window)->win_bar);
                 break;
             case GUI_COLOR_RESET_CHAR:
                 string++;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index f5632e6e7..a8a21474d 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -219,15 +219,15 @@ gui_chat_string_next_char (struct t_gui_window *window,
                         break;
                 }
                 break;
-            case GUI_COLOR_SET_WEECHAT_CHAR:
+            case GUI_COLOR_SET_ATTR_CHAR:
                 string++;
-                gui_window_string_apply_color_set ((unsigned char **)&string,
-                                                   (apply_style) ? GUI_WINDOW_OBJECTS(window)->win_chat : NULL);
+                gui_window_string_apply_color_set_attr ((unsigned char **)&string,
+                                                        (apply_style) ? GUI_WINDOW_OBJECTS(window)->win_chat : NULL);
                 break;
-            case GUI_COLOR_REMOVE_WEECHAT_CHAR:
+            case GUI_COLOR_REMOVE_ATTR_CHAR:
                 string++;
-                gui_window_string_apply_color_remove ((unsigned char **)&string,
-                                                      (apply_style) ? GUI_WINDOW_OBJECTS(window)->win_chat : NULL);
+                gui_window_string_apply_color_remove_attr ((unsigned char **)&string,
+                                                           (apply_style) ? GUI_WINDOW_OBJECTS(window)->win_chat : NULL);
                 break;
             case GUI_COLOR_RESET_CHAR:
                 string++;
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index e22db0bfd..7d601cfa8 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -741,15 +741,16 @@ gui_window_string_apply_color_weechat (unsigned char **str, WINDOW *window)
 }
 
 /*
- * gui_window_string_apply_color_set: apply "set attribute" color code in
- *                                    string and move string pointer after
- *                                    color in string
- *                                    If window is NULL, no color is applied
- *                                    but string pointer is moved anyway
+ * gui_window_string_apply_color_set_attr: apply "set attribute" color code in
+ *                                         string and move string pointer after
+ *                                         color in string
+ *                                         If window is NULL, no color is
+ *                                         applied but string pointer is moved
+ *                                         anyway
  */
 
 void
-gui_window_string_apply_color_set (unsigned char **str, WINDOW *window)
+gui_window_string_apply_color_set_attr (unsigned char **str, WINDOW *window)
 {
     unsigned char *ptr_string;
     
@@ -782,15 +783,16 @@ gui_window_string_apply_color_set (unsigned char **str, WINDOW *window)
 }
 
 /*
- * gui_window_string_apply_color_remove: apply "remove attribute" color code in
- *                                       string and move string pointer after
- *                                       color in string
- *                                       If window is NULL, no color is applied
- *                                       but string pointer is moved anyway
+ * gui_window_string_apply_color_remove_attr: apply "remove attribute" color
+ *                                            code in string and move string
+ *                                            pointer after color in string
+ *                                            If window is NULL, no color is
+ *                                            applied but string pointer is
+ *                                            moved anyway
  */
 
 void
-gui_window_string_apply_color_remove (unsigned char **str, WINDOW *window)
+gui_window_string_apply_color_remove_attr (unsigned char **str, WINDOW *window)
 {
     unsigned char *ptr_string;
     
diff --git a/src/gui/curses/gui-curses.h b/src/gui/curses/gui-curses.h
index f3fad901d..0d7e2bf67 100644
--- a/src/gui/curses/gui-curses.h
+++ b/src/gui/curses/gui-curses.h
@@ -101,10 +101,10 @@ extern void gui_window_string_apply_color_pair (unsigned char **str,
                                                 WINDOW *window);
 extern void gui_window_string_apply_color_weechat (unsigned char **str,
                                                    WINDOW *window);
-extern void gui_window_string_apply_color_set (unsigned char **str,
-                                               WINDOW *window);
-extern void gui_window_string_apply_color_remove (unsigned char **str,
-                                                  WINDOW *window);
+extern void gui_window_string_apply_color_set_attr (unsigned char **str,
+                                                    WINDOW *window);
+extern void gui_window_string_apply_color_remove_attr (unsigned char **str,
+                                                       WINDOW *window);
 extern void gui_window_apply_color (unsigned char **str, WINDOW *window,
                                     int apply_bar_colors);
 extern void gui_window_set_title (const char *title);