From 79904ec4669a60932004daf35256565aefa0c392 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 22 Feb 2024 23:17:02 +0100
Subject: [PATCH] Cleanup: clarify some namespace use.

---
 src/lib/dcp_content_type.cc         |  3 ++-
 src/lib/filter.cc                   |  3 ++-
 src/wx/file_picker_ctrl.cc          |  8 ++++----
 src/wx/film_name_location_dialog.cc | 15 ++++++++-------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc
index bc9bf0d67..d689f138c 100644
--- a/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@ -28,8 +28,9 @@
 #include "i18n.h"
 
 
+using std::string;
+using std::vector;
 using boost::optional;
-using namespace std;
 
 
 vector<DCPContentType> DCPContentType::_dcp_content_types;
diff --git a/src/lib/filter.cc b/src/lib/filter.cc
index 9a14795ec..465b5991a 100644
--- a/src/lib/filter.cc
+++ b/src/lib/filter.cc
@@ -37,7 +37,8 @@ LIBDCP_ENABLE_WARNINGS
 #include "i18n.h"
 
 
-using namespace std;
+using std::string;
+using std::vector;
 using boost::optional;
 
 
diff --git a/src/wx/file_picker_ctrl.cc b/src/wx/file_picker_ctrl.cc
index 7aa0bfb40..c6aba45b7 100644
--- a/src/wx/file_picker_ctrl.cc
+++ b/src/wx/file_picker_ctrl.cc
@@ -32,8 +32,8 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::optional;
 
 
 FilePickerCtrl::FilePickerCtrl(
@@ -42,9 +42,9 @@ FilePickerCtrl::FilePickerCtrl(
 	wxString wildcard,
 	bool open,
 	bool warn_overwrite,
-	std::string initial_path_key,
+	string initial_path_key,
 	optional<std::string> initial_filename,
-	optional<filesystem::path> override_path
+	optional<boost::filesystem::path> override_path
 	)
 	: wxPanel (parent)
 	, _prompt (prompt)
diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 05ffa7a68..9d309810e 100644
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -35,11 +35,12 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::bind;
+using boost::optional;
 
 
-optional<filesystem::path> FilmNameLocationDialog::_directory;
+optional<boost::filesystem::path> FilmNameLocationDialog::_directory;
 
 
 FilmNameLocationDialog::FilmNameLocationDialog (wxWindow* parent, wxString title, bool offer_templates)
@@ -112,10 +113,10 @@ FilmNameLocationDialog::folder_changed ()
 }
 
 
-filesystem::path
+boost::filesystem::path
 FilmNameLocationDialog::path () const
 {
-	filesystem::path p;
+	boost::filesystem::path p;
 	p /= wx_to_std (_folder->GetPath());
 	p /= wx_to_std (_name->GetValue());
 	return p;
@@ -139,7 +140,7 @@ FilmNameLocationDialog::template_name () const
 bool
 FilmNameLocationDialog::check_path ()
 {
-	if (filesystem::is_directory(path()) && !filesystem::is_empty(path())) {
+	if (boost::filesystem::is_directory(path()) && !boost::filesystem::is_empty(path())) {
 		if (!confirm_dialog (
 			    this,
 			    std_to_wx (
@@ -150,7 +151,7 @@ FilmNameLocationDialog::check_path ()
 			    )) {
 			return false;
 		}
-	} else if (filesystem::is_regular_file(path())) {
+	} else if (boost::filesystem::is_regular_file(path())) {
 		error_dialog (
 			this,
 			String::compose (wx_to_std(_("%1 already exists as a file, so you cannot use it for a film.")), path().c_str())
-- 
2.30.2