From 292afa2a2eb466a4220681eb33c2c16a279251f3 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 19 Mar 2021 15:18:25 +0100
Subject: [PATCH] Import: [skip ci] avoid conflicting class names in global
 namespace

---
 src/Mod/Import/App/AppImportPy.cpp    | 3 ++-
 src/Mod/Import/Gui/AppImportGuiPy.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp
index 3f629d102b..f76e59bf15 100644
--- a/src/Mod/Import/App/AppImportPy.cpp
+++ b/src/Mod/Import/App/AppImportPy.cpp
@@ -82,6 +82,8 @@
 
 #include "ImpExpDxf.h"
 
+namespace Import {
+
 class ImportOCAFExt : public Import::ImportOCAF2
 {
 public:
@@ -98,7 +100,6 @@ private:
     }
 };
 
-namespace Import {
 class Module : public Py::ExtensionModule<Module>
 {
 public:
diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp
index e029d2db61..e081764279 100644
--- a/src/Mod/Import/Gui/AppImportGuiPy.cpp
+++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp
@@ -138,6 +138,7 @@
 
 FC_LOG_LEVEL_INIT("Import", true, true)
 
+namespace ImportGui {
 class OCAFBrowser
 {
 public:
@@ -382,7 +383,6 @@ public:
     }
 };
 
-namespace ImportGui {
 class Module : public Py::ExtensionModule<Module>
 {
 public: