From 2abc498fdedd3394a77c108454eaae5a625f6e71 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Sat, 1 Mar 2014 17:49:47 -0500 Subject: [PATCH] gui: Rename wires.cpp I think gui.cpp is a better name, since this file controls most of the random gui components. Signed-off-by: Anna Schumaker --- gui/{wires.cpp => gui.cpp} | 2 +- gui/main.cpp | 2 +- include/ocarina.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename gui/{wires.cpp => gui.cpp} (99%) diff --git a/gui/wires.cpp b/gui/gui.cpp similarity index 99% rename from gui/wires.cpp rename to gui/gui.cpp index efa264f6..973d8485 100644 --- a/gui/wires.cpp +++ b/gui/gui.cpp @@ -237,7 +237,7 @@ void connect_button(const std::string &name, void (*func)()) get_widget(name)->signal_clicked().connect(sigc::ptr_fun(func)); } -Gtk::Window *connect_wires() +Gtk::Window *setup_gui() { struct Callbacks *cb = get_callbacks(); diff --git a/gui/main.cpp b/gui/main.cpp index 6f0161bc..ac881e1b 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -26,7 +26,7 @@ const std::string share_file(const std::string &file) Gtk::Window *ocarina_init(int *argc, char ***argv) { - Gtk::Window *window = connect_wires(); + Gtk::Window *window = setup_gui(); audio::init(argc, argv); deck::init(); library::init(); diff --git a/include/ocarina.h b/include/ocarina.h index 40c4b18d..c5a35f8d 100644 --- a/include/ocarina.h +++ b/include/ocarina.h @@ -56,10 +56,10 @@ public: }; -/* wires.cpp */ +/* gui.cpp */ void enable_idle(); void connect_button(const std::string &, void (*func)()); -Gtk::Window *connect_wires(); +Gtk::Window *setup_gui(); Glib::RefPtr &get_builder(); template