From ca22ba77e1c1c7a772fd2029db00ed2953789755 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 6 Apr 2022 21:56:45 -0600 Subject: [PATCH] Constification: make Stateful::get_state() const, with all other required const-ness added (GUI) --- gtk2_ardour/automation_line.cc | 2 +- gtk2_ardour/automation_line.h | 2 +- gtk2_ardour/editor.cc | 2 +- gtk2_ardour/editor.h | 4 ++-- gtk2_ardour/editor_mixer.cc | 2 +- gtk2_ardour/engine_dialog.cc | 2 +- gtk2_ardour/engine_dialog.h | 2 +- gtk2_ardour/export_video_dialog.cc | 2 +- gtk2_ardour/export_video_dialog.h | 2 +- gtk2_ardour/keyboard.cc | 2 +- gtk2_ardour/keyboard.h | 2 +- gtk2_ardour/luainstance.cc | 2 +- gtk2_ardour/luainstance.h | 2 +- gtk2_ardour/meterbridge.cc | 5 +++-- gtk2_ardour/meterbridge.h | 6 +++--- gtk2_ardour/mixer_ui.cc | 2 +- gtk2_ardour/mixer_ui.h | 2 +- gtk2_ardour/processor_box.cc | 2 +- gtk2_ardour/processor_box.h | 2 +- gtk2_ardour/rc_option_editor.cc | 2 +- gtk2_ardour/rc_option_editor.h | 2 +- gtk2_ardour/recorder_ui.cc | 2 +- gtk2_ardour/recorder_ui.h | 2 +- gtk2_ardour/selection_memento.cc | 2 +- gtk2_ardour/selection_memento.h | 2 +- gtk2_ardour/strip_silence_dialog.cc | 2 +- gtk2_ardour/strip_silence_dialog.h | 2 +- gtk2_ardour/trigger_page.cc | 2 +- gtk2_ardour/trigger_page.h | 2 +- gtk2_ardour/ui_config.cc | 4 ++-- gtk2_ardour/ui_config.h | 6 +++--- gtk2_ardour/video_timeline.cc | 2 +- gtk2_ardour/video_timeline.h | 2 +- gtk2_ardour/virtual_keyboard_window.cc | 2 +- gtk2_ardour/virtual_keyboard_window.h | 2 +- 35 files changed, 43 insertions(+), 42 deletions(-) diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 0fb455ce8c..8d0326ffe1 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -1186,7 +1186,7 @@ AutomationLine::track_exited() } XMLNode & -AutomationLine::get_state (void) +AutomationLine::get_state () const { /* function as a proxy for the model */ return alist->get_state(); diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index ced055aee9..f7664e3fb0 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -142,7 +142,7 @@ public: bool is_last_point (ControlPoint &); bool is_first_point (ControlPoint &); - XMLNode& get_state (void); + XMLNode& get_state () const; int set_state (const XMLNode&, int version); void set_colors(); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 3ff0a4214e..7a514a63a8 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2634,7 +2634,7 @@ Editor::set_state (const XMLNode& node, int version) } XMLNode& -Editor::get_state () +Editor::get_state () const { XMLNode* node = new XMLNode (X_("Editor")); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 561d152e6e..62721fd591 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -207,7 +207,7 @@ public: void undo (uint32_t n = 1); void redo (uint32_t n = 1); - XMLNode& get_state (); + XMLNode& get_state () const; int set_state (const XMLNode&, int version); void set_mouse_mode (Editing::MouseMode, bool force = false); @@ -358,7 +358,7 @@ public: void get_onscreen_tracks (TrackViewList&); Width editor_mixer_strip_width; - void maybe_add_mixer_strip_width (XMLNode&); + void maybe_add_mixer_strip_width (XMLNode&) const; void show_editor_mixer (bool yn); void create_editor_mixer (); void show_editor_list (bool yn); diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index b843e7994e..21196934c1 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -260,7 +260,7 @@ Editor::current_mixer_strip_hidden () } void -Editor::maybe_add_mixer_strip_width (XMLNode& node) +Editor::maybe_add_mixer_strip_width (XMLNode& node) const { if (current_mixer_strip) { node.set_property ("mixer-width", editor_mixer_strip_width); diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 6364f584eb..1bf7069ff6 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -2021,7 +2021,7 @@ EngineControl::maybe_display_saved_state () } XMLNode& -EngineControl::get_state () +EngineControl::get_state () const { LocaleGuard lg; diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h index 39fc23ed0d..022f0acbbf 100644 --- a/gtk2_ardour/engine_dialog.h +++ b/gtk2_ardour/engine_dialog.h @@ -51,7 +51,7 @@ public: static bool need_setup (); - XMLNode& get_state (); + XMLNode& get_state () const; bool set_state (const XMLNode&); void set_desired_sample_rate (uint32_t); diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc index 1233d8dcdb..fda57aeb65 100644 --- a/gtk2_ardour/export_video_dialog.cc +++ b/gtk2_ardour/export_video_dialog.cc @@ -282,7 +282,7 @@ ExportVideoDialog::apply_state (TimeSelection& tme, bool range) } XMLNode& -ExportVideoDialog::get_state () +ExportVideoDialog::get_state () const { XMLNode* node = new XMLNode (X_("Videoexport")); node->set_property (X_("NormalizeAudio"), normalize_checkbox.get_active ()); diff --git a/gtk2_ardour/export_video_dialog.h b/gtk2_ardour/export_video_dialog.h index 0686fe31d4..59e232791b 100644 --- a/gtk2_ardour/export_video_dialog.h +++ b/gtk2_ardour/export_video_dialog.h @@ -55,7 +55,7 @@ public: void apply_state (TimeSelection& tme, bool range); - XMLNode& get_state (); + XMLNode& get_state () const; void set_state (const XMLNode&); private: diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 2ae634cbad..7ba165ab95 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -229,7 +229,7 @@ ArdourKeyboard::setup_keybindings () } XMLNode& -ArdourKeyboard::get_state (void) +ArdourKeyboard::get_state () const { XMLNode* node = &Keyboard::get_state (); diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h index 2776b4adbd..53aaff721b 100644 --- a/gtk2_ardour/keyboard.h +++ b/gtk2_ardour/keyboard.h @@ -38,7 +38,7 @@ class ArdourKeyboard : public Gtkmm2ext::Keyboard public: ArdourKeyboard(ARDOUR_UI&); - XMLNode& get_state (void); + XMLNode& get_state () const; int set_state (const XMLNode&, int version); void setup_keybindings (); diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index 69134e2dea..47194008ae 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -2037,7 +2037,7 @@ LuaCallback::~LuaCallback () } XMLNode& -LuaCallback::get_state (void) +LuaCallback::get_state () const { std::string saved; { diff --git a/gtk2_ardour/luainstance.h b/gtk2_ardour/luainstance.h index 0cc5cc9444..fe3b65f015 100644 --- a/gtk2_ardour/luainstance.h +++ b/gtk2_ardour/luainstance.h @@ -49,7 +49,7 @@ public: LuaCallback (ARDOUR::Session*, XMLNode & node); ~LuaCallback (); - XMLNode& get_state (void); + XMLNode& get_state () const; void set_session (ARDOUR::Session *); const PBD::ID& id () const { return _id; } diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index 74a02abfcd..9be2d7d85b 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -245,8 +245,9 @@ Meterbridge::set_window_pos_and_size () } void -Meterbridge::get_window_pos_and_size () +Meterbridge::get_window_pos_and_size () const { +#warning CONSTIFICATION this really needs to work some other way, since this supposed to be const get_position(m_root_x, m_root_y); get_size(m_width, m_height); } @@ -491,7 +492,7 @@ Meterbridge::set_state (const XMLNode& node) } XMLNode& -Meterbridge::get_state (void) +Meterbridge::get_state () const { XMLNode* node = new XMLNode ("Meterbridge"); diff --git a/gtk2_ardour/meterbridge.h b/gtk2_ardour/meterbridge.h index 7b10c0d5da..a98bf2ddcc 100644 --- a/gtk2_ardour/meterbridge.h +++ b/gtk2_ardour/meterbridge.h @@ -49,7 +49,7 @@ public: void set_session (ARDOUR::Session *); - XMLNode& get_state (void); + XMLNode& get_state () const; int set_state (const XMLNode& ); void show_window (); @@ -130,10 +130,10 @@ private: void update_title (); // for restoring window geometry. - int m_root_x, m_root_y, m_width, m_height; + mutable int m_root_x, m_root_y, m_width, m_height; void set_window_pos_and_size (); - void get_window_pos_and_size (); + void get_window_pos_and_size () const; bool on_key_press_event (GdkEventKey*); bool on_key_release_event (GdkEventKey*); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 2b2fbcdb30..f3f99f243b 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -2564,7 +2564,7 @@ Mixer_UI::save_plugin_order_file () } XMLNode& -Mixer_UI::get_state () +Mixer_UI::get_state () const { XMLNode* node = new XMLNode (X_("Mixer")); diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 638b8706b5..dca0a02358 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -103,7 +103,7 @@ public: void set_strip_width (Width, bool save = false); Width get_strip_width () const { return _strip_width; } - XMLNode& get_state (); + XMLNode& get_state () const; int set_state (const XMLNode&, int /* version */); void save_plugin_order_file (); diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 3089b775b6..31aeddde88 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -4588,7 +4588,7 @@ ProcessorWindowProxy::session_handle() } XMLNode& -ProcessorWindowProxy::get_state () +ProcessorWindowProxy::get_state () const { XMLNode *node; node = &ProxyBase::get_state(); diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index bbb82634ac..8dadd99e75 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -103,7 +103,7 @@ public: void set_custom_ui_mode(bool use_custom) { want_custom = use_custom; } int set_state (const XMLNode&, int); - XMLNode& get_state (); + XMLNode& get_state () const; private: ProcessorBox* _processor_box; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 35226124d5..fa90fa9935 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -4874,7 +4874,7 @@ RCOptionEditor::use_own_window (bool and_fill_it) } XMLNode& -RCOptionEditor::get_state () +RCOptionEditor::get_state () const { XMLNode* node = new XMLNode (X_("Preferences")); node->add_child_nocopy (Tabbable::get_state()); diff --git a/gtk2_ardour/rc_option_editor.h b/gtk2_ardour/rc_option_editor.h index ac4a8b1a59..6d0d7f9bf4 100644 --- a/gtk2_ardour/rc_option_editor.h +++ b/gtk2_ardour/rc_option_editor.h @@ -44,7 +44,7 @@ public: void set_session (ARDOUR::Session*); Gtk::Window* use_own_window (bool and_fill_it); - XMLNode& get_state (); + XMLNode& get_state () const; bool on_key_release_event (GdkEventKey*); diff --git a/gtk2_ardour/recorder_ui.cc b/gtk2_ardour/recorder_ui.cc index 959d9356c9..54db0732ea 100644 --- a/gtk2_ardour/recorder_ui.cc +++ b/gtk2_ardour/recorder_ui.cc @@ -364,7 +364,7 @@ RecorderUI::tabbed_changed (bool tabbed) } XMLNode& -RecorderUI::get_state () +RecorderUI::get_state () const { XMLNode* node = new XMLNode (X_("Recorder")); node->add_child_nocopy (Tabbable::get_state ()); diff --git a/gtk2_ardour/recorder_ui.h b/gtk2_ardour/recorder_ui.h index b597ffc4f2..4e699559f8 100644 --- a/gtk2_ardour/recorder_ui.h +++ b/gtk2_ardour/recorder_ui.h @@ -65,7 +65,7 @@ public: void set_session (ARDOUR::Session*); void cleanup (); - XMLNode& get_state (); + XMLNode& get_state () const; int set_state (const XMLNode&, int /* version */); Gtk::Window* use_own_window (bool and_fill_it); diff --git a/gtk2_ardour/selection_memento.cc b/gtk2_ardour/selection_memento.cc index 4d80c2cc41..6bb6a23e0e 100644 --- a/gtk2_ardour/selection_memento.cc +++ b/gtk2_ardour/selection_memento.cc @@ -32,7 +32,7 @@ SelectionMemento::~SelectionMemento () } XMLNode& -SelectionMemento::get_state () { +SelectionMemento::get_state () const { XMLNode* node = new XMLNode ("SelectionMemento"); PublicEditor& editor = PublicEditor::instance(); diff --git a/gtk2_ardour/selection_memento.h b/gtk2_ardour/selection_memento.h index b164ef666c..6c4e796774 100644 --- a/gtk2_ardour/selection_memento.h +++ b/gtk2_ardour/selection_memento.h @@ -27,7 +27,7 @@ public: SelectionMemento (); ~SelectionMemento (); - XMLNode& get_state (); + XMLNode& get_state () const; int set_state (const XMLNode&, int version); }; #endif /* __ardour_gtk_selection_memento_h__ */ diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc index 78efd23fab..1222e2f2f2 100644 --- a/gtk2_ardour/strip_silence_dialog.cc +++ b/gtk2_ardour/strip_silence_dialog.cc @@ -361,7 +361,7 @@ StripSilenceDialog::update_progress_gui (float p) } XMLNode& -StripSilenceDialog::get_state () +StripSilenceDialog::get_state () const { XMLNode* node = new XMLNode(X_("StripSilence")); node->set_property(X_("threshold"), threshold()); diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h index 39bab433b7..fcaafc5109 100644 --- a/gtk2_ardour/strip_silence_dialog.h +++ b/gtk2_ardour/strip_silence_dialog.h @@ -57,7 +57,7 @@ public: Gtk::Dialog::on_response (response_id); } - XMLNode& get_state (); + XMLNode& get_state () const; void set_state (const XMLNode &); private: diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc index 3d3099ec11..c322fadfed 100644 --- a/gtk2_ardour/trigger_page.cc +++ b/gtk2_ardour/trigger_page.cc @@ -218,7 +218,7 @@ TriggerPage::use_own_window (bool and_fill_it) } XMLNode& -TriggerPage::get_state () +TriggerPage::get_state () const { XMLNode* node = new XMLNode (X_("TriggerPage")); node->add_child_nocopy (Tabbable::get_state ()); diff --git a/gtk2_ardour/trigger_page.h b/gtk2_ardour/trigger_page.h index a85e52fcc0..eedc9439f9 100644 --- a/gtk2_ardour/trigger_page.h +++ b/gtk2_ardour/trigger_page.h @@ -56,7 +56,7 @@ public: void set_session (ARDOUR::Session*); - XMLNode& get_state (); + XMLNode& get_state () const; int set_state (const XMLNode&, int /* version */); Gtk::Window* use_own_window (bool and_fill_it); diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 0a8a91af8f..bd17e85b42 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -512,7 +512,7 @@ UIConfiguration::save_state() } XMLNode& -UIConfiguration::get_state () +UIConfiguration::get_state () const { XMLNode* root; @@ -529,7 +529,7 @@ UIConfiguration::get_state () } XMLNode& -UIConfiguration::get_variables (std::string which_node) +UIConfiguration::get_variables (std::string which_node) const { XMLNode* node; diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index 571ffb38c1..eec56010bb 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -62,8 +62,8 @@ public: int load_color_theme (bool allow_own); int set_state (const XMLNode&, int version); - XMLNode& get_state (void); - XMLNode& get_variables (std::string); + XMLNode& get_state () const; + XMLNode& get_variables (std::string) const; void set_variables (const XMLNode&); std::string color_file_name (bool use_my, bool with_version) const; @@ -133,7 +133,7 @@ private: #include "canvas_vars.h" #undef CANVAS_FONT_VARIABLE - XMLNode& state (); + XMLNode& state () const; bool _dirty; bool aliases_modified; bool colors_modified; diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 7354d091d9..e53d47c3c5 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -224,7 +224,7 @@ VideoTimeLine::set_state (const XMLNode& node, int /*version*/) } XMLNode& -VideoTimeLine::get_state () +VideoTimeLine::get_state () const { XMLNode* node = new XMLNode (X_("Videotimeline")); node->set_property (X_("VideoOffset"), video_offset_p); diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h index 45c461d596..3b7b7f882d 100644 --- a/gtk2_ardour/video_timeline.h +++ b/gtk2_ardour/video_timeline.h @@ -62,7 +62,7 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p void set_height (int); void save_undo (void); - XMLNode& get_state (); + XMLNode& get_state () const; int set_state (const XMLNode&, int version); bool video_file_info (std::string, bool); diff --git a/gtk2_ardour/virtual_keyboard_window.cc b/gtk2_ardour/virtual_keyboard_window.cc index 9dd5711bf5..e765ea53fe 100644 --- a/gtk2_ardour/virtual_keyboard_window.cc +++ b/gtk2_ardour/virtual_keyboard_window.cc @@ -260,7 +260,7 @@ VirtualKeyboardWindow::parameter_changed (std::string const& p) } XMLNode& -VirtualKeyboardWindow::get_state () +VirtualKeyboardWindow::get_state () const { XMLNode* node = new XMLNode (X_("VirtualKeyboard")); node->set_property (X_("Channel"), _midi_channel.get_text ()); diff --git a/gtk2_ardour/virtual_keyboard_window.h b/gtk2_ardour/virtual_keyboard_window.h index f0f6f27bd8..f3d676ab48 100644 --- a/gtk2_ardour/virtual_keyboard_window.h +++ b/gtk2_ardour/virtual_keyboard_window.h @@ -89,7 +89,7 @@ public: void set_session (ARDOUR::Session*); - XMLNode& get_state (); + XMLNode& get_state () const; void set_state (const XMLNode&); protected: