gui: Rename public gui theme functions.
authorAndre Noll <maan@systemlinux.org>
Tue, 7 Jan 2014 00:40:20 +0000 (00:40 +0000)
committerAndre Noll <maan@systemlinux.org>
Sun, 4 May 2014 13:48:54 +0000 (15:48 +0200)
Prefix all functions related to themes with "theme_".

gui.c
gui.h
gui_theme.c

diff --git a/gui.c b/gui.c
index 9613258..c301f9c 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -1414,9 +1414,9 @@ static void com_refresh(void)
 static void change_theme(int next)
 {
        if (next)
-               next_theme(&theme);
+               theme_next(&theme);
        else
-               prev_theme(&theme);
+               theme_prev(&theme);
        /* This seems to be needed twice, why? */
        com_refresh();
        com_refresh();
@@ -1519,7 +1519,7 @@ int main(int argc, char *argv[])
                fprintf(stderr, "invalid key map\n");
                exit(EXIT_FAILURE);
        }
-       init_theme_or_die(conf.theme_arg, &theme);
+       theme_init(conf.theme_arg, &theme);
        setup_signal_handling();
        bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
        setlocale(LC_CTYPE, "");
diff --git a/gui.h b/gui.h
index e6e4167..13f5080 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -29,9 +29,9 @@ struct gui_theme {
        struct stat_item_data data[NUM_STAT_ITEMS];
 };
 
-void init_theme_or_die(const char *name, struct gui_theme *t);
-void next_theme(struct gui_theme *);
-void prev_theme(struct gui_theme *);
+void theme_init(const char *name, struct gui_theme *t);
+void theme_prev(struct gui_theme *t);
+void theme_next(struct gui_theme *t);
 #define LEFT 1
 #define RIGHT 2
 #define CENTER 3
index 5d3fac1..3963d35 100644 (file)
@@ -383,7 +383,7 @@ static void set_theme(int num, struct gui_theme *t)
        current_theme_num = num;
 }
 
-void init_theme_or_die(const char *name, struct gui_theme *t)
+void theme_init(const char *name, struct gui_theme *t)
 {
        int i;
 
@@ -398,12 +398,12 @@ void init_theme_or_die(const char *name, struct gui_theme *t)
        exit(EXIT_FAILURE);
 }
 
-void prev_theme(struct gui_theme *t)
+void theme_prev(struct gui_theme *t)
 {
        return set_theme(++current_theme_num, t);
 }
 
-void next_theme(struct gui_theme *t)
+void theme_next(struct gui_theme *t)
 {
        return set_theme(--current_theme_num, t);
 }