diff --git a/build-utils/widgetgen.sh b/build-utils/widgetgen.sh index 3ec9234a..7d51e5b4 100755 --- a/build-utils/widgetgen.sh +++ b/build-utils/widgetgen.sh @@ -7,7 +7,7 @@ echo "{" for file in ${top_srcdir}/widget.h do echo " /* $file */" - grep '^WidgetConstructor ' "$file" | cut -d' ' -f2 | cut -d\; -f1 | while read widget + grep '^widget_constructor_t ' "$file" | cut -d' ' -f2 | cut -d\; -f1 | while read widget do shortname=$(echo $widget | cut -d_ -f1) echo " {\"$shortname\", $widget}," diff --git a/widget.c b/widget.c index 04ac9cf7..9d582ba7 100644 --- a/widget.c +++ b/widget.c @@ -168,7 +168,7 @@ luaA_widget_new(lua_State *L) { const char *type; widget_t *w; - WidgetConstructor *wc; + widget_constructor_t *wc; alignment_t align; luaA_checktable(L, 1); @@ -176,7 +176,7 @@ luaA_widget_new(lua_State *L) type = luaA_getopt_string(L, 1, "type", NULL); - /* \todo use type to call the WidgetConstructor and set ->tell*/ + /* \todo use type to call the widget_constructor_t and set ->tell*/ if((wc = name_func_lookup(type, WidgetList))) w = wc(align); else diff --git a/widget.h b/widget.h index 92d5bc5e..fabb8b59 100644 --- a/widget.h +++ b/widget.h @@ -30,7 +30,7 @@ #define WIDGET_CACHE_TAGS 1<<2 #define WIDGET_CACHE_ALL (WIDGET_CACHE_CLIENTS | WIDGET_CACHE_LAYOUTS | WIDGET_CACHE_TAGS) -typedef widget_t *(WidgetConstructor)(alignment_t); +typedef widget_t *(widget_constructor_t)(alignment_t); void widget_invalidate_cache(int, int); int widget_calculate_offset(int, int, int, int); @@ -39,12 +39,12 @@ widget_t * widget_getbyname(const char *); void widget_invalidate_statusbar_bywidget(widget_t *); void widget_tell_managestatus(widget_t *, widget_tell_status_t, const char *); -WidgetConstructor taglist_new; -WidgetConstructor textbox_new; -WidgetConstructor iconbox_new; -WidgetConstructor progressbar_new; -WidgetConstructor graph_new; -WidgetConstructor tasklist_new; +widget_constructor_t taglist_new; +widget_constructor_t textbox_new; +widget_constructor_t iconbox_new; +widget_constructor_t progressbar_new; +widget_constructor_t graph_new; +widget_constructor_t tasklist_new; #endif