list_window: removed the list_window_t typedef

Use the plain struct name "list_window".

diff --git a/src/list_window.c b/src/list_window.c
index 6f6c34cbd625b8571deeabe236263348be165bcd..92eaba5d0c6f05f72f63fb8a2e7fd12529cada2b 100644 (file)
--- a/src/list_window.c
+++ b/src/list_window.c
@@ -39,7 +39,7 @@ list_window_init(WINDOW *w, unsigned width, unsigned height)
 {
        struct list_window *lw;
 
-       lw = g_malloc0(sizeof(list_window_t));
+       lw = g_malloc0(sizeof(*lw));
        lw->w = w;
        lw->cols = width;
        lw->rows = height;

diff --git a/src/list_window.h b/src/list_window.h
index e99c45f475f8d24aade1be73544c7ca6860cd66b..68abd4d0d75a18cb7513d86b60b8abf2342aa1bd 100644 (file)
--- a/src/list_window.h
+++ b/src/list_window.h
@@ -37,7 +37,7 @@ typedef const char *(*list_window_callback_fn_t)(unsigned index,
                                                 char **second_column,
                                                 void *data);
 
-typedef struct list_window {
+struct list_window {
        WINDOW *w;
        unsigned rows, cols;
 
@@ -49,8 +49,7 @@ typedef struct list_window {
        bool range_selection;       /* range selection activated */
 
        bool hide_cursor;
-} list_window_t;
-
+};
 
 /* create a new list window */
 struct list_window *list_window_init(WINDOW *w,

diff --git a/src/screen_find.c b/src/screen_find.c
index f7799614fdaeabaefafc474eb906008be48fe5b2..0e93b4ff2f96d4b3aeddbc66b092c9f63ad8e9a1 100644 (file)
--- a/src/screen_find.c
+++ b/src/screen_find.c
@@ -31,7 +31,7 @@
 
 /* query user for a string and find it in a list window */
 int
-screen_find(list_window_t *lw,
+screen_find(struct list_window *lw,
            int rows,
            command_t findcmd,
            list_window_callback_fn_t callback_fn,

diff --git a/src/screen_help.c b/src/screen_help.c
index 6f4850b60f0978c78e71a3eecdbea2cbb054c475..0ce3bd8dc375c1c01492ee59caab89a152392575 100644 (file)
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -179,7 +179,7 @@ static help_text_row_t help_text[] = {
 
 #define help_text_rows (sizeof(help_text) / sizeof(help_text[0]))
 
-static list_window_t *lw;
+static struct list_window *lw;
 
 static const char *
 list_callback(unsigned idx, bool *highlight, G_GNUC_UNUSED char** second_column, G_GNUC_UNUSED void *data)

diff --git a/src/screen_keydef.c b/src/screen_keydef.c
index 28822e58f5e56ed3d1f1f385935ab27c733ac19a..bc3115c65b827604db76527ac1da9c32dc37b0fd 100644 (file)
--- a/src/screen_keydef.c
+++ b/src/screen_keydef.c
@@ -42,7 +42,7 @@
 #define LIST_ITEM_APPLY_LABEL _("===> Apply key bindings ")
 
 
-static list_window_t *lw = NULL;
+static struct list_window *lw;
 static unsigned command_list_length = 0;
 static command_definition_t *cmds = NULL;
 

diff --git a/src/screen_outputs.c b/src/screen_outputs.c
index c1660b3d8d909b18727207d5096b6aa614462932..4857e489297f71f8c52e9b65427fee3f4ee30f9a 100644 (file)
--- a/src/screen_outputs.c
+++ b/src/screen_outputs.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include <assert.h>
 
-static list_window_t *lw = NULL;
+static struct list_window *lw;
 
 static GPtrArray *mpd_outputs = NULL;
 

diff --git a/src/screen_play.c b/src/screen_play.c
index 632944fdd39efab06c5db9ce27a195d02b645906..cfe1c0fcd8472e17a9bf46a3bf28b7ebaf352b15 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -63,7 +63,7 @@ static guint scroll_source_id;
 static struct mpdclient_playlist *playlist;
 static int current_song_id = -1;
 static int selected_song_id = -1;
-static list_window_t *lw = NULL;
+static struct list_window *lw;
 static guint timer_hide_cursor_id;
 
 static void

diff --git a/src/screen_song.c b/src/screen_song.c
index 9d42eb47e1d9cb6e02734b3f76d1ce724e9769ff..01e2e340ae72ded67d768ba0633e869b71376958 100644 (file)
--- a/src/screen_song.c
+++ b/src/screen_song.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <string.h>
 
-static list_window_t *lw;
+static struct list_window *lw;
 
 static struct mpd_song *next_song;