diff options
author | David Robillard <d@drobilla.net> | 2011-04-16 19:02:36 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2011-04-16 19:02:36 +0000 |
commit | 9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2 (patch) | |
tree | 089c1366a567dfbf88c0473288236b276ef24bf6 /src/gui | |
parent | 987710474b824cb92d83ff6fa7a090f50e10756f (diff) | |
download | ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.tar.gz ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.tar.bz2 ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.zip |
Squeeze blank lines and delete trailing whitespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3152 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
61 files changed, 0 insertions, 423 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 23924ded..e4bfc428 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -70,7 +70,6 @@ Gtk::Main* App::_main = 0; /// Singleton instance App* App::_instance = 0; - App::App(Ingen::Shared::World* world) : _configuration(new Configuration()) , _about_dialog(NULL) @@ -97,14 +96,12 @@ App::App(Ingen::Shared::World* world) #endif } - App::~App() { delete _configuration; delete _window_factory; } - void App::init(Ingen::Shared::World* world) { @@ -151,7 +148,6 @@ App::init(Ingen::Shared::World* world) break; } - void App::run() { @@ -160,7 +156,6 @@ App::run() info << "[GUI] Exiting" << endl; } - void App::attach(SharedPtr<SigClientInterface> client, SharedPtr<Raul::Deletable> handle) @@ -182,7 +177,6 @@ App::attach(SharedPtr<SigClientInterface> client, _client->signal_error.connect(sigc::mem_fun(this, &App::error_message)); } - void App::detach() { @@ -198,7 +192,6 @@ App::detach() } } - SharedPtr<Serialiser> App::serialiser() { @@ -208,14 +201,12 @@ App::serialiser() return _world->serialiser(); } - void App::error_response(int32_t id, const string& str) { error_message(str); } - void App::error_message(const string& str) { @@ -227,7 +218,6 @@ App::error_message(const string& str) _messages_window->set_urgency_hint(true); } - void App::port_activity(Port* port) { @@ -246,7 +236,6 @@ App::port_activity(Port* port) port->set_highlighted(true, false, true, false); } - void App::activity_port_destroyed(Port* port) { @@ -257,7 +246,6 @@ App::activity_port_destroyed(Port* port) return; } - bool App::animate() { @@ -278,10 +266,8 @@ App::animate() return true; } - /******** Event Handlers ************/ - void App::register_callbacks() { @@ -292,7 +278,6 @@ App::register_callbacks() sigc::mem_fun(App::instance(), &App::animate), 50, G_PRIORITY_DEFAULT); } - bool App::gtk_main_iteration() { @@ -313,7 +298,6 @@ App::gtk_main_iteration() return true; } - void App::show_about() { @@ -321,7 +305,6 @@ App::show_about() _about_dialog->hide(); } - /** Prompt (if necessary) and quit application (if confirmed). * @return true iff the application quit. */ @@ -345,7 +328,6 @@ App::quit(Gtk::Window& dialog_parent) return quit; } - Glib::RefPtr<Gdk::Pixbuf> App::icon_from_path(const string& path, int size) { @@ -376,7 +358,6 @@ App::icon_from_path(const string& path, int size) return buf; } - void* App::icon_destroyed(void* data) { @@ -390,7 +371,6 @@ App::icon_destroyed(void* data) return NULL; } - bool App::can_control(const Shared::Port* port) const { @@ -400,7 +380,6 @@ App::can_control(const Shared::Port* port) const || port->supports(uris().atom_String))); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/App.hpp b/src/gui/App.hpp index e74a6168..efe22839 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -63,7 +63,6 @@ class ThreadedLoader; class WindowFactory; class Port; - /** Singleton master class most everything is contained within. * * This is a horrible god-object, but it's shrinking in size as things are @@ -167,7 +166,6 @@ protected: bool _enable_signal; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp index 011bf690..416d0178 100644 --- a/src/gui/BreadCrumbs.cpp +++ b/src/gui/BreadCrumbs.cpp @@ -35,7 +35,6 @@ BreadCrumbs::BreadCrumbs() sigc::mem_fun(this, &BreadCrumbs::object_destroyed)); } - SharedPtr<PatchView> BreadCrumbs::view(const Path& path) { @@ -46,7 +45,6 @@ BreadCrumbs::view(const Path& path) return SharedPtr<PatchView>(); } - /** Sets up the crumbs to display @a path. * * If @a path is already part of the shown path, it will be selected and the @@ -78,7 +76,6 @@ BreadCrumbs::build(Path path, SharedPtr<PatchView> view) _active_path = path; _enable_signal = old_enable_signal; - // Moving to a child of the full path, just append crumbs (preserve view cache) } else if (_breadcrumbs.size() > 0 && (path.is_child_of(_full_path))) { @@ -102,7 +99,6 @@ BreadCrumbs::build(Path path, SharedPtr<PatchView> view) (*i)->set_active(false); _breadcrumbs.back()->set_active(true); - // Rebuild from scratch // Getting here is bad unless absolutely necessary, since the PatchView cache is lost } else { @@ -143,7 +139,6 @@ BreadCrumbs::build(Path path, SharedPtr<PatchView> view) _enable_signal = old_enable_signal; } - /** Create a new crumb, assigning it a reference to @a view if their paths * match, otherwise ignoring @a view. */ @@ -160,7 +155,6 @@ BreadCrumbs::create_crumb(const Path& path, return but; } - void BreadCrumbs::breadcrumb_clicked(BreadCrumb* crumb) { @@ -179,7 +173,6 @@ BreadCrumbs::breadcrumb_clicked(BreadCrumb* crumb) } } - void BreadCrumbs::object_destroyed(const Path& path) { @@ -196,7 +189,6 @@ BreadCrumbs::object_destroyed(const Path& path) } } - void BreadCrumbs::object_moved(const Path& old_path, const Path& new_path) { @@ -206,7 +198,6 @@ BreadCrumbs::object_moved(const Path& old_path, const Path& new_path) } } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp index 6cd6e04a..0f5c1db0 100644 --- a/src/gui/BreadCrumbs.hpp +++ b/src/gui/BreadCrumbs.hpp @@ -30,7 +30,6 @@ namespace Ingen { namespace GUI { - /** Collection of breadcrumb buttons forming a path. * This doubles as a cache for PatchViews. * diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp index de4ed424..174ffbe5 100644 --- a/src/gui/Configuration.cpp +++ b/src/gui/Configuration.cpp @@ -37,7 +37,6 @@ namespace GUI { using namespace Ingen::Client; - Configuration::Configuration() // Colours from the Tango palette with modified V and alpha : _name_style(HUMAN) @@ -49,12 +48,10 @@ Configuration::Configuration() { } - Configuration::~Configuration() { } - /** Loads settings from the rc file. Passing no parameter will load from * the default location. */ @@ -64,7 +61,6 @@ Configuration::load_settings(string filename) /* ... */ } - /** Saves settings to rc file. Passing no parameter will save to the * default location. */ @@ -74,7 +70,6 @@ Configuration::save_settings(string filename) /* ... */ } - /** Applies the current loaded settings to whichever parts of the app * need updating. */ @@ -84,7 +79,6 @@ Configuration::apply_settings() /* ... */ } - uint32_t Configuration::get_port_color(const PortModel* p) { @@ -104,6 +98,5 @@ Configuration::get_port_color(const PortModel* p) return 0x666666FF; } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Configuration.hpp b/src/gui/Configuration.hpp index be13bcc8..7959d91d 100644 --- a/src/gui/Configuration.hpp +++ b/src/gui/Configuration.hpp @@ -72,10 +72,8 @@ private: uint32_t _value_port_color; }; - } // namespace GUI } // namespace Ingen #endif // INGEN_GUI_CONFIGURATION_HPP - diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index a4bf3e43..e314d1aa 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -54,7 +54,6 @@ namespace Raul { class Deletable; } namespace Ingen { namespace GUI { - ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Dialog(cobject) , _xml(xml) @@ -68,7 +67,6 @@ ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome:: { } - void ConnectWindow::start(Ingen::Shared::World* world) { @@ -85,7 +83,6 @@ ConnectWindow::start(Ingen::Shared::World* world) connect(true); } - void ConnectWindow::set_connected_to(SharedPtr<Shared::EngineInterface> engine) { @@ -128,7 +125,6 @@ ConnectWindow::set_connected_to(SharedPtr<Shared::EngineInterface> engine) } } - void ConnectWindow::set_connecting_widget_states() { @@ -145,7 +141,6 @@ ConnectWindow::set_connecting_widget_states() _port_spinbutton->set_sensitive(false); } - /** Launch (if applicable) and connect to the Engine. * * This will create the EngineInterface and ClientInterface and initialize @@ -264,7 +259,6 @@ ConnectWindow::connect(bool existing) } } - void ConnectWindow::disconnect() { @@ -285,21 +279,18 @@ ConnectWindow::disconnect() _disconnect_button->set_sensitive(false); } - void ConnectWindow::activate() { App::instance().engine()->activate(); } - void ConnectWindow::deactivate() { App::instance().engine()->deactivate(); } - void ConnectWindow::on_show() { @@ -312,7 +303,6 @@ ConnectWindow::on_show() Gtk::Dialog::on_show(); } - void ConnectWindow::load_widgets() { @@ -346,7 +336,6 @@ ConnectWindow::load_widgets() server_toggled(); } - void ConnectWindow::on_hide() { @@ -355,7 +344,6 @@ ConnectWindow::on_hide() quit(); } - void ConnectWindow::quit_clicked() { @@ -363,7 +351,6 @@ ConnectWindow::quit_clicked() _quit_flag = true; } - void ConnectWindow::server_toggled() { @@ -372,7 +359,6 @@ ConnectWindow::server_toggled() _mode = CONNECT_REMOTE; } - void ConnectWindow::launch_toggled() { @@ -381,7 +367,6 @@ ConnectWindow::launch_toggled() _mode = LAUNCH_REMOTE; } - void ConnectWindow::internal_toggled() { @@ -390,7 +375,6 @@ ConnectWindow::internal_toggled() _mode = INTERNAL; } - bool ConnectWindow::gtk_callback() { @@ -489,7 +473,6 @@ ConnectWindow::gtk_callback() } } - void ConnectWindow::quit() { @@ -497,6 +480,5 @@ ConnectWindow::quit() Gtk::Main::quit(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index af75a53c..e7c79fa1 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -39,7 +39,6 @@ namespace GUI { class App; - /** The initially visible "Connect to engine" window. * * This handles actually connecting to the engine and making sure everything @@ -105,7 +104,6 @@ private: Gtk::Button* _quit_button; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Connection.cpp b/src/gui/Connection.cpp index a319bbfa..9ff057eb 100644 --- a/src/gui/Connection.cpp +++ b/src/gui/Connection.cpp @@ -37,6 +37,5 @@ Connection::Connection(boost::shared_ptr<FlowCanvas::Canvas> canvas, _bpath.property_dash() = src_port->dash(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp index 4b899ac6..15af862a 100644 --- a/src/gui/Connection.hpp +++ b/src/gui/Connection.hpp @@ -30,7 +30,6 @@ using Client::ConnectionModel; namespace GUI { - /** A Connection in a Patch. * * \ingroup GUI @@ -50,7 +49,6 @@ private: SharedPtr<ConnectionModel> _connection_model; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp index 236cb92a..24ab7cc2 100644 --- a/src/gui/ControlPanel.cpp +++ b/src/gui/ControlPanel.cpp @@ -32,7 +32,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Gtk::HBox(cobject) , _callback_enabled(true) @@ -42,14 +41,12 @@ ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl show_all(); } - ControlPanel::~ControlPanel() { for (vector<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) delete (*i); } - void ControlPanel::init(SharedPtr<NodeModel> node, uint32_t poly) { @@ -63,7 +60,6 @@ ControlPanel::init(SharedPtr<NodeModel> node, uint32_t poly) _callback_enabled = true; } - Control* ControlPanel::find_port(const Path& path) const { @@ -74,7 +70,6 @@ ControlPanel::find_port(const Path& path) const return NULL; } - /** Add a control to the panel for the given port. */ void @@ -131,7 +126,6 @@ ControlPanel::add_port(SharedPtr<PortModel> pm) _ideal_size.second = controls_size.height; } - /** Remove the control for the given port. */ void @@ -149,7 +143,6 @@ ControlPanel::remove_port(const Path& path) } } - /** Callback for Controls to notify this of a change. */ void @@ -163,6 +156,5 @@ ControlPanel::value_changed_atom(SharedPtr<PortModel> port, const Raul::Atom& va } } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp index a5d87dd1..a7ad9e4e 100644 --- a/src/gui/ControlPanel.hpp +++ b/src/gui/ControlPanel.hpp @@ -39,7 +39,6 @@ using namespace Ingen::Client; namespace GUI { - /** A group of controls for a node (or patch). * * Used by both NodeControlWindow and the main window (for patch controls). @@ -81,7 +80,6 @@ private: Gtk::VBox* _control_box; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp index ed16350e..07e9da2c 100644 --- a/src/gui/Controls.cpp +++ b/src/gui/Controls.cpp @@ -36,7 +36,6 @@ namespace Ingen { using namespace Client; namespace GUI { - // ////////////////////// Control ///////////////////////////////// // Control::Control(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml) @@ -53,7 +52,6 @@ Control::Control(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& sigc::mem_fun(this, &Control::menu_properties)); } - Control::~Control() { _enable_signal = false; @@ -61,7 +59,6 @@ Control::~Control() _port_model.reset(); } - void Control::init(ControlPanel* panel, SharedPtr<PortModel> pm) { @@ -81,7 +78,6 @@ Control::init(ControlPanel* panel, SharedPtr<PortModel> pm) set_label(pm->symbol().c_str()); } - void Control::enable() { @@ -90,7 +86,6 @@ Control::enable() i->get_widget()->set_sensitive(true); } - void Control::disable() { @@ -99,7 +94,6 @@ Control::disable() i->get_widget()->set_sensitive(false); } - void Control::set_label(const string& name) { @@ -107,7 +101,6 @@ Control::set_label(const string& name) _name_label->set_markup(name_markup); } - void Control::menu_properties() { @@ -118,10 +111,8 @@ Control::menu_properties() window->present(_port_model); } - // ////////////////// SliderControl ////////////////////// // - SliderControl::SliderControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Control(cobject, xml) , _enabled(true) @@ -131,7 +122,6 @@ SliderControl::SliderControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome:: xml->get_widget("control_strip_spinner", _value_spinner); } - void SliderControl::init(ControlPanel* panel, SharedPtr<PortModel> pm) { @@ -181,7 +171,6 @@ SliderControl::init(ControlPanel* panel, SharedPtr<PortModel> pm) show_all(); } - bool SliderControl::clicked(GdkEventButton* ev) { @@ -193,7 +182,6 @@ SliderControl::clicked(GdkEventButton* ev) } } - void SliderControl::set_value(const Atom& atom) { @@ -220,7 +208,6 @@ SliderControl::set_value(const Atom& atom) } } - void SliderControl::port_property_changed(const URI& key, const Atom& value) { @@ -235,7 +222,6 @@ SliderControl::port_property_changed(const URI& key, const Atom& value) _enable_signal = true; } - void SliderControl::set_range(float min, float max) { @@ -245,7 +231,6 @@ SliderControl::set_range(float min, float max) _slider->set_range(min, max); } - void SliderControl::update_value_from_slider() { @@ -270,7 +255,6 @@ SliderControl::update_value_from_slider() } } - void SliderControl::update_value_from_spinner() { @@ -286,7 +270,6 @@ SliderControl::update_value_from_spinner() } } - /** Callback for when slider is grabbed so we can ignore set_control * events for this port (and avoid nasty feedback issues). */ @@ -302,10 +285,8 @@ SliderControl::slider_pressed(GdkEvent* ev) return false; } - // ///////////// ToggleControl ////////////// // - ToggleControl::ToggleControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Control(cobject, xml) { @@ -313,7 +294,6 @@ ToggleControl::ToggleControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome:: xml->get_widget("toggle_control_check", _checkbutton); } - void ToggleControl::init(ControlPanel* panel, SharedPtr<PortModel> pm) { @@ -331,7 +311,6 @@ ToggleControl::init(ControlPanel* panel, SharedPtr<PortModel> pm) show_all(); } - void ToggleControl::set_value(const Atom& val) { @@ -355,7 +334,6 @@ ToggleControl::set_value(const Atom& val) _enable_signal = true; } - void ToggleControl::toggled() { @@ -365,10 +343,8 @@ ToggleControl::toggled() } } - // ///////////// StringControl ////////////// // - StringControl::StringControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Control(cobject, xml) { @@ -376,7 +352,6 @@ StringControl::StringControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome:: xml->get_widget("string_control_entry", _entry); } - void StringControl::init(ControlPanel* panel, SharedPtr<PortModel> pm) { @@ -394,7 +369,6 @@ StringControl::init(ControlPanel* panel, SharedPtr<PortModel> pm) show_all(); } - void StringControl::set_value(const Atom& val) { @@ -406,7 +380,6 @@ StringControl::set_value(const Atom& val) _enable_signal = true; } - void StringControl::activated() { @@ -415,6 +388,5 @@ StringControl::activated() Raul::Atom(_entry->get_text().c_str())); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp index 1818cc75..e9e6ab56 100644 --- a/src/gui/Controls.hpp +++ b/src/gui/Controls.hpp @@ -32,7 +32,6 @@ namespace GUI { class ControlPanel; - /** A group of controls (for a single Port) in a ControlPanel. * * \ingroup GUI @@ -67,7 +66,6 @@ protected: Gtk::Label* _name_label; }; - /** A slider for a continuous control. * * \ingroup GUI @@ -100,7 +98,6 @@ private: Gtk::HScale* _slider; }; - /** A radio button for toggle controls. * * \ingroup GUI @@ -119,7 +116,6 @@ private: Gtk::CheckButton* _checkbutton; }; - /** A text entry for string controls. * * \ingroup GUI @@ -138,7 +134,6 @@ private: Gtk::Entry* _entry; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/GladeFactory.cpp b/src/gui/GladeFactory.cpp index 6036d359..7a147383 100644 --- a/src/gui/GladeFactory.cpp +++ b/src/gui/GladeFactory.cpp @@ -27,7 +27,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - Glib::ustring GladeFactory::glade_filename = ""; inline static bool @@ -63,7 +62,6 @@ GladeFactory::find_glade_file() throw std::runtime_error("Unable to find glade file"); } - Glib::RefPtr<Gnome::Glade::Xml> GladeFactory::new_glade_reference(const string& toplevel_widget) { @@ -81,6 +79,5 @@ GladeFactory::new_glade_reference(const string& toplevel_widget) } } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/GladeFactory.hpp b/src/gui/GladeFactory.hpp index f7a0dd8a..b3aec640 100644 --- a/src/gui/GladeFactory.hpp +++ b/src/gui/GladeFactory.hpp @@ -24,7 +24,6 @@ namespace Ingen { namespace GUI { - /** Creates glade references, so various objects can create widgets. * Purely static. * @@ -40,7 +39,6 @@ private: static Glib::ustring glade_filename; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp index c4229f61..7d1f62bb 100644 --- a/src/gui/LoadPatchWindow.cpp +++ b/src/gui/LoadPatchWindow.cpp @@ -40,7 +40,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Gtk::FileChooserDialog(cobject) , _merge_ports(false) @@ -95,7 +94,6 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gno } } - void LoadPatchWindow::present(SharedPtr<PatchModel> patch, bool import, GraphObject::Properties data) { @@ -110,7 +108,6 @@ LoadPatchWindow::present(SharedPtr<PatchModel> patch, bool import, GraphObject:: Gtk::Window::present(); } - /** Sets the patch model for this window and initializes everything. * * This function MUST be called before using the window in any way! @@ -124,7 +121,6 @@ LoadPatchWindow::set_patch(SharedPtr<PatchModel> patch) _poly_spinbutton->set_value(patch->internal_poly()); } - void LoadPatchWindow::on_show() { @@ -133,21 +129,18 @@ LoadPatchWindow::on_show() Gtk::FileChooserDialog::on_show(); } - void LoadPatchWindow::merge_ports_selected() { _merge_ports = true; } - void LoadPatchWindow::insert_ports_selected() { _merge_ports = false; } - void LoadPatchWindow::ok_clicked() { @@ -202,7 +195,6 @@ LoadPatchWindow::ok_clicked() hide(); } - void LoadPatchWindow::cancel_clicked() { @@ -210,7 +202,6 @@ LoadPatchWindow::cancel_clicked() hide(); } - Raul::Symbol LoadPatchWindow::symbol_from_filename(const Glib::ustring& filename) { @@ -219,7 +210,6 @@ LoadPatchWindow::symbol_from_filename(const Glib::ustring& filename) return Raul::Symbol::symbolify(symbol_str); } - Raul::Symbol LoadPatchWindow::avoid_symbol_clash(const Raul::Symbol& symbol) { @@ -235,7 +225,6 @@ LoadPatchWindow::avoid_symbol_clash(const Raul::Symbol& symbol) } } - void LoadPatchWindow::selection_changed() { @@ -252,6 +241,5 @@ LoadPatchWindow::selection_changed() } } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp index 51a21332..0483d817 100644 --- a/src/gui/LoadPatchWindow.hpp +++ b/src/gui/LoadPatchWindow.hpp @@ -31,7 +31,6 @@ using Ingen::Client::PatchModel; namespace GUI { - /** 'Add Subpatch' window. * * Loaded by glade as a derived object. @@ -80,7 +79,6 @@ private: bool _merge_ports; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 080520c4..8008ed87 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -106,7 +106,6 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G //m_add_button->grab_default(); } - void LoadPluginWindow::present(SharedPtr<PatchModel> patch, GraphObject::Properties data) { @@ -115,7 +114,6 @@ LoadPluginWindow::present(SharedPtr<PatchModel> patch, GraphObject::Properties d Gtk::Window::present(); } - /** Called every time the user types into the name input box. * Used to display warning messages, and enable/disable the OK button. */ @@ -137,7 +135,6 @@ LoadPluginWindow::name_changed() } } - #ifdef HAVE_NEW_GTKMM void LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event) @@ -146,7 +143,6 @@ LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* } #endif // HAVE_NEW_GTKMM - /** Sets the patch controller for this window and initializes everything. * * This function MUST be called before using the window in any way! @@ -167,7 +163,6 @@ LoadPluginWindow::set_patch(SharedPtr<PatchModel> patch) _polyphonic_checkbutton->property_sensitive() = true;*/ } - /** Populates the plugin list on the first show. * * This is done here instead of construction time as the list population is @@ -192,7 +187,6 @@ LoadPluginWindow::on_show() Gtk::Window::on_show(); } - void LoadPluginWindow::set_plugins(SharedPtr<const ClientStore::Plugins> m) { @@ -210,7 +204,6 @@ LoadPluginWindow::set_plugins(SharedPtr<const ClientStore::Plugins> m) _plugins_treeview->columns_autosize(); } - void LoadPluginWindow::new_plugin(SharedPtr<PluginModel> pm) { @@ -220,7 +213,6 @@ LoadPluginWindow::new_plugin(SharedPtr<PluginModel> pm) _refresh_list = true; } - void LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, SharedPtr<PluginModel> plugin) { @@ -248,7 +240,6 @@ LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, SharedPtr<PluginModel> plugi row[_plugins_columns._col_plugin] = plugin; } - void LoadPluginWindow::add_plugin(SharedPtr<PluginModel> plugin) { @@ -267,18 +258,14 @@ LoadPluginWindow::add_plugin(SharedPtr<PluginModel> plugin) plugin->uri())); } - - ///// Event Handlers ////// - void LoadPluginWindow::plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col) { add_clicked(); } - void LoadPluginWindow::plugin_selection_changed() { @@ -308,7 +295,6 @@ LoadPluginWindow::plugin_selection_changed() } } - /** Generate an automatic name for this Node. * * Offset is an offset of the number that will be appended to the plugin's @@ -325,7 +311,6 @@ LoadPluginWindow::generate_module_name(SharedPtr<PluginModel> plugin, int offset return ss.str(); } - void LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) { @@ -365,7 +350,6 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter) } } - void LoadPluginWindow::add_clicked() { @@ -373,7 +357,6 @@ LoadPluginWindow::add_clicked() sigc::mem_fun(*this, &LoadPluginWindow::load_plugin)); } - void LoadPluginWindow::filter_changed() { @@ -429,7 +412,6 @@ LoadPluginWindow::filter_changed() } } - bool LoadPluginWindow::on_key_press_event(GdkEventKey* event) { @@ -441,7 +423,6 @@ LoadPluginWindow::on_key_press_event(GdkEventKey* event) } } - void LoadPluginWindow::plugin_property_changed(const URI& plugin, const URI& predicate, @@ -455,7 +436,6 @@ LoadPluginWindow::plugin_property_changed(const URI& plugin, } } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index f04ed903..344a6c1f 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -39,7 +39,6 @@ using Ingen::Client::PatchModel; namespace GUI { - /** 'Load Plugin' window. * * Loaded by glade as a derived object. @@ -144,7 +143,6 @@ private: Gtk::Entry* _search_entry; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp index 809bea42..4e73690a 100644 --- a/src/gui/LoadRemotePatchWindow.cpp +++ b/src/gui/LoadRemotePatchWindow.cpp @@ -33,7 +33,6 @@ using namespace std; namespace Ingen { namespace GUI { - LoadRemotePatchWindow::LoadRemotePatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Dialog(cobject) { @@ -56,7 +55,6 @@ LoadRemotePatchWindow::LoadRemotePatchWindow(BaseObjectType* cobject, const Glib _uri_entry->signal_changed().connect(sigc::mem_fun(this, &LoadRemotePatchWindow::uri_changed)); } - void LoadRemotePatchWindow::present(SharedPtr<PatchModel> patch, GraphObject::Properties data) { @@ -90,7 +88,6 @@ LoadRemotePatchWindow::present(SharedPtr<PatchModel> patch, GraphObject::Propert #endif } - /** Sets the patch controller for this window and initializes everything. * * This function MUST be called before using the window in any way! @@ -101,21 +98,18 @@ LoadRemotePatchWindow::set_patch(SharedPtr<PatchModel> patch) _patch = patch; } - void LoadRemotePatchWindow::uri_changed() { _open_button->property_sensitive() = (_uri_entry->get_text().length() > 0); } - void LoadRemotePatchWindow::patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col) { open_clicked(); } - void LoadRemotePatchWindow::patch_selected() { @@ -127,7 +121,6 @@ LoadRemotePatchWindow::patch_selected() } } - void LoadRemotePatchWindow::open_clicked() { @@ -146,13 +139,11 @@ LoadRemotePatchWindow::open_clicked() hide(); } - void LoadRemotePatchWindow::cancel_clicked() { hide(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp index 32ff32b6..a61cb48b 100644 --- a/src/gui/LoadRemotePatchWindow.hpp +++ b/src/gui/LoadRemotePatchWindow.hpp @@ -32,7 +32,6 @@ using Ingen::Client::PatchModel; namespace GUI { - /** Columns for the remote patch list. * * \ingroup GUI @@ -49,8 +48,6 @@ public: Gtk::TreeModelColumn<Glib::ustring> _col_uri; }; - - /* Load remote patch ("import location") dialog. * * \ingroup GUI @@ -85,7 +82,6 @@ private: Gtk::Button* _cancel_button; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp index 1fb46c35..72d71aca 100644 --- a/src/gui/MessagesWindow.cpp +++ b/src/gui/MessagesWindow.cpp @@ -22,7 +22,6 @@ namespace Ingen { namespace GUI { using std::string; - MessagesWindow::MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml) : Window(cobject) { @@ -34,7 +33,6 @@ MessagesWindow::MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome _close_button->signal_clicked().connect(sigc::mem_fun(this, &Window::hide)); } - void MessagesWindow::post(const string& msg) { @@ -46,7 +44,6 @@ MessagesWindow::post(const string& msg) _clear_button->set_sensitive(true); } - void MessagesWindow::clear_clicked() { @@ -55,6 +52,5 @@ MessagesWindow::clear_clicked() _clear_button->set_sensitive(false); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp index f91b5f88..90b7b5b4 100644 --- a/src/gui/MessagesWindow.hpp +++ b/src/gui/MessagesWindow.hpp @@ -26,7 +26,6 @@ namespace Ingen { namespace GUI { - /** Messages Window. * * Loaded by libglade as a derived object. @@ -49,7 +48,6 @@ private: Gtk::Button* _close_button; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp index b91bf306..60134dc5 100644 --- a/src/gui/NewSubpatchWindow.cpp +++ b/src/gui/NewSubpatchWindow.cpp @@ -29,7 +29,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - NewSubpatchWindow::NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Window(cobject) { @@ -64,7 +63,6 @@ NewSubpatchWindow::set_patch(SharedPtr<PatchModel> patch) _patch = patch; } - /** Called every time the user types into the name input box. * Used to display warning messages, and enable/disable the OK button. */ @@ -88,7 +86,6 @@ NewSubpatchWindow::name_changed() } } - void NewSubpatchWindow::ok_clicked() { @@ -111,13 +108,11 @@ NewSubpatchWindow::ok_clicked() hide(); } - void NewSubpatchWindow::cancel_clicked() { hide(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp index 2375d5d9..ee59ded2 100644 --- a/src/gui/NewSubpatchWindow.hpp +++ b/src/gui/NewSubpatchWindow.hpp @@ -33,7 +33,6 @@ using Ingen::Client::PatchModel; namespace GUI { - /** 'New Subpatch' window. * * Loaded by glade as a derived object. @@ -64,7 +63,6 @@ private: Gtk::Button* _cancel_button; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp index 64c8371a..99cd948a 100644 --- a/src/gui/NodeControlWindow.cpp +++ b/src/gui/NodeControlWindow.cpp @@ -31,7 +31,6 @@ using namespace std; namespace Ingen { namespace GUI { - /** Create a node control window and load a new ControlPanel for it. */ NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, uint32_t poly) @@ -61,7 +60,6 @@ NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, uint32_t poly) _callback_enabled = true; } - /** Create a node control window and with an existing ControlPanel. */ NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, ControlPanel* panel) @@ -83,13 +81,11 @@ NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, ControlPanel* pa _callback_enabled = true; } - NodeControlWindow::~NodeControlWindow() { delete _control_panel; } - void NodeControlWindow::resize() { @@ -105,7 +101,6 @@ NodeControlWindow::resize() Gtk::Window::resize(width, height); } - void NodeControlWindow::on_show() { @@ -121,7 +116,6 @@ NodeControlWindow::on_show() Gtk::Window::on_show(); } - void NodeControlWindow::on_hide() { @@ -130,6 +124,5 @@ NodeControlWindow::on_hide() Gtk::Window::on_hide(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/NodeControlWindow.hpp b/src/gui/NodeControlWindow.hpp index 27172a6d..90cf65f6 100644 --- a/src/gui/NodeControlWindow.hpp +++ b/src/gui/NodeControlWindow.hpp @@ -35,7 +35,6 @@ namespace GUI { class ControlGroup; class ControlPanel; - /** Window with controls (sliders) for all control-rate ports on a Node. * * \ingroup GUI @@ -67,7 +66,6 @@ private: int _y; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp index 3eb361e3..8bedfb2d 100644 --- a/src/gui/NodeMenu.cpp +++ b/src/gui/NodeMenu.cpp @@ -31,7 +31,6 @@ using namespace Ingen::Client; namespace Ingen { namespace GUI { - NodeMenu::NodeMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : ObjectMenu(cobject, xml) , _controls_menuitem(NULL) @@ -59,7 +58,6 @@ NodeMenu::NodeMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml insert(*_controls_menuitem, 0); } - void NodeMenu::init(SharedPtr<NodeModel> node) { @@ -146,14 +144,12 @@ NodeMenu::init(SharedPtr<NodeModel> node) _enable_signal = true; } - void NodeMenu::on_menu_embed_gui() { signal_embed_gui.emit(_embed_gui_menuitem->get_active()); } - void NodeMenu::on_menu_randomize() { @@ -173,14 +169,12 @@ NodeMenu::on_menu_randomize() App::instance().engine()->bundle_end(); } - void NodeMenu::on_menu_disconnect() { App::instance().engine()->disconnect_all(_object->parent()->path(), _object->path()); } - void NodeMenu::on_preset_activated(const std::string& uri) { @@ -226,7 +220,6 @@ NodeMenu::on_preset_activated(const std::string& uri) #endif } - bool NodeMenu::on_preset_clicked(const std::string& uri, GdkEventButton* ev) { @@ -234,7 +227,6 @@ NodeMenu::on_preset_clicked(const std::string& uri, GdkEventButton* ev) return false; } - bool NodeMenu::has_control_inputs() { @@ -246,21 +238,18 @@ NodeMenu::has_control_inputs() return false; } - void NodeMenu::enable_controls_menuitem() { _controls_menuitem->property_sensitive() = true; } - void NodeMenu::disable_controls_menuitem() { _controls_menuitem->property_sensitive() = false; } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index cfdd84ef..ad7546ce 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -29,7 +29,6 @@ using Ingen::Client::NodeModel; namespace Ingen { namespace GUI { - /** Menu for a Node. * * \ingroup GUI @@ -63,7 +62,6 @@ protected: Gtk::Menu* _presets_menu; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index f85ad2f4..5c90704f 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -44,7 +44,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeModel> node) : FlowCanvas::Module(canvas, node->path().symbol(), 0, 0, true, canvas->show_port_names()) , _node(node) @@ -68,14 +67,12 @@ NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeMode } } - NodeModule::~NodeModule() { NodeControlWindow* win = App::instance().window_factory()->control_window(_node); delete win; // Will be removed from window factory via signal } - void NodeModule::create_menu() { @@ -89,7 +86,6 @@ NodeModule::create_menu() set_menu(_menu); } - boost::shared_ptr<NodeModule> NodeModule::create(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeModel> node, @@ -121,7 +117,6 @@ NodeModule::create(boost::shared_ptr<PatchCanvas> canvas, return ret; } - void NodeModule::show_human_names(bool b) { @@ -158,7 +153,6 @@ NodeModule::show_human_names(bool b) resize(); } - void NodeModule::value_changed(uint32_t index, const Atom& value) { @@ -180,7 +174,6 @@ NodeModule::value_changed(uint32_t index, const Atom& value) } } - void NodeModule::plugin_changed() { @@ -188,7 +181,6 @@ NodeModule::plugin_changed() PtrCast<Ingen::GUI::Port>(*p)->update_metadata(); } - void NodeModule::embed_gui(bool embed) { @@ -249,7 +241,6 @@ NodeModule::embed_gui(bool embed) resize(); } - void NodeModule::rename() { @@ -259,7 +250,6 @@ NodeModule::rename() } } - void NodeModule::add_port(SharedPtr<PortModel> port, bool resize_to_fit) { @@ -273,7 +263,6 @@ NodeModule::add_port(SharedPtr<PortModel> port, bool resize_to_fit) resize(); } - boost::shared_ptr<Port> NodeModule::port(boost::shared_ptr<PortModel> model) { @@ -285,7 +274,6 @@ NodeModule::port(boost::shared_ptr<PortModel> model) return boost::shared_ptr<Port>(); } - void NodeModule::remove_port(SharedPtr<PortModel> model) { @@ -298,7 +286,6 @@ NodeModule::remove_port(SharedPtr<PortModel> model) } } - bool NodeModule::popup_gui() { @@ -338,7 +325,6 @@ NodeModule::popup_gui() return false; } - void NodeModule::on_gui_window_close() { @@ -348,7 +334,6 @@ NodeModule::on_gui_window_close() _gui_widget = NULL; } - void NodeModule::set_control_values() { @@ -361,14 +346,12 @@ NodeModule::set_control_values() } } - void NodeModule::show_control_window() { App::instance().window_factory()->present_controls(_node); } - void NodeModule::on_double_click(GdkEventButton* ev) { @@ -376,7 +359,6 @@ NodeModule::on_double_click(GdkEventButton* ev) show_control_window(); } - void NodeModule::store_location() { @@ -401,7 +383,6 @@ NodeModule::store_location() } } - void NodeModule::property_changed(const URI& key, const Atom& value) { @@ -435,7 +416,6 @@ NodeModule::property_changed(const URI& key, const Atom& value) } } - void NodeModule::set_selected(bool b) { @@ -460,6 +440,5 @@ NodeModule::set_selected(bool b) } } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 0aa1e43e..a382a280 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -39,7 +39,6 @@ class PatchCanvas; class Port; class NodeMenu; - /** A module in a patch. * * This base class is extended for various types of modules. @@ -94,7 +93,6 @@ protected: Gtk::Window* _gui_window; ///< iff popped up }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp index e821e846..f12334ac 100644 --- a/src/gui/ObjectMenu.cpp +++ b/src/gui/ObjectMenu.cpp @@ -29,7 +29,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - ObjectMenu::ObjectMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Gtk::Menu(cobject) , _enable_signal(false) @@ -48,7 +47,6 @@ ObjectMenu::ObjectMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade: xml->get_widget("object_properties_menuitem", _properties_menuitem); } - void ObjectMenu::init(SharedPtr<ObjectModel> object) { @@ -88,7 +86,6 @@ ObjectMenu::init(SharedPtr<ObjectModel> object) _enable_signal = true; } - void ObjectMenu::on_menu_learn() { @@ -97,7 +94,6 @@ ObjectMenu::on_menu_learn() App::instance().uris().wildcard); } - void ObjectMenu::on_menu_unlearn() { @@ -108,7 +104,6 @@ ObjectMenu::on_menu_unlearn() App::instance().engine()->delta(_object->path(), remove, Resource::Properties()); } - void ObjectMenu::on_menu_polyphonic() { @@ -118,7 +113,6 @@ ObjectMenu::on_menu_polyphonic() bool(_polyphonic_menuitem->get_active())); } - void ObjectMenu::property_changed(const URI& predicate, const Atom& value) { @@ -129,21 +123,18 @@ ObjectMenu::property_changed(const URI& predicate, const Atom& value) _enable_signal = true; } - void ObjectMenu::on_menu_destroy() { App::instance().engine()->del(_object->path()); } - void ObjectMenu::on_menu_properties() { App::instance().window_factory()->present_properties(_object); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index fbcc81bb..4af8c94d 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -64,7 +64,6 @@ protected: Gtk::MenuItem* _properties_menuitem; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp index b0e8491d..d9fccc0c 100644 --- a/src/gui/PatchCanvas.hpp +++ b/src/gui/PatchCanvas.hpp @@ -49,7 +49,6 @@ namespace GUI { class NodeModule; - /** Patch canvas widget. * * \ingroup GUI @@ -172,7 +171,6 @@ private: Gtk::CheckMenuItem* _menu_edit; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index ba243b75..8427d49d 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -38,7 +38,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - PatchPortModule::PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PortModel> model) : FlowCanvas::Module(canvas, "", 0, 0, false) // FIXME: coords? , _model(model) @@ -53,7 +52,6 @@ PatchPortModule::PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, SharedPt model->signal_property.connect(sigc::mem_fun(this, &PatchPortModule::property_changed)); } - boost::shared_ptr<PatchPortModule> PatchPortModule::create(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PortModel> model, bool human) { @@ -72,7 +70,6 @@ PatchPortModule::create(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PortMod return ret; } - void PatchPortModule::create_menu() { @@ -83,7 +80,6 @@ PatchPortModule::create_menu() set_menu(_menu); } - void PatchPortModule::store_location() { @@ -104,7 +100,6 @@ PatchPortModule::store_location() } } - void PatchPortModule::show_human_names(bool b) { @@ -118,7 +113,6 @@ PatchPortModule::show_human_names(bool b) resize(); } - void PatchPortModule::set_name(const std::string& n) { @@ -126,7 +120,6 @@ PatchPortModule::set_name(const std::string& n) Module::resize(); } - void PatchPortModule::property_changed(const URI& key, const Atom& value) { @@ -164,7 +157,6 @@ PatchPortModule::property_changed(const URI& key, const Atom& value) } } - void PatchPortModule::set_selected(bool b) { @@ -176,7 +168,5 @@ PatchPortModule::set_selected(bool b) } } - - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp index 19b400d1..160289ae 100644 --- a/src/gui/PatchPortModule.hpp +++ b/src/gui/PatchPortModule.hpp @@ -40,7 +40,6 @@ class PatchCanvas; class Port; class PortMenu; - /** A "module" to represent a patch's port on its own canvas. * * Translation: This is the nameless single port pseudo module thingy. @@ -76,7 +75,6 @@ protected: PortMenu* _menu; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp index b1462459..637c41f6 100644 --- a/src/gui/PatchTreeWindow.cpp +++ b/src/gui/PatchTreeWindow.cpp @@ -34,7 +34,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - PatchTreeWindow::PatchTreeWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Window(cobject) @@ -68,14 +67,12 @@ PatchTreeWindow::PatchTreeWindow(BaseObjectType* cobject, _patches_treeview->columns_autosize(); } - void PatchTreeWindow::init(ClientStore& store) { store.signal_new_object.connect(sigc::mem_fun(this, &PatchTreeWindow::new_object)); } - void PatchTreeWindow::new_object(SharedPtr<ObjectModel> object) { @@ -84,7 +81,6 @@ PatchTreeWindow::new_object(SharedPtr<ObjectModel> object) add_patch(patch); } - void PatchTreeWindow::add_patch(SharedPtr<PatchModel> pm) { @@ -126,7 +122,6 @@ PatchTreeWindow::add_patch(SharedPtr<PatchModel> pm) pm)); } - void PatchTreeWindow::remove_patch(SharedPtr<PatchModel> pm) { @@ -135,7 +130,6 @@ PatchTreeWindow::remove_patch(SharedPtr<PatchModel> pm) _patch_treestore->erase(i); } - Gtk::TreeModel::iterator PatchTreeWindow::find_patch( Gtk::TreeModel::Children root, @@ -154,7 +148,6 @@ PatchTreeWindow::find_patch( return root.end(); } - /** Show the context menu for the selected patch in the patches treeview. */ void @@ -169,7 +162,6 @@ PatchTreeWindow::show_patch_menu(GdkEventButton* ev) } } - void PatchTreeWindow::event_patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeView::Column* col) { @@ -180,7 +172,6 @@ PatchTreeWindow::event_patch_activated(const Gtk::TreeModel::Path& path, Gtk::Tr App::instance().window_factory()->present_patch(pm); } - void PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str) { @@ -196,7 +187,6 @@ PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str) App::instance().uris().ingen_enabled, (bool)!pm->enabled()); } - void PatchTreeWindow::patch_property_changed(const URI& key, const Atom& value, SharedPtr<PatchModel> patch) @@ -215,7 +205,6 @@ PatchTreeWindow::patch_property_changed(const URI& key, const Atom& value, _enable_signal = true; } - void PatchTreeWindow::patch_moved(SharedPtr<PatchModel> patch) { @@ -234,6 +223,5 @@ PatchTreeWindow::patch_moved(SharedPtr<PatchModel> patch) _enable_signal = true; } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp index 5b005e40..9f2c480e 100644 --- a/src/gui/PatchTreeWindow.hpp +++ b/src/gui/PatchTreeWindow.hpp @@ -33,7 +33,6 @@ namespace GUI { class PatchWindow; class PatchTreeView; - /** Window with a TreeView of all loaded patches. * * \ingroup GUI @@ -82,7 +81,6 @@ protected: Glib::RefPtr<Gtk::TreeSelection> _patch_tree_selection; }; - /** Derived TreeView class to support context menus for patches */ class PatchTreeView : public Gtk::TreeView { @@ -108,7 +106,6 @@ private: }; // struct PatchTreeView - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp index 5fd643a2..3048a46b 100644 --- a/src/gui/PatchView.cpp +++ b/src/gui/PatchView.cpp @@ -36,7 +36,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Gtk::Box(cobject) , _breadcrumb_container(NULL) @@ -61,7 +60,6 @@ PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::X } - void PatchView::set_patch(SharedPtr<PatchModel> patch) { @@ -112,7 +110,6 @@ PatchView::set_patch(SharedPtr<PatchModel> patch) _canvas->grab_focus(); } - SharedPtr<PatchView> PatchView::create(SharedPtr<PatchModel> patch) { @@ -124,7 +121,6 @@ PatchView::create(SharedPtr<PatchModel> patch) return SharedPtr<PatchView>(result); } - void PatchView::on_editable_sig(bool editable) { @@ -132,7 +128,6 @@ PatchView::on_editable_sig(bool editable) _canvas->lock(!editable); } - void PatchView::editable_toggled() { @@ -140,7 +135,6 @@ PatchView::editable_toggled() set_editable(editable); } - void PatchView::set_editable(bool editable) { @@ -148,7 +142,6 @@ PatchView::set_editable(bool editable) _canvas->lock(!editable); } - void PatchView::canvas_item_entered(Gnome::Canvas::Item* item) { @@ -161,7 +154,6 @@ PatchView::canvas_item_entered(Gnome::Canvas::Item* item) signal_object_entered.emit(p->model().get()); } - void PatchView::canvas_item_left(Gnome::Canvas::Item* item) { @@ -176,7 +168,6 @@ PatchView::canvas_item_left(Gnome::Canvas::Item* item) signal_object_left.emit(p->model().get()); } - void PatchView::process_toggled() { @@ -188,7 +179,6 @@ PatchView::process_toggled() (bool)_process_but->get_active()); } - void PatchView::poly_changed() { @@ -197,14 +187,12 @@ PatchView::poly_changed() _poly_spin->get_value_as_int()); } - void PatchView::refresh_clicked() { App::instance().engine()->get(_patch->path()); } - void PatchView::property_changed(const Raul::URI& predicate, const Raul::Atom& value) { @@ -218,6 +206,5 @@ PatchView::property_changed(const Raul::URI& predicate, const Raul::Atom& value) _enable_signal = true; } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp index 4bf11d46..a2b76c3c 100644 --- a/src/gui/PatchView.hpp +++ b/src/gui/PatchView.hpp @@ -47,7 +47,6 @@ class PatchCanvas; class PatchDescriptionWindow; class SubpatchModule; - /** The patch specific contents of a PatchWindow (ie the canvas and whatever else). * * \ingroup GUI @@ -103,7 +102,6 @@ private: bool _enable_signal; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp index ca045f2f..a91b2961 100644 --- a/src/gui/PatchWindow.cpp +++ b/src/gui/PatchWindow.cpp @@ -172,7 +172,6 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad clipboard->signal_owner_change().connect(sigc::mem_fun(this, &PatchWindow::event_clipboard_changed)); } - PatchWindow::~PatchWindow() { // Prevents deletion @@ -181,7 +180,6 @@ PatchWindow::~PatchWindow() delete _breadcrumbs; } - /** Set the patch controller from a Path (for use by eg. BreadCrumbs) */ void @@ -197,7 +195,6 @@ PatchWindow::set_patch_from_path(const Path& path, SharedPtr<PatchView> view) } } - /** Sets the patch controller for this window and initializes everything. * * If @a view is NULL, a new view will be created. @@ -236,7 +233,6 @@ PatchWindow::set_patch(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view) _viewport->remove(); _viewport->add(*_view.get()); - if (_breadcrumbs->get_parent()) _breadcrumbs->get_parent()->remove(*_breadcrumbs); @@ -274,7 +270,6 @@ PatchWindow::set_patch(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view) _enable_signal = true; } - void PatchWindow::patch_port_added(SharedPtr<PortModel> port) { @@ -283,7 +278,6 @@ PatchWindow::patch_port_added(SharedPtr<PortModel> port) } } - void PatchWindow::patch_port_removed(SharedPtr<PortModel> port) { @@ -301,7 +295,6 @@ PatchWindow::patch_port_removed(SharedPtr<PortModel> port) _menu_view_control_window->property_sensitive() = false; } - void PatchWindow::show_status(ObjectModel* model) { @@ -322,7 +315,6 @@ PatchWindow::show_status(ObjectModel* model) } } - void PatchWindow::show_port_status(PortModel* port, const Raul::Atom& value) { @@ -347,28 +339,24 @@ PatchWindow::show_port_status(PortModel* port, const Raul::Atom& value) _status_bar->push(msg.str(), STATUS_CONTEXT_HOVER); } - void PatchWindow::object_entered(ObjectModel* model) { show_status(model); } - void PatchWindow::object_left(ObjectModel* model) { _status_bar->pop(STATUS_CONTEXT_HOVER); } - void PatchWindow::editable_changed(bool editable) { _menu_edit_controls->set_active(editable); } - void PatchWindow::event_show_engine() { @@ -376,7 +364,6 @@ PatchWindow::event_show_engine() App::instance().connect_window()->show(); } - void PatchWindow::event_clipboard_changed(GdkEventOwnerChange* ev) { @@ -384,35 +371,30 @@ PatchWindow::event_clipboard_changed(GdkEventOwnerChange* ev) _menu_paste->set_sensitive(clipboard->wait_is_text_available()); } - void PatchWindow::event_show_controls() { App::instance().window_factory()->present_controls(_patch); } - void PatchWindow::event_show_properties() { App::instance().window_factory()->present_properties(_patch); } - void PatchWindow::event_import() { App::instance().window_factory()->present_load_patch(_patch); } - void PatchWindow::event_import_location() { App::instance().window_factory()->present_load_remote_patch(_patch); } - void PatchWindow::event_save() { @@ -428,7 +410,6 @@ PatchWindow::event_save() } } - void PatchWindow::event_save_as() { @@ -526,14 +507,12 @@ more files and/or directories, recursively. Existing files will be overwritten. } } - void PatchWindow::event_upload() { App::instance().window_factory()->present_upload_patch(_patch); } - void PatchWindow::event_draw() { @@ -568,7 +547,6 @@ PatchWindow::event_draw() } } - void PatchWindow::event_edit_controls() { @@ -576,7 +554,6 @@ PatchWindow::event_edit_controls() _view->set_editable(_menu_edit_controls->get_active()); } - void PatchWindow::event_copy() { @@ -584,7 +561,6 @@ PatchWindow::event_copy() _view->canvas()->copy_selection(); } - void PatchWindow::event_paste() { @@ -592,7 +568,6 @@ PatchWindow::event_paste() _view->canvas()->paste(); } - void PatchWindow::event_delete() { @@ -600,7 +575,6 @@ PatchWindow::event_delete() _view->canvas()->destroy_selection(); } - void PatchWindow::event_select_all() { @@ -608,7 +582,6 @@ PatchWindow::event_select_all() _view->canvas()->select_all(); } - void PatchWindow::on_show() { @@ -618,7 +591,6 @@ PatchWindow::on_show() Gtk::Window::on_show(); } - void PatchWindow::on_hide() { @@ -627,7 +599,6 @@ PatchWindow::on_hide() Gtk::Window::on_hide(); } - bool PatchWindow::on_event(GdkEvent* event) { @@ -639,21 +610,18 @@ PatchWindow::on_event(GdkEvent* event) } } - void PatchWindow::event_close() { App::instance().window_factory()->remove_patch_window(this); } - void PatchWindow::event_quit() { App::instance().quit(*this); } - void PatchWindow::event_zoom_in() { @@ -666,21 +634,18 @@ PatchWindow::event_zoom_out() _view->canvas()->set_font_size(_view->canvas()->get_font_size() - 1.0); } - void PatchWindow::event_zoom_normal() { _view->canvas()->set_zoom_and_font_size(1.0, _view->canvas()->get_default_font_size()); } - void PatchWindow::event_arrange() { _view->canvas()->arrange(false, false); } - void PatchWindow::event_fullscreen_toggled() { @@ -696,7 +661,6 @@ PatchWindow::event_fullscreen_toggled() } } - void PatchWindow::event_status_bar_toggled() { @@ -706,8 +670,6 @@ PatchWindow::event_status_bar_toggled() _status_bar->hide(); } - - void PatchWindow::event_human_names_toggled() { @@ -718,7 +680,6 @@ PatchWindow::event_human_names_toggled() App::instance().configuration()->set_name_style(Configuration::PATH); } - void PatchWindow::event_port_names_toggled() { @@ -731,6 +692,5 @@ PatchWindow::event_port_names_toggled() } } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp index 096343bd..2e5cca4d 100644 --- a/src/gui/PatchWindow.hpp +++ b/src/gui/PatchWindow.hpp @@ -46,7 +46,6 @@ class PatchDescriptionWindow; class PatchView; class SubpatchModule; - /** A window for a patch. * * \ingroup GUI @@ -162,7 +161,6 @@ private: Gtk::Alignment _breadcrumb_bin; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 14769ee0..596c72c8 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -40,7 +40,6 @@ namespace GUI { ArtVpathDash* Port::_dash; - SharedPtr<Port> Port::create( boost::shared_ptr<FlowCanvas::Module> module, @@ -62,7 +61,6 @@ Port::create( return SharedPtr<Port>(new Port(module, pm, label, flip)); } - /** @a flip Make an input port appear as an output port, and vice versa. */ Port::Port( @@ -103,13 +101,11 @@ Port::Port( value_changed(pm->value()); } - Port::~Port() { App::instance().activity_port_destroyed(this); } - void Port::update_metadata() { @@ -126,7 +122,6 @@ Port::update_metadata() } } - void Port::create_menu() { @@ -137,7 +132,6 @@ Port::create_menu() set_menu(menu); } - void Port::moved() { @@ -146,7 +140,6 @@ Port::moved() module().lock()->resize(); } - void Port::value_changed(const Atom& value) { @@ -156,7 +149,6 @@ Port::value_changed(const Atom& value) FlowCanvas::Port::set_control(value.get_float()); } - bool Port::on_event(GdkEvent* ev) { @@ -175,14 +167,12 @@ Port::on_event(GdkEvent* ev) return false; } - void Port::activity() { App::instance().port_activity(this); } - void Port::set_control(float value, bool signal) { @@ -203,7 +193,6 @@ Port::set_control(float value, bool signal) FlowCanvas::Port::set_control(value); } - void Port::property_changed(const URI& key, const Atom& value) { @@ -230,7 +219,6 @@ Port::property_changed(const URI& key, const Atom& value) } } - ArtVpathDash* Port::dash() { @@ -277,6 +265,5 @@ Port::set_selected(bool b) } } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index ba2f2f99..9c55398c 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -33,7 +33,6 @@ using Ingen::Client::PortModel; namespace GUI { - /** A Port on an Module. * * \ingroup GUI @@ -80,7 +79,6 @@ private: bool _flipped; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 6b0591dc..3b5bdc8c 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -29,7 +29,6 @@ namespace Ingen { namespace GUI { - PortMenu::PortMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : ObjectMenu(cobject, xml) , _patch_port(NULL) @@ -40,7 +39,6 @@ PortMenu::PortMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml xml->get_widget("port_reset_range_menuitem", _reset_range_menuitem); } - void PortMenu::init(SharedPtr<PortModel> port, bool patch_port) { @@ -84,7 +82,6 @@ PortMenu::init(SharedPtr<PortModel> port, bool patch_port) _enable_signal = true; } - void PortMenu::on_menu_disconnect() { @@ -97,7 +94,6 @@ PortMenu::on_menu_disconnect() } } - void PortMenu::on_menu_set_min() { @@ -108,7 +104,6 @@ PortMenu::on_menu_set_min() App::instance().engine()->set_property(_object->path(), uris.lv2_minimum, value); } - void PortMenu::on_menu_set_max() { @@ -119,7 +114,6 @@ PortMenu::on_menu_set_max() App::instance().engine()->set_property(_object->path(), uris.lv2_maximum, value); } - void PortMenu::on_menu_reset_range() { @@ -137,7 +131,6 @@ PortMenu::on_menu_reset_range() App::instance().engine()->set_property(_object->path(), uris.lv2_maximum, max); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index ce050f5f..4dbde673 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -29,7 +29,6 @@ using Ingen::Client::PortModel; namespace Ingen { namespace GUI { - /** Menu for a Port. * * \ingroup GUI @@ -55,7 +54,6 @@ private: Gtk::MenuItem* _reset_range_menuitem; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp index 3805dad1..84065687 100644 --- a/src/gui/PortPropertiesWindow.cpp +++ b/src/gui/PortPropertiesWindow.cpp @@ -32,7 +32,6 @@ namespace Ingen { using namespace Client; namespace GUI { - PortPropertiesWindow::PortPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Window(cobject) , _initial_min(0.0f) @@ -50,7 +49,6 @@ PortPropertiesWindow::PortPropertiesWindow(BaseObjectType* cobject, const Glib:: &PortPropertiesWindow::ok)); } - /** Set the port this window is associated with. * This function MUST be called before using this object in any way. */ @@ -90,7 +88,6 @@ PortPropertiesWindow::present(SharedPtr<PortModel> pm) Gtk::Window::present(); } - void PortPropertiesWindow::property_changed(const URI& key, const Atom& value) { @@ -104,7 +101,6 @@ PortPropertiesWindow::property_changed(const URI& key, const Atom& value) } } - void PortPropertiesWindow::min_changed() { @@ -123,7 +119,6 @@ PortPropertiesWindow::min_changed() } } - void PortPropertiesWindow::max_changed() { @@ -142,14 +137,12 @@ PortPropertiesWindow::max_changed() } } - void PortPropertiesWindow::cancel() { hide(); } - void PortPropertiesWindow::ok() { @@ -161,7 +154,6 @@ PortPropertiesWindow::ok() hide(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp index e5c1e24c..26035e0e 100644 --- a/src/gui/PortPropertiesWindow.hpp +++ b/src/gui/PortPropertiesWindow.hpp @@ -27,7 +27,6 @@ namespace Ingen { namespace GUI { - /** Port properties window. * * Loaded by libglade as a derived object. diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp index 8e00f396..4664796b 100644 --- a/src/gui/PropertiesWindow.cpp +++ b/src/gui/PropertiesWindow.cpp @@ -32,7 +32,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - PropertiesWindow::PropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml) : Window(cobject) { @@ -62,7 +61,6 @@ PropertiesWindow::PropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr<G sigc::mem_fun(this, &PropertiesWindow::ok_clicked)); } - void PropertiesWindow::reset() { @@ -76,7 +74,6 @@ PropertiesWindow::reset() _model.reset(); } - /** Set the node this window is associated with. * This function MUST be called before using this object in any way. */ @@ -181,7 +178,6 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& va return NULL; } - void PropertiesWindow::on_show() { @@ -209,7 +205,6 @@ PropertiesWindow::on_show() Gtk::Window::on_show(); } - void PropertiesWindow::property_changed(const Raul::URI& predicate, const Raul::Atom& value) { @@ -230,7 +225,6 @@ PropertiesWindow::property_changed(const Raul::URI& predicate, const Raul::Atom& record.value = value; } - void PropertiesWindow::value_edited(const Raul::URI& predicate) { @@ -271,7 +265,6 @@ bad_type: return; } - void PropertiesWindow::cancel_clicked() { @@ -279,7 +272,6 @@ PropertiesWindow::cancel_clicked() Gtk::Window::hide(); } - void PropertiesWindow::apply_clicked() { @@ -301,7 +293,6 @@ PropertiesWindow::apply_clicked() LOG(debug) << "}" << endl; } - void PropertiesWindow::ok_clicked() { @@ -309,6 +300,5 @@ PropertiesWindow::ok_clicked() cancel_clicked(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp index 1ce4005f..ba53bc4e 100644 --- a/src/gui/PropertiesWindow.hpp +++ b/src/gui/PropertiesWindow.hpp @@ -29,7 +29,6 @@ using namespace Ingen::Client; namespace Ingen { namespace GUI { - /** Object properties window. * * Loaded by libglade as a derived object. diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp index e9a92dfa..2acda358 100644 --- a/src/gui/RenameWindow.cpp +++ b/src/gui/RenameWindow.cpp @@ -30,7 +30,6 @@ using namespace Raul; namespace Ingen { namespace GUI { - RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml) : Window(cobject) { @@ -48,7 +47,6 @@ RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl _ok_button->property_sensitive() = false; } - /** Set the object this window is renaming. * This function MUST be called before using this object in any way. */ @@ -62,7 +60,6 @@ RenameWindow::set_object(SharedPtr<ObjectModel> object) (name_atom.type() == Atom::STRING) ? name_atom.get_string() : ""); } - void RenameWindow::present(SharedPtr<ObjectModel> object) { @@ -71,7 +68,6 @@ RenameWindow::present(SharedPtr<ObjectModel> object) Gtk::Window::present(); } - void RenameWindow::values_changed() { @@ -95,7 +91,6 @@ RenameWindow::values_changed() } } - void RenameWindow::cancel_clicked() { @@ -103,7 +98,6 @@ RenameWindow::cancel_clicked() hide(); } - /** Rename the object. * * It shouldn't be possible for this to be called with an invalid name set @@ -135,6 +129,5 @@ RenameWindow::ok_clicked() hide(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp index e0454c52..adc50144 100644 --- a/src/gui/RenameWindow.hpp +++ b/src/gui/RenameWindow.hpp @@ -29,7 +29,6 @@ using Ingen::Client::ObjectModel; namespace Ingen { namespace GUI { - /** Rename window. Handles renaming of any (Ingen) object. * * \ingroup GUI diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp index 695f7459..43ca86f3 100644 --- a/src/gui/SubpatchModule.cpp +++ b/src/gui/SubpatchModule.cpp @@ -30,7 +30,6 @@ namespace Ingen { namespace GUI { - SubpatchModule::SubpatchModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PatchModel> patch) : NodeModule(canvas, patch) , _patch(patch) @@ -39,7 +38,6 @@ SubpatchModule::SubpatchModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr< assert(patch); } - void SubpatchModule::on_double_click(GdkEventButton* event) { @@ -54,7 +52,6 @@ SubpatchModule::on_double_click(GdkEventButton* event) App::instance().window_factory()->present_patch(_patch, preferred); } - /** Browse to this patch in current (parent's) window * (unless an existing window is displaying it) */ @@ -72,7 +69,6 @@ SubpatchModule::browse_to_patch() App::instance().window_factory()->present_patch(_patch, preferred); } - void SubpatchModule::menu_remove() { diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp index 74737ae8..f5d3d8c2 100644 --- a/src/gui/SubpatchModule.hpp +++ b/src/gui/SubpatchModule.hpp @@ -39,7 +39,6 @@ namespace GUI { class PatchCanvas; class NodeControlWindow; - /** A module to represent a subpatch * * \ingroup GUI @@ -61,7 +60,6 @@ protected: SharedPtr<PatchModel> _patch; }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp index b5a4d291..195e2879 100644 --- a/src/gui/UploadPatchWindow.cpp +++ b/src/gui/UploadPatchWindow.cpp @@ -40,7 +40,6 @@ using namespace std; namespace Ingen { namespace GUI { - UploadPatchWindow::UploadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml) : Dialog(cobject) , _thread(NULL) @@ -53,14 +52,12 @@ UploadPatchWindow::UploadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr xml->get_widget("upload_patch_cancel_button", _cancel_button); xml->get_widget("upload_patch_upload_button", _upload_button); - _symbol_entry->signal_changed().connect(sigc::mem_fun(this, &UploadPatchWindow::symbol_changed)); _short_name_entry->signal_changed().connect(sigc::mem_fun(this, &UploadPatchWindow::short_name_changed)); _cancel_button->signal_clicked().connect(sigc::mem_fun(this, &UploadPatchWindow::cancel_clicked)); _upload_button->signal_clicked().connect(sigc::mem_fun(this, &UploadPatchWindow::upload_clicked)); } - void UploadPatchWindow::present(SharedPtr<PatchModel> patch) { @@ -69,7 +66,6 @@ UploadPatchWindow::present(SharedPtr<PatchModel> patch) Gtk::Window::present(); } - void UploadPatchWindow::on_show() { @@ -85,7 +81,6 @@ UploadPatchWindow::on_show() _short_name_entry->set_text(atom.get_string()); } - void UploadPatchWindow::on_hide() { @@ -95,7 +90,6 @@ UploadPatchWindow::on_hide() _thread = NULL; } - bool UploadPatchWindow::is_symbol(const Glib::ustring& s) { @@ -112,7 +106,6 @@ UploadPatchWindow::is_symbol(const Glib::ustring& s) return true; } - void UploadPatchWindow::symbol_changed() { @@ -121,7 +114,6 @@ UploadPatchWindow::symbol_changed() && _short_name_entry->get_text().length() > 0); } - void UploadPatchWindow::short_name_changed() { @@ -130,7 +122,6 @@ UploadPatchWindow::short_name_changed() && _short_name_entry->get_text().length() > 0); } - size_t UploadThread::curl_read_cb(void *ptr, size_t size, size_t nmemb, void *data) { @@ -141,7 +132,6 @@ UploadThread::curl_read_cb(void *ptr, size_t size, size_t nmemb, void *data) return ss->readsome((char*)ptr, nmemb); } - int UploadThread::curl_progress_cb(void *thread, double dltotal, @@ -156,7 +146,6 @@ UploadThread::curl_progress_cb(void *thread, return 0; } - UploadThread::UploadThread(UploadPatchWindow* win, const string& str, const string& url) : Thread("Upload") , _curl(NULL) @@ -180,7 +169,6 @@ UploadThread::UploadThread(UploadPatchWindow* win, const string& str, const stri curl_easy_setopt(_curl, CURLOPT_PROGRESSDATA, this); } - void UploadThread::_run() { @@ -201,7 +189,6 @@ UploadThread::_run() _curl = NULL; } - bool UploadPatchWindow::progress_callback() { @@ -230,7 +217,6 @@ UploadPatchWindow::progress_callback() } } - void UploadPatchWindow::upload_clicked() { @@ -268,7 +254,6 @@ UploadPatchWindow::upload_clicked() sigc::mem_fun(this, &UploadPatchWindow::progress_callback), 100); } - void UploadPatchWindow::cancel_clicked() { @@ -280,6 +265,5 @@ UploadPatchWindow::cancel_clicked() hide(); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp index 9a4ac13a..78a17b54 100644 --- a/src/gui/UploadPatchWindow.hpp +++ b/src/gui/UploadPatchWindow.hpp @@ -37,7 +37,6 @@ namespace GUI { class UploadPatchWindow; - class UploadThread : public Raul::Thread { public: UploadThread(UploadPatchWindow* win, @@ -58,7 +57,6 @@ private: std::string _url; }; - /* Upload patch dialog. * * \ingroup GUI @@ -100,7 +98,6 @@ private: }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Window.cpp b/src/gui/Window.cpp index 3bec747f..ec128197 100644 --- a/src/gui/Window.cpp +++ b/src/gui/Window.cpp @@ -20,7 +20,6 @@ namespace Ingen { namespace GUI { - bool Window::key_press_handler(Gtk::Window* win, GdkEventKey* event) { @@ -31,7 +30,6 @@ Window::key_press_handler(Gtk::Window* win, GdkEventKey* event) return false; } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp index f490f13f..c924ba48 100644 --- a/src/gui/Window.hpp +++ b/src/gui/Window.hpp @@ -32,7 +32,6 @@ namespace GUI { class PatchWindow; class PatchTreeView; - /** Ingen GUI Window * \ingroup GUI */ @@ -52,7 +51,6 @@ public: static bool key_press_handler(Gtk::Window* win, GdkEventKey* event); }; - /** Ingen GUI Dialog * \ingroup GUI */ @@ -70,7 +68,6 @@ public: } }; - } // namespace GUI } // namespace Ingen diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index 6c48d11d..2ebb66c8 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -39,7 +39,6 @@ using namespace std; namespace Ingen { namespace GUI { - WindowFactory::WindowFactory() : _load_plugin_win(NULL) , _load_patch_win(NULL) @@ -62,7 +61,6 @@ WindowFactory::WindowFactory() #endif } - WindowFactory::~WindowFactory() { for (PatchWindowMap::iterator i = _patch_windows.begin(); i != _patch_windows.end(); ++i) @@ -73,7 +71,6 @@ WindowFactory::~WindowFactory() } - void WindowFactory::clear() { @@ -88,7 +85,6 @@ WindowFactory::clear() _control_windows.clear(); } - /** Returns the number of Patch windows currently visible. */ size_t @@ -102,8 +98,6 @@ WindowFactory::num_open_patch_windows() return ret; } - - PatchWindow* WindowFactory::patch_window(SharedPtr<PatchModel> patch) { @@ -115,7 +109,6 @@ WindowFactory::patch_window(SharedPtr<PatchModel> patch) return (w == _patch_windows.end()) ? NULL : w->second; } - PatchWindow* WindowFactory::parent_patch_window(SharedPtr<NodeModel> node) { @@ -125,7 +118,6 @@ WindowFactory::parent_patch_window(SharedPtr<NodeModel> node) return patch_window(PtrCast<PatchModel>(node->parent())); } - NodeControlWindow* WindowFactory::control_window(SharedPtr<NodeModel> node) { @@ -134,7 +126,6 @@ WindowFactory::control_window(SharedPtr<NodeModel> node) return (w == _control_windows.end()) ? NULL : w->second; } - /** Present a PatchWindow for a Patch. * * If @a preferred is not NULL, it will be set to display @a patch if the patch @@ -165,7 +156,6 @@ WindowFactory::present_patch(SharedPtr<PatchModel> patch, PatchWindow* preferred } } - PatchWindow* WindowFactory::new_patch_window(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view) { @@ -186,7 +176,6 @@ WindowFactory::new_patch_window(SharedPtr<PatchModel> patch, SharedPtr<PatchView return win; } - bool WindowFactory::remove_patch_window(PatchWindow* win, GdkEventAny* ignored) { @@ -203,7 +192,6 @@ WindowFactory::remove_patch_window(PatchWindow* win, GdkEventAny* ignored) return false; } - void WindowFactory::present_controls(SharedPtr<NodeModel> node) { @@ -217,7 +205,6 @@ WindowFactory::present_controls(SharedPtr<NodeModel> node) } } - NodeControlWindow* WindowFactory::new_control_window(SharedPtr<NodeModel> node) { @@ -235,7 +222,6 @@ WindowFactory::new_control_window(SharedPtr<NodeModel> node) return win; } - bool WindowFactory::remove_control_window(NodeControlWindow* win, GdkEventAny* ignored) { @@ -249,7 +235,6 @@ WindowFactory::remove_control_window(NodeControlWindow* win, GdkEventAny* ignore return true; } - void WindowFactory::present_load_plugin(SharedPtr<PatchModel> patch, GraphObject::Properties data) { @@ -267,7 +252,6 @@ WindowFactory::present_load_plugin(SharedPtr<PatchModel> patch, GraphObject::Pro _load_plugin_win->present(patch, data); } - void WindowFactory::present_load_patch(SharedPtr<PatchModel> patch, GraphObject::Properties data) { @@ -279,7 +263,6 @@ WindowFactory::present_load_patch(SharedPtr<PatchModel> patch, GraphObject::Prop _load_patch_win->present(patch, true, data); } - void WindowFactory::present_load_subpatch(SharedPtr<PatchModel> patch, GraphObject::Properties data) { @@ -291,7 +274,6 @@ WindowFactory::present_load_subpatch(SharedPtr<PatchModel> patch, GraphObject::P _load_patch_win->present(patch, false, data); } - void WindowFactory::present_load_remote_patch(SharedPtr<PatchModel> patch, GraphObject::Properties data) { @@ -303,7 +285,6 @@ WindowFactory::present_load_remote_patch(SharedPtr<PatchModel> patch, GraphObjec _load_remote_patch_win->present(patch, data); } - void WindowFactory::present_upload_patch(SharedPtr<PatchModel> patch) { @@ -328,7 +309,6 @@ WindowFactory::present_new_subpatch(SharedPtr<PatchModel> patch, GraphObject::Pr _new_subpatch_win->present(patch, data); } - void WindowFactory::present_rename(SharedPtr<ObjectModel> object) { @@ -342,7 +322,6 @@ WindowFactory::present_rename(SharedPtr<ObjectModel> object) _rename_win->present(object); } - void WindowFactory::present_properties(SharedPtr<ObjectModel> object) { @@ -358,6 +337,5 @@ WindowFactory::present_properties(SharedPtr<ObjectModel> object) _properties_win->present(object); } - } // namespace GUI } // namespace Ingen diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index e8eb7837..35a4f3b1 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -47,7 +47,6 @@ class PatchWindow; class RenameWindow; class UploadPatchWindow; - /** Manager/Factory for all windows. * * This serves as a nice centralized spot for all window management issues, @@ -92,7 +91,6 @@ private: PatchWindow* new_patch_window(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view); - NodeControlWindow* new_control_window(SharedPtr<NodeModel> node); bool remove_control_window(NodeControlWindow* win, GdkEventAny* ignored); @@ -108,7 +106,6 @@ private: RenameWindow* _rename_win; }; - } // namespace GUI } // namespace Ingen |