libaudgui: Use consistent coding style.

src/libaudgui/about.cc

@@ -64,7 +64,7 @@ static GtkWidget * create_credits_notebook (const char * credits, const char * l
     return notebook;
 }
 
-static GtkWidget * create_about_window (void)
+static GtkWidget * create_about_window ()
 {
     const char * data_dir = aud_get_path (AudPath::DataDir);
 
@@ -116,13 +116,13 @@ static GtkWidget * create_about_window (void)
     return about_window;
 }
 
-EXPORT void audgui_show_about_window (void)
+EXPORT void audgui_show_about_window ()
 {
     if (! audgui_reshow_unique_window (AUDGUI_ABOUT_WINDOW))
         audgui_show_unique_window (AUDGUI_ABOUT_WINDOW, create_about_window ());
 }
 
-EXPORT void audgui_hide_about_window (void)
+EXPORT void audgui_hide_about_window ()
 {
     audgui_hide_unique_window (AUDGUI_ABOUT_WINDOW);
 }

src/libaudgui/equalizer.cc

@@ -29,18 +29,18 @@
 #include "libaudgui.h"
 #include "libaudgui-gtk.h"
 
-static void on_off_cb (GtkToggleButton * on_off, void * unused)
+static void on_off_cb (GtkToggleButton * on_off)
 {
     aud_set_bool (nullptr, "equalizer_active", gtk_toggle_button_get_active (on_off));
 }
 
-static void on_off_update (void * unused, GtkWidget * on_off)
+static void on_off_update (void *, GtkWidget * on_off)
 {
     gtk_toggle_button_set_active ((GtkToggleButton *) on_off, aud_get_bool
      (nullptr, "equalizer_active"));
 }
 
-static GtkWidget * create_on_off (void)
+static GtkWidget * create_on_off ()
 {
     GtkWidget * on_off = gtk_check_button_new_with_mnemonic (_("_Enable"));
     g_signal_connect (on_off, "toggled", (GCallback) on_off_cb, nullptr);
@@ -50,7 +50,7 @@ static GtkWidget * create_on_off (void)
     return on_off;
 }
 
-static void slider_moved (GtkRange * slider, void * unused)
+static void slider_moved (GtkRange * slider)
 {
     int band = GPOINTER_TO_INT (g_object_get_data ((GObject *) slider, "band"));
     double value = round (gtk_range_get_value (slider));
@@ -91,7 +91,7 @@ static void set_slider (GtkWidget * slider, double value)
     g_signal_handlers_unblock_by_func (slider, (void *) slider_moved, nullptr);
 }
 
-static void update_sliders (void * unused, GtkWidget * window)
+static void update_sliders (void *, GtkWidget * window)
 {
     GtkWidget * preamp = (GtkWidget *) g_object_get_data ((GObject *) window, "preamp");
     set_slider (preamp, aud_get_double (nullptr, "equalizer_preamp"));
@@ -107,14 +107,14 @@ static void update_sliders (void * unused, GtkWidget * window)
     }
 }
 
-static void destroy_cb (void)
+static void destroy_cb ()
 {
     hook_dissociate ("set equalizer_active", (HookFunction) on_off_update);
     hook_dissociate ("set equalizer_bands", (HookFunction) update_sliders);
     hook_dissociate ("set equalizer_preamp", (HookFunction) update_sliders);
 }
 
-static GtkWidget * create_window (void)
+static GtkWidget * create_window ()
 {
     const char * const names[AUD_EQ_NBANDS] = {N_("31 Hz"), N_("63 Hz"),
      N_("125 Hz"), N_("250 Hz"), N_("500 Hz"), N_("1 kHz"), N_("2 kHz"),
@@ -157,13 +157,13 @@ static GtkWidget * create_window (void)
     return window;
 }
 
-EXPORT void audgui_show_equalizer_window (void)
+EXPORT void audgui_show_equalizer_window ()
 {
     if (! audgui_reshow_unique_window (AUDGUI_EQUALIZER_WINDOW))
         audgui_show_unique_window (AUDGUI_EQUALIZER_WINDOW, create_window ());
 }
 
-EXPORT void audgui_hide_equalizer_window (void)
+EXPORT void audgui_hide_equalizer_window ()
 {
     audgui_hide_unique_window (AUDGUI_EQUALIZER_WINDOW);
 }

src/libaudgui/file-opener.cc

@@ -92,43 +92,43 @@ static GtkWidget * create_filebrowser (gboolean open)
         option = "close_dialog_add";
     }
 
-    GtkWidget * window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DIALOG);
-    gtk_window_set_title(GTK_WINDOW(window), window_title);
-    gtk_window_set_default_size(GTK_WINDOW(window), 700, 450);
-    gtk_container_set_border_width(GTK_CONTAINER(window), 10);
+    GtkWidget * window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_type_hint ((GtkWindow *) window, GDK_WINDOW_TYPE_HINT_DIALOG);
+    gtk_window_set_title ((GtkWindow *) window, window_title);
+    gtk_window_set_default_size ((GtkWindow *) window, 700, 450);
+    gtk_container_set_border_width ((GtkContainer *) window, 10);
 
     GtkWidget * vbox = gtk_vbox_new (false, 0);
-    gtk_container_add(GTK_CONTAINER(window), vbox);
+    gtk_container_add ((GtkContainer *) window, vbox);
 
-    GtkWidget * chooser = gtk_file_chooser_widget_new(GTK_FILE_CHOOSER_ACTION_OPEN);
-    gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(chooser), true);
+    GtkWidget * chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
+    gtk_file_chooser_set_select_multiple ((GtkFileChooser *) chooser, true);
 
     String path = aud_get_str ("audgui", "filesel_path");
     if (path[0])
         gtk_file_chooser_set_current_folder ((GtkFileChooser *) chooser, path);
 
-    gtk_box_pack_start(GTK_BOX(vbox), chooser, true, true, 3);
+    gtk_box_pack_start ((GtkBox *) vbox, chooser, true, true, 3);
 
     GtkWidget * hbox = gtk_hbox_new (false, 0);
-    gtk_box_pack_end(GTK_BOX(vbox), hbox, false, false, 3);
+    gtk_box_pack_end ((GtkBox *) vbox, hbox, false, false, 3);
 
     GtkWidget * toggle = gtk_check_button_new_with_mnemonic (toggle_text);
     gtk_toggle_button_set_active ((GtkToggleButton *) toggle, aud_get_bool ("audgui", option));
     g_signal_connect (toggle, "toggled", (GCallback) toggled_cb, (void *) option);
-    gtk_box_pack_start(GTK_BOX(hbox), toggle, true, true, 3);
+    gtk_box_pack_start ((GtkBox *) hbox, toggle, true, true, 3);
 
     GtkWidget * bbox = gtk_hbutton_box_new ();
-    gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-    gtk_box_set_spacing(GTK_BOX(bbox), 6);
-    gtk_box_pack_end(GTK_BOX(hbox), bbox, true, true, 3);
+    gtk_button_box_set_layout ((GtkButtonBox *) bbox, GTK_BUTTONBOX_END);
+    gtk_box_set_spacing ((GtkBox *) bbox, 6);
+    gtk_box_pack_end ((GtkBox *) hbox, bbox, true, true, 3);
 
     GtkWidget * action_button = audgui_button_new (verb, icon, open_cb, chooser);
     GtkWidget * close_button = audgui_button_new (_("_Close"), "window-close",
      (AudguiCallback) audgui_hide_filebrowser, nullptr);
 
-    gtk_container_add(GTK_CONTAINER(bbox), close_button);
-    gtk_container_add(GTK_CONTAINER(bbox), action_button);
+    gtk_container_add ((GtkContainer *) bbox, close_button);
+    gtk_container_add ((GtkContainer *) bbox, action_button);
 
     gtk_widget_set_can_default (action_button, true);
     gtk_widget_grab_default (action_button);
@@ -149,7 +149,7 @@ EXPORT void audgui_run_filebrowser (bool open)
     audgui_show_unique_window (AUDGUI_FILEBROWSER_WINDOW, create_filebrowser (open));
 }
 
-EXPORT void audgui_hide_filebrowser (void)
+EXPORT void audgui_hide_filebrowser ()
 {
     audgui_hide_unique_window (AUDGUI_FILEBROWSER_WINDOW);
 }

src/libaudgui/infopopup.cc

@@ -82,7 +82,7 @@ static void infopopup_art_ready (const char * filename)
     infopopup_queued = nullptr;
 }
 
-static gboolean infopopup_progress_cb (void * unused)
+static gboolean infopopup_progress_cb (void *)
 {
     String filename;
     int length = 0, time = 0;
@@ -162,7 +162,7 @@ static void infopopup_add_category (GtkWidget * grid, int position,
     gtk_widget_set_no_show_all (* label, true);
 }
 
-static void infopopup_destroyed (void)
+static void infopopup_destroyed ()
 {
     hook_dissociate ("art ready", (HookFunction) infopopup_art_ready);
 
@@ -178,7 +178,7 @@ static void infopopup_destroyed (void)
     infopopup_queued = nullptr;
 }
 
-static GtkWidget * infopopup_create (void)
+static GtkWidget * infopopup_create ()
 {
     GtkWidget * infopopup = gtk_window_new (GTK_WINDOW_POPUP);
     gtk_window_set_type_hint ((GtkWindow *) infopopup, GDK_WINDOW_TYPE_HINT_TOOLTIP);
@@ -330,7 +330,7 @@ EXPORT void audgui_infopopup_show (int playlist, int entry)
         infopopup_show (filename, tuple);
 }
 
-EXPORT void audgui_infopopup_show_current (void)
+EXPORT void audgui_infopopup_show_current ()
 {
     int playlist = aud_playlist_get_playing ();
     if (playlist < 0)
@@ -343,7 +343,7 @@ EXPORT void audgui_infopopup_show_current (void)
     audgui_infopopup_show (playlist, position);
 }
 
-EXPORT void audgui_infopopup_hide (void)
+EXPORT void audgui_infopopup_hide ()
 {
     audgui_hide_unique_window (AUDGUI_INFOPOPUP_WINDOW);
 

src/libaudgui/infowin.cc

@@ -1,5 +1,5 @@
 /*
- * libaudgui/infowin.c
+ * infowin.c
  * Copyright 2006-2013 William Pitcock, Tomasz Moń, Eugene Zagidullin,
  *                     John Lindgren, and Thomas Lange
  *

src/libaudgui/init.cc

@@ -31,25 +31,26 @@
 #include "libaudgui-gtk.h"
 
 static const char * const audgui_defaults[] = {
- "clear_song_fields", "TRUE",
- "close_dialog_add", "FALSE",
- "close_dialog_open", "TRUE",
- "close_jtf_dialog", "TRUE",
- "remember_jtf_entry", "TRUE",
- nullptr};
+    "clear_song_fields", "TRUE",
+    "close_dialog_add", "FALSE",
+    "close_dialog_open", "TRUE",
+    "close_jtf_dialog", "TRUE",
+    "remember_jtf_entry", "TRUE",
+    nullptr
+};
 
 static const char * const window_names[AUDGUI_NUM_UNIQUE_WINDOWS] = {
- "about_win",
- "equalizer_win",
- "filebrowser_win",
- nullptr, /* infopopup position is not saved */
- "info_win",
- "jump_to_time_win",
- "jump_to_track_win",
- "playlist_export_win",
- "playlist_import_win",
- "queue_manager_win",
- "url_opener_win"
+    "about_win",
+    "equalizer_win",
+    "filebrowser_win",
+    nullptr, /* infopopup position is not saved */
+    "info_win",
+    "jump_to_time_win",
+    "jump_to_track_win",
+    "playlist_export_win",
+    "playlist_import_win",
+    "queue_manager_win",
+    "url_opener_win"
 };
 
 static int init_count = 0;
@@ -117,18 +118,18 @@ void audgui_hide_unique_window (int id)
         gtk_widget_destroy (windows[id]);
 }
 
-static void playlist_set_playing_cb (void * unused, void * unused2)
+static void playlist_set_playing_cb (void *, void *)
 {
     audgui_pixbuf_uncache ();
 }
 
-static void playlist_position_cb (void * list, void * unused)
+static void playlist_position_cb (void * list, void *)
 {
     if (aud::from_ptr<int> (list) == aud_playlist_get_playing ())
         audgui_pixbuf_uncache ();
 }
 
-EXPORT void audgui_init (void)
+EXPORT void audgui_init ()
 {
     assert (aud_get_mainloop_type () == MainloopType::GLib);
 
@@ -149,7 +150,7 @@ EXPORT void audgui_init (void)
 #endif
 }
 
-EXPORT void audgui_cleanup (void)
+EXPORT void audgui_cleanup ()
 {
     if (-- init_count)
         return;

src/libaudgui/internal.h

@@ -44,22 +44,22 @@ bool audgui_reshow_unique_window (int id);
 void audgui_hide_unique_window (int id);
 
 /* pixbufs.c */
-void audgui_pixbuf_uncache (void);
+void audgui_pixbuf_uncache ();
 
 /* plugin-menu.c */
-void plugin_menu_cleanup (void);
+void plugin_menu_cleanup ();
 
 /* plugin-prefs.c */
-void plugin_prefs_cleanup (void);
+void plugin_prefs_cleanup ();
 
 /* plugin-view.c */
 GtkWidget * plugin_view_new (PluginType type);
 
 /* status.c */
-void status_init (void);
-void status_cleanup (void);
+void status_init ();
+void status_cleanup ();
 
 /* urilist.c */
-void urilist_cleanup (void);
+void urilist_cleanup ();
 
 #endif /* AUDGUI_INTERNAL_H */

src/libaudgui/jump-to-time.cc

@@ -36,7 +36,7 @@ static void jump_cb (void * entry)
         aud_drct_seek ((minutes * 60 + seconds) * 1000);
 }
 
-EXPORT void audgui_jump_to_time (void)
+EXPORT void audgui_jump_to_time ()
 {
     if (audgui_reshow_unique_window (AUDGUI_JUMP_TO_TIME_WINDOW))
         return;

src/libaudgui/jump-to-track-cache.cc

@@ -39,7 +39,7 @@
  * Regular expressions in list are formed by splitting the 'keyword' to words
  * by splitting the keyword string with space character.
  */
-Index<GRegex *> ui_jump_to_track_cache_regex_list_create (const char * keyword)
+Index<GRegex *> jump_to_track_cache_regex_list_create (const char * keyword)
 {
     Index<GRegex *> regex_list;
 
@@ -64,7 +64,7 @@ Index<GRegex *> ui_jump_to_track_cache_regex_list_create (const char * keyword)
 /**
  * Checks if 'song' matches all regular expressions in 'regex_list'.
  */
-static bool ui_jump_to_track_match (const char * name, Index<GRegex *> & regex_list)
+static bool jump_to_track_match (const char * name, Index<GRegex *> & regex_list)
 {
     if (! name)
         return false;
@@ -91,17 +91,17 @@ static bool ui_jump_to_track_match (const char * name, Index<GRegex *> & regex_l
 const KeywordMatches * JumpToTrackCache::search_within
  (const KeywordMatches * subset, const char * keyword)
 {
-    Index<GRegex *> regex_list = ui_jump_to_track_cache_regex_list_create (keyword);
+    Index<GRegex *> regex_list = jump_to_track_cache_regex_list_create (keyword);
 
     KeywordMatches * k = add (String (keyword), KeywordMatches ());
 
     for (const KeywordMatch & item : * subset)
     {
         if (! regex_list.len () ||
-         ui_jump_to_track_match (item.title, regex_list) ||
-         ui_jump_to_track_match (item.artist, regex_list) ||
-         ui_jump_to_track_match (item.album, regex_list) ||
-         ui_jump_to_track_match (item.path, regex_list))
+         jump_to_track_match (item.title, regex_list) ||
+         jump_to_track_match (item.artist, regex_list) ||
+         jump_to_track_match (item.album, regex_list) ||
+         jump_to_track_match (item.path, regex_list))
             k->append (item);
     }