diff options
| -rw-r--r-- | gtk2_ardour/option_editor.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/session_dialog.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/startup.cc | 7 | ||||
| -rw-r--r-- | libs/pbd/MSVCpbd/pbd.vcproj | 4 | ||||
| -rw-r--r-- | libs/pbd/pbd/replace_all.h | 1 | ||||
| -rw-r--r-- | libs/pbd/strreplace.cc | 9 |
6 files changed, 14 insertions, 21 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index a7fb86deda..d49f8a3be0 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -41,13 +41,6 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; -static string poor_mans_glob (string path) -{ - string copy = path; - replace_all (copy, "~", Glib::get_home_dir()); - return copy; -} - void OptionEditorComponent::add_widget_to_page (OptionEditorPage* p, Gtk::Widget* w) { diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc index 27c5d0e4a0..ed369d346e 100644 --- a/gtk2_ardour/session_dialog.cc +++ b/gtk2_ardour/session_dialog.cc @@ -57,13 +57,6 @@ using namespace PBD; using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; -static string poor_mans_glob (string path) -{ - string copy = path; - replace_all (copy, "~", Glib::get_home_dir()); - return copy; -} - SessionDialog::SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name, bool cancel_not_quit) : ArdourDialog (_("Session Setup"), true, true) , new_only (require_new) diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 4e073bf2f1..54d988ec03 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -60,13 +60,6 @@ using namespace ARDOUR_UI_UTILS; ArdourStartup* ArdourStartup::the_startup = 0; -static string poor_mans_glob (string path) -{ - string copy = path; - replace_all (copy, "~", Glib::get_home_dir()); - return copy; -} - ArdourStartup::ArdourStartup () : _response (RESPONSE_OK) , config_modified (false) diff --git a/libs/pbd/MSVCpbd/pbd.vcproj b/libs/pbd/MSVCpbd/pbd.vcproj index 72d525d0b7..e9260495e8 100644 --- a/libs/pbd/MSVCpbd/pbd.vcproj +++ b/libs/pbd/MSVCpbd/pbd.vcproj @@ -753,6 +753,10 @@ > </File> <File + RelativePath="..\pbd\replace_all.h" + > + </File> + <File RelativePath="..\pbd\resource.h" > </File> diff --git a/libs/pbd/pbd/replace_all.h b/libs/pbd/pbd/replace_all.h index e7fcc1e0ce..f769bcb3fb 100644 --- a/libs/pbd/pbd/replace_all.h +++ b/libs/pbd/pbd/replace_all.h @@ -25,5 +25,6 @@ #include "pbd/libpbd_visibility.h" LIBPBD_API int replace_all (std::string& str, const std::string& target, const std::string& replacement); +LIBPBD_API std::string poor_mans_glob (std::string path); #endif // __pbd_replace_all_h__ diff --git a/libs/pbd/strreplace.cc b/libs/pbd/strreplace.cc index 5d36608b3b..e043b9f54e 100644 --- a/libs/pbd/strreplace.cc +++ b/libs/pbd/strreplace.cc @@ -18,6 +18,7 @@ */ #include "pbd/replace_all.h" +#include "glibmm/miscutils.h" int replace_all (std::string& str, @@ -36,3 +37,11 @@ replace_all (std::string& str, return cnt; } +std::string +poor_mans_glob (std::string path) +{ + std::string copy = path; + replace_all (copy, "~", Glib::get_home_dir()); + return copy; +} + |