summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/GraphBox.cpp4
-rw-r--r--src/gui/GraphTreeWindow.cpp3
-rw-r--r--src/gui/GraphTreeWindow.hpp4
-rw-r--r--src/gui/NodeModule.cpp1
4 files changed, 4 insertions, 8 deletions
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 42a4bc23..e245fb0a 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -588,8 +588,8 @@ GraphBox::event_save_as()
filename += ".ingen";
basename += ".ingen";
} else if (filename.substr(filename.length() - 4) == ".ttl") {
- const Glib::ustring dir = Glib::path_get_dirname(filename);
- if (dir.substr(dir.length() - 6) != ".ingen") {
+ const Glib::ustring dirname = Glib::path_get_dirname(filename);
+ if (dirname.substr(dirname.length() - 6) != ".ingen") {
error("<b>File does not appear to be in an Ingen bundle.");
}
} else if (filename.substr(filename.length() - 6) != ".ingen") {
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index ff4e5f70..f4b1a0df 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -36,7 +36,6 @@ GraphTreeWindow::GraphTreeWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
: Window(cobject)
, _graphs_treeview(nullptr)
- , _app(nullptr)
, _enable_signal(true)
{
xml->get_widget_derived("graphs_treeview", _graphs_treeview);
@@ -70,7 +69,7 @@ GraphTreeWindow::GraphTreeWindow(BaseObjectType* cobject,
void
GraphTreeWindow::init(App& app, ClientStore& store)
{
- _app = &app;
+ init_window(app);
store.signal_new_object().connect(
sigc::mem_fun(this, &GraphTreeWindow::new_object));
}
diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp
index 1e748be7..2c988817 100644
--- a/src/gui/GraphTreeWindow.hpp
+++ b/src/gui/GraphTreeWindow.hpp
@@ -84,7 +84,6 @@ protected:
Gtk::TreeModelColumn<SPtr<client::GraphModel> > graph_model_col;
};
- App* _app;
GraphTreeModelColumns _graph_tree_columns;
Glib::RefPtr<Gtk::TreeStore> _graph_treestore;
Glib::RefPtr<Gtk::TreeSelection> _graph_tree_selection;
@@ -115,8 +114,7 @@ public:
private:
GraphTreeWindow* _window;
-
-}; // struct GraphTreeView
+};
} // namespace gui
} // namespace ingen
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index f333d3d2..c5015a39 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -504,7 +504,6 @@ NodeModule::on_selected(gboolean selected)
}
if (selected && win->documentation_is_visible()) {
- GraphWindow* win = app().window_factory()->parent_graph_window(block());
std::string doc;
bool html = false;
#ifdef HAVE_WEBKIT