status_bar: use CamelCase

diff --git a/meson.build b/meson.build
index a79393c..ee16204 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -337,7 +337,7 @@ ncmpc = executable('ncmpc',
   'src/player_command.cxx',
   'src/TitleBar.cxx',
   'src/progress_bar.cxx',
-  'src/status_bar.cxx',
+  'src/StatusBar.cxx',
   'src/screen.cxx',
   'src/screen_init.cxx',
   'src/screen_paint.cxx',

diff --git a/src/status_bar.cxx b/src/StatusBar.cxx
similarity index 93%
rename from src/status_bar.cxx
rename to src/StatusBar.cxx
index 31c3c9d..6a1085e 100644 (file)
--- a/src/status_bar.cxx
+++ b/src/StatusBar.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "status_bar.hxx"
+#include "StatusBar.hxx"
 #include "options.hxx"
 #include "colors.hxx"
 #include "i18n.h"
@@ -32,7 +32,7 @@
 #include <string.h>
 
 void
-status_bar_init(struct status_bar *p, unsigned width, int y, int x)
+status_bar_init(StatusBar *p, unsigned width, int y, int x)
 {
        window_init(&p->window, 1, width, y, x);
 
@@ -51,7 +51,7 @@ status_bar_init(struct status_bar *p, unsigned width, int y, int x)
 }
 
 void
-status_bar_deinit(struct status_bar *p)
+status_bar_deinit(StatusBar *p)
 {
        delwin(p->window.w);
 
@@ -62,7 +62,7 @@ status_bar_deinit(struct status_bar *p)
 }
 
 void
-status_bar_clear_message(struct status_bar *p)
+status_bar_clear_message(StatusBar *p)
 {
        assert(p != nullptr);
 
@@ -94,7 +94,7 @@ format_bitrate(char *p, size_t max_length, const struct mpd_status *status)
 #endif /* !NCMPC_MINI */
 
 void
-status_bar_paint(struct status_bar *p, const struct mpd_status *status,
+status_bar_paint(StatusBar *p, const struct mpd_status *status,
                 const struct mpd_song *song)
 {
        WINDOW *w = p->window.w;
@@ -225,7 +225,7 @@ status_bar_paint(struct status_bar *p, const struct mpd_status *status,
 }
 
 void
-status_bar_resize(struct status_bar *p, unsigned width, int y, int x)
+status_bar_resize(StatusBar *p, unsigned width, int y, int x)
 {
        p->window.cols = width;
        wresize(p->window.w, 1, width);
@@ -235,7 +235,7 @@ status_bar_resize(struct status_bar *p, unsigned width, int y, int x)
 static gboolean
 status_bar_clear_message_cb(gpointer data)
 {
-       auto *p = (struct status_bar *)data;
+       auto *p = (StatusBar *)data;
        assert(p->message_source_id != 0);
        p->message_source_id = 0;
 
@@ -244,7 +244,7 @@ status_bar_clear_message_cb(gpointer data)
 }
 
 void
-status_bar_message(struct status_bar *p, const char *msg)
+status_bar_message(StatusBar *p, const char *msg)
 {
        WINDOW *w = p->window.w;
 

diff --git a/src/status_bar.hxx b/src/StatusBar.hxx
similarity index 73%
rename from src/status_bar.hxx
rename to src/StatusBar.hxx
index 11e7b1b..d7959d8 100644 (file)
--- a/src/status_bar.hxx
+++ b/src/StatusBar.hxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef NCMPC_STATUS_BAR_H
-#define NCMPC_STATUS_BAR_H
+#ifndef NCMPC_STATUS_BAR_HXX
+#define NCMPC_STATUS_BAR_HXX
 
 #include "window.hxx"
 
@@ -31,7 +31,7 @@
 struct mpd_status;
 struct mpd_song;
 
-struct status_bar {
+struct StatusBar {
        struct window window;
 
        guint message_source_id;
@@ -45,22 +45,22 @@ struct status_bar {
 };
 
 void
-status_bar_init(struct status_bar *p, unsigned width, int y, int x);
+status_bar_init(StatusBar *p, unsigned width, int y, int x);
 
 void
-status_bar_deinit(struct status_bar *p);
+status_bar_deinit(StatusBar *p);
 
 void
-status_bar_paint(struct status_bar *p, const struct mpd_status *status,
+status_bar_paint(StatusBar *p, const struct mpd_status *status,
                 const struct mpd_song *song);
 
 void
-status_bar_resize(struct status_bar *p, unsigned width, int y, int x);
+status_bar_resize(StatusBar *p, unsigned width, int y, int x);
 
 void
-status_bar_message(struct status_bar *p, const char *msg);
+status_bar_message(StatusBar *p, const char *msg);
 
 void
-status_bar_clear_message(struct status_bar *p);
+status_bar_clear_message(StatusBar *p);
 
 #endif

diff --git a/src/screen.hxx b/src/screen.hxx
index b84618c..7a70246 100644 (file)
--- a/src/screen.hxx
+++ b/src/screen.hxx
@@ -25,7 +25,7 @@
 #include "window.hxx"
 #include "TitleBar.hxx"
 #include "progress_bar.hxx"
-#include "status_bar.hxx"
+#include "StatusBar.hxx"
 #include "ncmpc_curses.h"
 
 #include <mpd/client.h>
@@ -44,7 +44,7 @@ public:
        TitleBar title_bar;
        struct window main_window;
        struct progress_bar progress_bar;
-       struct status_bar status_bar;
+       StatusBar status_bar;
 
        using PageMap = std::map<const struct screen_functions *,
                                 std::unique_ptr<Page>>;