From a3622ee49feb4391e3c1015f8922095e75af538f Mon Sep 17 00:00:00 2001
From: donovaly <uwestoehr@lyx.org>
Date: Fri, 17 Jan 2020 21:31:49 +0100
Subject: [PATCH] [TD] rename some Draw* elements - try 2

as discussed here: https://forum.freecadweb.org/viewtopic.php?p=360042#p360042
---
 src/Mod/TechDraw/App/DrawWeldSymbol.cpp    | 4 ++--
 src/Mod/TechDraw/Gui/TaskActiveView.cpp    | 2 +-
 src/Mod/TechDraw/Gui/TaskLeaderLine.cpp    | 2 +-
 src/Mod/TechDraw/Gui/TaskRichAnno.cpp      | 2 +-
 src/Mod/TechDraw/Gui/TaskSectionView.cpp   | 2 +-
 src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp
index 638ee17b03..155c7dea99 100644
--- a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp
+++ b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp
@@ -87,14 +87,14 @@ void DrawWeldSymbol::onSettingDocument()
         return;
     }
 
-    std::string tileName1 = doc->getUniqueObjectName("DrawTileWeld");
+    std::string tileName1 = doc->getUniqueObjectName("TileWeld");
     auto tile1Obj( doc->addObject( "TechDraw::DrawTileWeld", tileName1.c_str() ) );
     DrawTileWeld* tile1 = dynamic_cast<DrawTileWeld*>(tile1Obj);
     if (tile1 != nullptr) {
         tile1->TileParent.setValue(this);
     }
 
-    std::string tileName2 = doc->getUniqueObjectName("DrawTileWeld");
+    std::string tileName2 = doc->getUniqueObjectName("TileWeld");
     auto tile2Obj( doc->addObject( "TechDraw::DrawTileWeld", tileName2.c_str() ) );
     DrawTileWeld* tile2 = dynamic_cast<DrawTileWeld*>(tile2Obj);
     if (tile2 != nullptr) {
diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
index 8e61eeaa29..1bb61b5623 100644
--- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp
@@ -116,7 +116,7 @@ TechDraw::DrawViewSymbol* TaskActiveView::createActiveView(void)
 {
 //    Base::Console().Message("TAV::createActiveView()\n");
 
-    std::string symbolName = m_pageFeat->getDocument()->getUniqueObjectName("DrawActiveView");
+    std::string symbolName = m_pageFeat->getDocument()->getUniqueObjectName("ActiveView");
     std::string symbolType = "TechDraw::DrawViewSymbol";
 
     std::string pageName = m_pageFeat->getNameInDocument();
diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
index ddfb437cfa..5b87221bd9 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -261,7 +261,7 @@ void TaskLeaderLine::setUiEdit()
 void TaskLeaderLine::createLeaderFeature(std::vector<Base::Vector3d> converted)
 {
 //    Base::Console().Message("TTL::createLeaderFeature()\n");
-    m_leaderName = m_basePage->getDocument()->getUniqueObjectName("DrawLeaderLine");
+    m_leaderName = m_basePage->getDocument()->getUniqueObjectName("LeaderLine");
     m_leaderType = "TechDraw::DrawLeaderLine";
 
     std::string PageName = m_basePage->getNameInDocument();
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
index fec698e24f..4b34908314 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
@@ -281,7 +281,7 @@ void TaskRichAnno::onEditorExit(void)
 void TaskRichAnno::createAnnoFeature()
 {
 //    Base::Console().Message("TRA::createAnnoFeature()");
-    std::string annoName = m_basePage->getDocument()->getUniqueObjectName("DrawRichAnno");
+    std::string annoName = m_basePage->getDocument()->getUniqueObjectName("RichTextAnnotation");
     std::string annoType = "TechDraw::DrawRichAnno";
 
     std::string PageName = m_basePage->getNameInDocument();
diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
index 964a63ebd5..c5c8c5567e 100644
--- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp
+++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp
@@ -351,7 +351,7 @@ TechDraw::DrawViewSection* TaskSectionView::createSectionView(void)
     Gui::Command::openCommand("Create SectionView");
     TechDraw::DrawViewSection* newSection = nullptr;
     if (m_section == nullptr) {
-        sectionName = m_base->getDocument()->getUniqueObjectName("DrawViewSection");
+        sectionName = m_base->getDocument()->getUniqueObjectName("SectionView");
         std::string sectionType = "TechDraw::DrawViewSection";
 
         TechDraw::DrawPage* page = m_base->findParentPage();
diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
index 18829d0d05..5e42060dfd 100644
--- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
+++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp
@@ -434,7 +434,7 @@ TechDraw::DrawWeldSymbol* TaskWeldingSymbol::createWeldingSymbol(void)
 {
 //    Base::Console().Message("TWS::createWeldingSymbol()\n");
     
-    std::string symbolName = m_leadFeat->getDocument()->getUniqueObjectName("DrawWeldSymbol");
+    std::string symbolName = m_leadFeat->getDocument()->getUniqueObjectName("WeldSymbol");
     std::string symbolType = "TechDraw::DrawWeldSymbol";
 
     TechDraw::DrawPage* page = m_leadFeat->findParentPage();