From 7b70b455e6199b508217b021d9a0dfc08f9a7794 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 1 Aug 2020 18:59:18 +0200 Subject: Use default member initialization --- src/gui/GraphBox.cpp | 5 ----- src/gui/GraphBox.hpp | 8 ++++---- src/gui/Window.hpp | 20 ++++++++++++++------ src/server/Broadcaster.cpp | 5 ----- src/server/Broadcaster.hpp | 6 +++--- src/server/PortImpl.hpp | 8 ++++---- src/server/ingen_lv2.cpp | 13 +++---------- src/server/internals/Note.hpp | 16 ++++++++-------- 8 files changed, 36 insertions(+), 45 deletions(-) (limited to 'src') diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp index 0905a967..42a4bc23 100644 --- a/src/gui/GraphBox.cpp +++ b/src/gui/GraphBox.cpp @@ -64,11 +64,6 @@ static const int STATUS_CONTEXT_HOVER = 2; GraphBox::GraphBox(BaseObjectType* cobject, const Glib::RefPtr& xml) : Gtk::VBox(cobject) - , _app(nullptr) - , _window(nullptr) - , _breadcrumbs(nullptr) - , _has_shown_documentation(false) - , _enable_signal(true) { property_visible() = false; diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp index 3a1049cd..175ad392 100644 --- a/src/gui/GraphBox.hpp +++ b/src/gui/GraphBox.hpp @@ -144,10 +144,10 @@ private: void event_show_engine(); void event_clipboard_changed(GdkEventOwnerChange* ev); - App* _app; + App* _app = nullptr; SPtr _graph; SPtr _view; - GraphWindow* _window; + GraphWindow* _window = nullptr; sigc::connection new_port_connection; sigc::connection removed_port_connection; @@ -204,8 +204,8 @@ private: /** Invisible bin used to store breadcrumbs when not shown by a view */ Gtk::Alignment _breadcrumb_bin; - bool _has_shown_documentation; - bool _enable_signal; + bool _has_shown_documentation = false; + bool _enable_signal = true; }; } // namespace gui diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp index ab3586fc..f5b323f0 100644 --- a/src/gui/Window.hpp +++ b/src/gui/Window.hpp @@ -33,8 +33,12 @@ class App; class Window : public Gtk::Window { public: - Window() : _app(nullptr) {} - explicit Window(BaseObjectType* cobject) : Gtk::Window(cobject), _app(nullptr) {} + Window() = default; + + explicit Window(BaseObjectType* cobject) + : Gtk::Window(cobject) + { + } virtual void init_window(App& app) { _app = &app; } @@ -48,7 +52,7 @@ public: static bool key_press_handler(Gtk::Window* win, GdkEventKey* event); - App* _app; + App* _app = nullptr; }; /** Ingen GUI Dialog @@ -57,8 +61,12 @@ public: class Dialog : public Gtk::Dialog { public: - Dialog() : _app(nullptr) {} - explicit Dialog(BaseObjectType* cobject) : Gtk::Dialog(cobject), _app(nullptr) {} + Dialog() = default; + + explicit Dialog(BaseObjectType* cobject) + : Gtk::Dialog(cobject) + { + } virtual void init_dialog(App& app) { _app = &app; } @@ -70,7 +78,7 @@ public: return Gtk::Window::on_key_press_event(event); } - App* _app; + App* _app = nullptr; }; } // namespace gui diff --git a/src/server/Broadcaster.cpp b/src/server/Broadcaster.cpp index 914b891b..b7dc4526 100644 --- a/src/server/Broadcaster.cpp +++ b/src/server/Broadcaster.cpp @@ -27,11 +27,6 @@ namespace ingen { namespace server { -Broadcaster::Broadcaster() - : _must_broadcast(false) - , _bundle_depth(0) -{} - Broadcaster::~Broadcaster() { std::lock_guard lock(_clients_mutex); diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp index d8857356..66487766 100644 --- a/src/server/Broadcaster.hpp +++ b/src/server/Broadcaster.hpp @@ -42,7 +42,7 @@ namespace server { class Broadcaster : public Interface { public: - Broadcaster(); + Broadcaster() = default; ~Broadcaster(); void register_client(const SPtr& client); @@ -114,8 +114,8 @@ private: std::mutex _clients_mutex; Clients _clients; std::set< SPtr > _broadcastees; - std::atomic _must_broadcast; - unsigned _bundle_depth; + std::atomic _must_broadcast{false}; + unsigned _bundle_depth{0}; SPtr _ignore_client; }; diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index 05664ee5..fa204310 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -61,7 +61,7 @@ public: SET }; - SetState() : state(State::SET), value(0), time(0) {} + SetState() = default; void set(const RunContext& ctx, FrameTime t, Sample v) { time = t; @@ -71,9 +71,9 @@ public: : State::HALF_SET_CYCLE_1); } - State state; ///< State of buffer for setting control value - Sample value; ///< Value currently being set - FrameTime time; ///< Time value was set + State state = State::SET; ///< State for setting control value + Sample value = 0; ///< Value currently being set + FrameTime time = 0; ///< Time value was set }; struct Voice { diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 998ca28a..a38be08b 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -451,19 +451,12 @@ ingen_lv2_main(const SPtr& engine, const SPtr& driver) } struct IngenPlugin { - IngenPlugin() - : main(nullptr) - , map(nullptr) - , argc(0) - , argv(nullptr) - {} - UPtr world; SPtr engine; UPtr main; - LV2_URID_Map* map; - int argc; - char** argv; + LV2_URID_Map* map = nullptr; + int argc = 0; + char** argv = nullptr; }; static Lib::Graphs diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index c986a745..0a7d80c9 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -69,19 +69,19 @@ private: /** Key, one for each key on the keyboard */ struct Key { enum class State { OFF, ON_ASSIGNED, ON_UNASSIGNED }; - Key() : state(State::OFF), voice(0), time(0) {} - State state; - uint32_t voice; - SampleCount time; + + State state = State::OFF; + uint32_t voice = 0; + SampleCount time = 0; }; /** Voice, one of these always exists for each voice */ struct Voice { enum class State { FREE, ACTIVE, HOLDING }; - Voice() : state(State::FREE), note(0), time(0) {} - State state; - uint8_t note; - SampleCount time; + + State state = State::FREE; + uint8_t note = 0; + SampleCount time = 0; }; using Voices = Raul::Array; -- cgit v1.2.1