diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 368bc5b68c..dab64929af 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -1020,7 +1020,7 @@ void MDIViewPage::clearSceneSelection() { // Base::Console().Message("MDIVP::clearSceneSelection()\n"); blockSelection(true); - m_sceneSelected.clear(); + qgSceneSelected.clear(); std::vector views = m_view->getViews(); @@ -1100,35 +1100,35 @@ void MDIViewPage::sceneSelectionManager() QList sceneSel = m_view->scene()->selectedItems(); if (sceneSel.isEmpty()) { - m_sceneSelected.clear(); //TODO: need to signal somebody? Tree? handled elsewhere + qgSceneSelected.clear(); //TODO: need to signal somebody? Tree? handled elsewhere //clearSelection return; } - if (m_sceneSelected.isEmpty() && + if (qgSceneSelected.isEmpty() && !sceneSel.isEmpty()) { - m_sceneSelected.push_back(sceneSel.front()); + qgSceneSelected.push_back(sceneSel.front()); return; } - //add to m_sceneSelected anything that is in q_sceneSel + //add to qgSceneSelected anything that is in q_sceneSel for (auto qts: sceneSel) { bool found = false; - for (auto ms: m_sceneSelected) { + for (auto ms: qgSceneSelected) { if ( qts == ms ) { found = true; break; } } if (!found) { - m_sceneSelected.push_back(qts); + qgSceneSelected.push_back(qts); break; } } - //remove items from m_sceneSelected that are not in q_sceneSel + //remove items from qgSceneSelected that are not in q_sceneSel QList m_new; - for (auto m: m_sceneSelected) { + for (auto m: qgSceneSelected) { for (auto q: sceneSel) { if (m == q) { m_new.push_back(m); @@ -1136,7 +1136,7 @@ void MDIViewPage::sceneSelectionManager() } } } - m_sceneSelected = m_new; + qgSceneSelected = m_new; } //! update Tree Selection from QGraphicsScene selection @@ -1154,7 +1154,7 @@ void MDIViewPage::sceneSelectionChanged() std::vector treeSel = Gui::Selection().getSelectionEx(); // QList sceneSel = m_view->scene()->selectedItems(); - QList sceneSel = m_sceneSelected; + QList sceneSel = qgSceneSelected; //check if really need to change selection bool sameSel = compareSelections(treeSel,sceneSel); @@ -1173,7 +1173,7 @@ void MDIViewPage::setTreeToSceneSelect(void) blockSelection(true); Gui::Selection().clearSelection(); // QList sceneSel = m_view->scene()->selectedItems(); //"no particular order"!!! - QList sceneSel = m_sceneSelected; + QList sceneSel = qgSceneSelected; for (QList::iterator it = sceneSel.begin(); it != sceneSel.end(); ++it) { QGIView *itemView = dynamic_cast(*it); if(itemView == 0) { diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index 375a59346a..c9ce3794b5 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -163,7 +163,7 @@ private: QPrinter::PaperSize m_paperSize; ViewProviderPage *m_vpPage; - QList m_sceneSelected; + QList qgSceneSelected; QList deleteItems; };