From bfe2c5c8caaa8ae20f7b95e364825b397cdaa9d3 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 7 Jan 2014 00:40:20 +0000 Subject: [PATCH] gui: Rename public gui theme functions. Prefix all functions related to themes with "theme_". --- gui.c | 6 +++--- gui.h | 6 +++--- gui_theme.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gui.c b/gui.c index 96132589..c301f9ce 100644 --- 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 e6e4167f..13f50806 100644 --- 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 diff --git a/gui_theme.c b/gui_theme.c index 5d3fac1c..3963d352 100644 --- a/gui_theme.c +++ b/gui_theme.c @@ -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); } -- 2.39.5