Merge commit '4645e19ce9e8f8034233ac965a4103a13b75714c' into garux-merge

[xonotic/netradiant.git] / libs / gtkutil / toolbar.h

diff --git a/libs/gtkutil/toolbar.h b/libs/gtkutil/toolbar.h
index b016ab222bf7cf3df8c2d454ead63300300761f1..c995e1be4a3879dfe5d013ffe73d9f2f66034cb2 100644 (file)
--- a/libs/gtkutil/toolbar.h
+++ b/libs/gtkutil/toolbar.h
@@ -26,19 +26,12 @@
 #include "generic/callback.h"
 
 class Command;
-
 class Toggle;
 
-ui::ToolButton
-toolbar_append_button(ui::Toolbar toolbar, const char *description, const char *icon, const Callback<void()> &callback);
-
-ui::ToolButton
-toolbar_append_button(ui::Toolbar toolbar, const char *description, const char *icon, const Command &command);
-
-ui::ToggleToolButton toolbar_append_toggle_button(ui::Toolbar toolbar, const char *description, const char *icon,
-                                                  const Callback<void()> &callback);
-
-ui::ToggleToolButton
-toolbar_append_toggle_button(ui::Toolbar toolbar, const char *description, const char *icon, const Toggle &toggle);
+ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon );
+ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon, const Callback<void()>& callback );
+ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon, const Command& command );
+ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const char* description, const char* icon, const Callback<void()>& callback );
+ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const char* description, const char* icon, const Toggle& toggle );
 
 #endif