Tests/Toponaming: Post-merge cleanup

src/Mod/Part/App/TopoShape.h

@@ -677,27 +677,6 @@ public:
                                        const std::vector<TopoShape> &sources,
                                        const char *op=nullptr);
 
-    /** Helper class to return the generated and modified shape given an input shape
-     *
-     * Shape history information is extracted using OCCT APIs
-     * BRepBuilderAPI_MakeShape::Generated/Modified(). However, there is often
-     * some glitches in various derived class. So we use this class as an
-     * abstraction, and create various derived classes to deal with the glitches.
-     */
-    struct PartExport Mapper {
-        /// Helper vector for temporary storage of both generated and modified shapes
-        mutable std::vector<TopoDS_Shape> _res;
-        virtual ~Mapper() {}
-        /// Return a list of shape generated from the given input shape
-        virtual const std::vector<TopoDS_Shape> &generated(const TopoDS_Shape &) const {
-            return _res;
-        }
-        /// Return a list of shape modified from the given input shape
-        virtual const std::vector<TopoDS_Shape> &modified(const TopoDS_Shape &) const {
-            return _res;
-        }
-    };
-
     /** Make a compound shape
      *
      * @param shapes: input shapes

src/Mod/Part/App/TopoShapeExpansion.cpp

@@ -45,6 +45,8 @@
 #include "TopoShapeOpCode.h"
 #include "FaceMaker.h"
 
+#include <App/ElementNamingUtils.h>
+
 
 FC_LOG_LEVEL_INIT("TopoShape", true, true)  // NOLINT
 
@@ -606,31 +608,31 @@ struct NameInfo
 
 const std::string& modPostfix()
 {
-    static std::string postfix(TopoShape::elementMapPrefix() + ":M");
+    static std::string postfix(Data::POSTFIX_MOD);
     return postfix;
 }
 
 const std::string& modgenPostfix()
 {
-    static std::string postfix(modPostfix() + "G");
+    static std::string postfix(Data::POSTFIX_MODGEN);
     return postfix;
 }
 
 const std::string& genPostfix()
 {
-    static std::string postfix(TopoShape::elementMapPrefix() + ":G");
+    static std::string postfix(Data::POSTFIX_GEN);
     return postfix;
 }
 
 const std::string& upperPostfix()
 {
-    static std::string postfix(TopoShape::elementMapPrefix() + ":U");
+    static std::string postfix(Data::POSTFIX_UPPER);
     return postfix;
 }
 
 const std::string& lowerPostfix()
 {
-    static std::string postfix(TopoShape::elementMapPrefix() + ":L");
+    static std::string postfix(Data::POSTFIX_LOWER);
     return postfix;
 }