From 6ed8a55821d0f14d759d6f5006312c9e15a58513 Mon Sep 17 00:00:00 2001 From: eidheim Date: Sun, 8 Nov 2015 19:35:59 +0100 Subject: [PATCH] Renamed get_current_path to get_current_folder. --- src/dialogs.h | 2 +- src/dialogs_win.cc | 2 +- src/notebook.cc | 2 +- src/notebook.h | 2 +- src/window.cc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dialogs.h b/src/dialogs.h index 02fa700..f85a0b3 100644 --- a/src/dialogs.h +++ b/src/dialogs.h @@ -27,7 +27,7 @@ private: auto application=Glib::RefPtr::cast_static(gio_application); dialog.set_transient_for(*application->window); - auto current_path=application->window->notebook.get_current_path(); + auto current_path=application->window->notebook.get_current_folder(); if(current_path.empty()) current_path=boost::filesystem::current_path(); gtk_file_chooser_set_current_folder((GtkFileChooser*)dialog.gobj(), current_path.string().c_str()); diff --git a/src/dialogs_win.cc b/src/dialogs_win.cc index b2f3ba1..f3a425c 100644 --- a/src/dialogs_win.cc +++ b/src/dialogs_win.cc @@ -97,7 +97,7 @@ private: auto gio_application=Glib::wrap(g_application, true); auto application=Glib::RefPtr::cast_static(gio_application); - auto current_path=application->window->notebook.get_current_path(); + auto current_path=application->window->notebook.get_current_folder(); if(current_path.empty()) current_path=boost::filesystem::current_path(); diff --git a/src/notebook.cc b/src/notebook.cc index 29fcdc9..4703fd6 100644 --- a/src/notebook.cc +++ b/src/notebook.cc @@ -288,7 +288,7 @@ bool Notebook::close_current_page() { return true; } -boost::filesystem::path Notebook::get_current_path() { +boost::filesystem::path Notebook::get_current_folder() { boost::filesystem::path current_path; if(get_current_page()!=-1) diff --git a/src/notebook.h b/src/notebook.h index 91840b6..15e9cd1 100644 --- a/src/notebook.h +++ b/src/notebook.h @@ -21,7 +21,7 @@ public: bool save(int page, bool reparse_needed=false); bool save_current(); void configure(int view_nr); - boost::filesystem::path get_current_path(); + boost::filesystem::path get_current_folder(); private: bool save_modified_dialog(); diff --git a/src/window.cc b/src/window.cc index 4a9446f..722c1aa 100644 --- a/src/window.cc +++ b/src/window.cc @@ -495,7 +495,7 @@ void Window::set_menu_actions() { entry_box.entries.emplace_back(last_run_command, [this](const std::string& content){ if(content!="") { last_run_command=content; - auto run_path=notebook.get_current_path(); + auto run_path=notebook.get_current_folder(); Singleton::terminal->async_print("Running: "+content+'\n'); Singleton::terminal->async_execute(content, run_path, [this, content](int exit_code){