progress_bar: use CamelCase

diff --git a/meson.build b/meson.build
index 7910294..b6eaf33 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -337,7 +337,7 @@ ncmpc = executable('ncmpc',
   'src/ncu.cxx',
   'src/player_command.cxx',
   'src/TitleBar.cxx',
-  'src/progress_bar.cxx',
+  'src/ProgressBar.cxx',
   'src/StatusBar.cxx',
   'src/screen.cxx',
   'src/screen_init.cxx',

diff --git a/src/progress_bar.cxx b/src/ProgressBar.cxx
similarity index 86%
rename from src/progress_bar.cxx
rename to src/ProgressBar.cxx
index be35673..3195085 100644 (file)
--- a/src/progress_bar.cxx
+++ b/src/ProgressBar.cxx
@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "progress_bar.hxx"
+#include "ProgressBar.hxx"
 
 #include <assert.h>
 
 void
-progress_bar_paint(const struct progress_bar *p)
+progress_bar_paint(const ProgressBar *p)
 {
        assert(p != nullptr);
 
@@ -41,7 +41,7 @@ progress_bar_paint(const struct progress_bar *p)
 }
 
 static bool
-progress_bar_calc(struct progress_bar *p)
+progress_bar_calc(ProgressBar *p)
 {
        if (p->max == 0)
                return false;
@@ -54,7 +54,7 @@ progress_bar_calc(struct progress_bar *p)
 }
 
 void
-progress_bar_resize(struct progress_bar *p, unsigned width, int y, int x)
+progress_bar_resize(ProgressBar *p, unsigned width, int y, int x)
 {
        assert(p != nullptr);
 
@@ -66,7 +66,7 @@ progress_bar_resize(struct progress_bar *p, unsigned width, int y, int x)
 }
 
 bool
-progress_bar_set(struct progress_bar *p, unsigned current, unsigned max)
+progress_bar_set(ProgressBar *p, unsigned current, unsigned max)
 {
        assert(p != nullptr);
 

diff --git a/src/progress_bar.hxx b/src/ProgressBar.hxx
similarity index 74%
rename from src/progress_bar.hxx
rename to src/ProgressBar.hxx
index cd94d20..3f37b16 100644 (file)
--- a/src/progress_bar.hxx
+++ b/src/ProgressBar.hxx
@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef NCMPC_PROGRESS_BAR_H
-#define NCMPC_PROGRESS_BAR_H
+#ifndef NCMPC_PROGRESS_BAR_HXX
+#define NCMPC_PROGRESS_BAR_HXX
 
 #include "window.hxx"
 
-struct progress_bar {
+struct ProgressBar {
        struct window window;
 
        unsigned current, max;
@@ -31,7 +31,7 @@ struct progress_bar {
 };
 
 static inline void
-progress_bar_init(struct progress_bar *p, unsigned width, int y, int x)
+progress_bar_init(ProgressBar *p, unsigned width, int y, int x)
 {
        window_init(&p->window, 1, width, y, x);
        leaveok(p->window.w, true);
@@ -42,18 +42,18 @@ progress_bar_init(struct progress_bar *p, unsigned width, int y, int x)
 }
 
 static inline void
-progress_bar_deinit(struct progress_bar *p)
+progress_bar_deinit(ProgressBar *p)
 {
        delwin(p->window.w);
 }
 
 void
-progress_bar_paint(const struct progress_bar *p);
+progress_bar_paint(const ProgressBar *p);
 
 void
-progress_bar_resize(struct progress_bar *p, unsigned width, int y, int x);
+progress_bar_resize(ProgressBar *p, unsigned width, int y, int x);
 
 bool
-progress_bar_set(struct progress_bar *p, unsigned current, unsigned max);
+progress_bar_set(ProgressBar *p, unsigned current, unsigned max);
 
 #endif

diff --git a/src/screen.hxx b/src/screen.hxx
index 7a70246..83a9ffb 100644 (file)
--- a/src/screen.hxx
+++ b/src/screen.hxx
@@ -24,7 +24,7 @@
 #include "command.hxx"
 #include "window.hxx"
 #include "TitleBar.hxx"
-#include "progress_bar.hxx"
+#include "ProgressBar.hxx"
 #include "StatusBar.hxx"
 #include "ncmpc_curses.h"
 
@@ -43,7 +43,7 @@ class ScreenManager {
 public:
        TitleBar title_bar;
        struct window main_window;
-       struct progress_bar progress_bar;
+       ProgressBar progress_bar;
        StatusBar status_bar;
 
        using PageMap = std::map<const struct screen_functions *,