logic, cv: fix header namespace pollution

We've had "using namespace options;" in headers for a while now.

1 files changed, 10 insertions, 1 deletions

diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp
index fd3384eb..3ea68bca 100644
--- a/logic/main-settings.hpp
+++ b/logic/main-settings.hpp
@@ -10,12 +10,15 @@
 
 #include <QString>
 #include "options/options.hpp"
-using namespace options;
 #include "api/plugin-api.hpp"
 #include "spline/axis-opts.hpp"
 
 #include "export.hpp"
 
+namespace main_settings_impl {
+
+using namespace options;
+
 struct OTR_LOGIC_EXPORT key_opts
 {
     value<QString> keycode, guid;
@@ -58,3 +61,9 @@ struct OTR_LOGIC_EXPORT main_settings final
 
     main_settings();
 };
+
+} // ns main_settings_impl
+
+using main_settings_impl::key_opts;
+using main_settings_impl::module_settings;
+using main_settings_impl::main_settings;