Put wx::report_problem() in a dcpomatic namespace.

9 files changed, 28 insertions, 26 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 7ecc5e453..b3b3d1c87 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1825,7 +1825,7 @@ private:
 					_("An exception occurred: %s (%s)\n\n%s"),
 					std_to_wx(e.what()),
 					std_to_wx(e.file().string().c_str()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (boost::filesystem::filesystem_error& e) {
@@ -1836,7 +1836,7 @@ private:
 					std_to_wx(e.what()),
 					std_to_wx(e.path1().string()),
 					std_to_wx(e.path2().string()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (exception& e) {
@@ -1845,11 +1845,11 @@ private:
 				wxString::Format(
 					_("An exception occurred: %s.\n\n%s"),
 					std_to_wx(e.what()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (...) {
-			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
+			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), dcpomatic::wx::report_problem()));
 		}
 	}
 
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 78edc0795..38c8cf97f 100644
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -300,7 +300,7 @@ public:
 					_("An exception occurred: %s (%s)\n\n%s"),
 					std_to_wx(e.what()),
 					std_to_wx(e.file().string().c_str()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (exception& e) {
@@ -309,11 +309,11 @@ public:
 				wxString::Format(
 					_("An exception occurred: %s\n\n%s"),
 					std_to_wx(e.what()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (...) {
-			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
+			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), dcpomatic::wx::report_problem()));
 		}
 	}
 
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index b9645a7ca..c83d57b8f 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -553,7 +553,7 @@ public:
 					_("An exception occurred: %s (%s)\n\n%s"),
 					std_to_wx(e.what()),
 					std_to_wx(e.file().string().c_str()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (exception& e) {
@@ -562,11 +562,11 @@ public:
 				wxString::Format (
 					_("An exception occurred: %s.\n\n%s"),
 					std_to_wx(e.what()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (...) {
-			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
+			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), dcpomatic::wx::report_problem()));
 		}
 	}
 
diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index cf1b9cb42..e02f23b68 100644
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -592,7 +592,7 @@ private:
 					_("An exception occurred: %s (%s)\n\n%s"),
 					std_to_wx(e.what()),
 					std_to_wx(e.file().string().c_str()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (exception& e) {
@@ -601,11 +601,11 @@ private:
 				wxString::Format (
 					_("An exception occurred: %s\n\n%s"),
 					std_to_wx(e.what()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (...) {
-			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
+			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), dcpomatic::wx::report_problem()));
 		}
 	}
 
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index c9eb613d2..ab508f224 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -1402,7 +1402,7 @@ private:
 					_("An exception occurred: %s (%s)\n\n%s"),
 					std_to_wx(e.what()),
 					std_to_wx(e.file().string().c_str()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (exception& e) {
@@ -1411,11 +1411,11 @@ private:
 				wxString::Format (
 					_("An exception occurred: %s\n\n%s"),
 					std_to_wx(e.what()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (...) {
-			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
+			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), dcpomatic::wx::report_problem()));
 		}
 	}
 
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index dfe578194..264afe27d 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -697,10 +697,10 @@ private:
 			error_dialog (
 				0,
 				wxString::Format (
-					_("An exception occurred: %s (%s)\n\n%s") + wx::report_problem(),
+					_("An exception occurred: %s (%s)\n\n%s") + dcpomatic::wx::report_problem(),
 					std_to_wx(e.what()),
 					std_to_wx(e.file().string().c_str()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (exception& e) {
@@ -709,11 +709,11 @@ private:
 				wxString::Format(
 					_("An exception occurred: %s\n\n%s"),
 					std_to_wx(e.what()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (...) {
-			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
+			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), dcpomatic::wx::report_problem()));
 		}
 
 		/* This will terminate the program */
@@ -722,7 +722,7 @@ private:
 
 	void OnUnhandledException () override
 	{
-		error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
+		error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), dcpomatic::wx::report_problem()));
 	}
 
 	void idle ()
diff --git a/src/tools/dcpomatic_verifier.cc b/src/tools/dcpomatic_verifier.cc
index b40d508c4..238efe552 100644
--- a/src/tools/dcpomatic_verifier.cc
+++ b/src/tools/dcpomatic_verifier.cc
@@ -360,7 +360,7 @@ private:
 					_("An exception occurred: %s (%s)\n\n%s"),
 					std_to_wx(e.what()),
 					std_to_wx(e.file().string().c_str()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (boost::filesystem::filesystem_error& e) {
@@ -371,7 +371,7 @@ private:
 					std_to_wx(e.what()),
 					std_to_wx(e.path1().string()),
 					std_to_wx(e.path2().string()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (exception& e) {
@@ -380,11 +380,11 @@ private:
 				wxString::Format(
 					_("An exception occurred: %s.\n\n%s"),
 					std_to_wx(e.what()),
-					wx::report_problem()
+					dcpomatic::wx::report_problem()
 					)
 				);
 		} catch (...) {
-			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), wx::report_problem()));
+			error_dialog(nullptr, wxString::Format(_("An unknown exception occurred. %s"), dcpomatic::wx::report_problem()));
 		}
 	}
 
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index e4229c1b7..932e4e0bd 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -833,7 +833,7 @@ report_config_load_failure(wxWindow* parent, Config::LoadFailure what)
 
 
 wxString
-wx::report_problem()
+dcpomatic::wx::report_problem()
 {
 	return std_to_wx(::report_problem());
 }
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 2968ce9ff..92cdd349b 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -140,9 +140,11 @@ struct Offset
 
 extern int get_offsets (std::vector<Offset>& offsets);
 
+namespace dcpomatic {
 namespace wx {
 	extern wxString report_problem();
 }
+}
 
 
 extern void checked_set (FilePickerCtrl* widget, boost::filesystem::path value);