logic, spline: get rid of using namespace in header

3 files changed, 12 insertions, 1 deletions

diff --git a/gui/settings.cpp b/gui/settings.cpp
index b6d4255e..c1381915 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -14,6 +14,8 @@
 #include <QDialog>
 #include <QFileDialog>
 
+using namespace options;
+
 QString options_dialog::kopts_to_string(const key_opts& kopts)
 {
     if (static_cast<QString>(kopts.guid) != "")
diff --git a/logic/main-settings.cpp b/logic/main-settings.cpp
index 306e35cd..2c5d45db 100644
--- a/logic/main-settings.cpp
+++ b/logic/main-settings.cpp
@@ -1,5 +1,7 @@
 #include "main-settings.hpp"
 
+using namespace options;
+
 main_settings::main_settings() :
     b(make_bundle("opentrack-ui")),
     b_map(make_bundle("opentrack-mappings")),
diff --git a/spline/axis-opts.hpp b/spline/axis-opts.hpp
index 5581f569..2f0d8432 100644
--- a/spline/axis-opts.hpp
+++ b/spline/axis-opts.hpp
@@ -1,11 +1,14 @@
 #pragma once
 
 #include "options/options.hpp"
-using namespace options;
 #include "api/plugin-api.hpp"
 
 #include "export.hpp"
 
+namespace axis_opts_impl {
+
+using namespace options;
+
 struct OTR_SPLINE_EXPORT axis_opts final
 {
     enum max_clamp
@@ -52,3 +55,7 @@ private:
     QString prefix_;
     Axis axis_;
 };
+
+} // ns axis_opts_impl
+
+using axis_opts_impl::axis_opts;