+ fix warning of unused variable

+ when clearing scene graph then also empty internal lists
+ whitespace changes

src/Gui/DocumentRecovery.cpp

@@ -453,7 +453,7 @@ void DocumentRecovery::contextMenuEvent(QContextMenuEvent* ev)
     QList<QTreeWidgetItem*> items = d_ptr->ui.treeWidget->selectedItems();
     if (!items.isEmpty()) {
         QMenu menu;
-        QAction* rem = menu.addAction(tr("Delete"), this, SLOT(onDeleteSection()));
+        menu.addAction(tr("Delete"), this, SLOT(onDeleteSection()));
         menu.exec(ev->globalPos());
     }
 }

src/Gui/View3DInventorViewer.cpp

@@ -608,12 +608,10 @@ void View3DInventorViewer::addViewProvider(ViewProvider* pcProvider)
     }
 
     SoSeparator* fore = pcProvider->getFrontRoot();
-
     if (fore)
         foregroundroot->addChild(fore);
 
     SoSeparator* back = pcProvider->getBackRoot();
-
     if (back)
         backgroundroot->addChild(back);
 
@@ -634,12 +632,10 @@ void View3DInventorViewer::removeViewProvider(ViewProvider* pcProvider)
     }
 
     SoSeparator* fore = pcProvider->getFrontRoot();
-
     if (fore)
         foregroundroot->removeChild(fore);
 
     SoSeparator* back = pcProvider->getBackRoot();
-
     if (back)
         backgroundroot->removeChild(back);
 
@@ -811,12 +807,15 @@ void View3DInventorViewer::setNavigationType(Base::Type t)
         return; // nothing to do
 
     Base::BaseClass* base = static_cast<Base::BaseClass*>(t.createInstance());
-
     if (!base)
         return;
 
     if (!base->getTypeId().isDerivedFrom(NavigationStyle::getClassTypeId())) {
         delete base;
+#if FC_DEBUG
+        SoDebugError::postWarning("View3DInventorViewer::setNavigationType",
+                                  "Navigation object must be of type NavigationStyle.");
+#endif // FC_DEBUG
         return;
     }
 
@@ -850,6 +849,11 @@ SbBool View3DInventorViewer::isBacklight(void) const
 void View3DInventorViewer::setSceneGraph(SoNode* root)
 {
     inherited::setSceneGraph(root);
+    if (!root) {
+        _ViewProviderSet.clear();
+        _ViewProviderMap.clear();
+        editViewProvider = 0;
+    }
 
     SoSearchAction sa;
     sa.setNode(this->backlight);
@@ -1093,7 +1097,6 @@ std::vector<SbVec2f> View3DInventorViewer::getGLPolygon(const std::vector<SbVec2
     float fRatio = vp.getViewportAspectRatio();
 
     std::vector<SbVec2f> poly;
-
     for (std::vector<SbVec2s>::const_iterator it = pnts.begin(); it != pnts.end(); ++it) {
         SbVec2s loc = *it - op;
         SbVec2f pos((float)loc[0]/(float)sp[0], (float)loc[1]/(float)sp[1]);
@@ -1144,7 +1147,6 @@ bool View3DInventorViewer::dumpToFile(SoNode* node, const char* filename, bool b
         }
 
         SoVectorOutput* out = vo->getOutput();
-
         if (!out || !out->openFile(filename)) {
             std::ostringstream a_out;
             a_out << "Cannot open file '" << filename << "'";
@@ -1207,7 +1209,6 @@ std::list<GLGraphicsItem*> View3DInventorViewer::getGraphicsItems() const
 std::list<GLGraphicsItem*> View3DInventorViewer::getGraphicsItemsOfType(const Base::Type& type) const
 {
     std::list<GLGraphicsItem*> items;
-
     for (std::list<GLGraphicsItem*>::const_iterator it = this->graphicsItems.begin(); it != this->graphicsItems.end(); ++it) {
         if ((*it)->isDerivedFrom(type))
             items.push_back(*it);
@@ -1621,7 +1622,6 @@ void View3DInventorViewer::setViewDirection(SbVec3f dir)
         cam->orientation.setValue(SbRotation(SbVec3f(0, 0, -1), dir));
 }
 
-
 SbVec3f View3DInventorViewer::getUpDirection() const
 {
     SoCamera* cam = this->getSoRenderManager()->getCamera();
@@ -2109,10 +2109,8 @@ void View3DInventorViewer::viewSelection()
     root->ref();
 
     std::vector<App::DocumentObject*> selection = Selection().getObjectsOfType(App::DocumentObject::getClassTypeId());
-
     for (std::vector<App::DocumentObject*>::iterator it = selection.begin(); it != selection.end(); ++it) {
         ViewProvider* vp = Application::Instance->getViewProvider(*it);
-
         if (vp) {
             root->addChild(vp->getRoot());
         }
@@ -2260,7 +2258,6 @@ void View3DInventorViewer::afterRealizeHook(void)
 // to make sure the mouse pointer cursor is updated.
 void View3DInventorViewer::setViewing(SbBool enable)
 {
-
     if (this->isViewing() == enable) {
         return;
     }
@@ -2606,7 +2603,6 @@ void View3DInventorViewer::setComponentCursor(QCursor cursor)
 void View3DInventorViewer::selectCB(void* viewer, SoPath* path)
 {
     ViewProvider* vp = static_cast<View3DInventorViewer*>(viewer)->getViewProviderByPath(path);
-
     if (vp && vp->useNewSelectionModel()) {
     }
 }
@@ -2614,7 +2610,6 @@ void View3DInventorViewer::selectCB(void* viewer, SoPath* path)
 void View3DInventorViewer::deselectCB(void* viewer, SoPath* path)
 {
     ViewProvider* vp = static_cast<View3DInventorViewer*>(viewer)->getViewProviderByPath(path);
-
     if (vp && vp->useNewSelectionModel()) {
     }
 }
@@ -2622,7 +2617,6 @@ void View3DInventorViewer::deselectCB(void* viewer, SoPath* path)
 SoPath* View3DInventorViewer::pickFilterCB(void* viewer, const SoPickedPoint* pp)
 {
     ViewProvider* vp = static_cast<View3DInventorViewer*>(viewer)->getViewProviderByPath(pp->getPath());
-
     if (vp && vp->useNewSelectionModel()) {
         std::string e = vp->getElement(pp->getDetail());
         vp->getSelectionShape(e.c_str());
@@ -2655,7 +2649,6 @@ ViewProvider* View3DInventorViewer::getViewProviderByPath(SoPath* path) const
     for (std::set<ViewProvider*>::const_iterator it = _ViewProviderSet.begin(); it != _ViewProviderSet.end(); ++it) {
         for (int i = 0; i<path->getLength(); i++) {
             SoNode* node = path->getNode(i);
-
             if ((*it)->getRoot() == node) {
                 return (*it);
             }
@@ -2673,7 +2666,6 @@ ViewProvider* View3DInventorViewer::getViewProviderByPathFromTail(SoPath* path)
 
         if (node->isOfType(SoSeparator::getClassTypeId())) {
             std::map<SoSeparator*,ViewProvider*>::const_iterator it = _ViewProviderMap.find(static_cast<SoSeparator*>(node));
-
             if (it != _ViewProviderMap.end()) {
                 return it->second;
             }
@@ -2686,7 +2678,6 @@ ViewProvider* View3DInventorViewer::getViewProviderByPathFromTail(SoPath* path)
 std::vector<ViewProvider*> View3DInventorViewer::getViewProvidersOfType(const Base::Type& typeId) const
 {
     std::vector<ViewProvider*> views;
-
     for (std::set<ViewProvider*>::const_iterator it = _ViewProviderSet.begin(); it != _ViewProviderSet.end(); ++it) {
         if ((*it)->getTypeId().isDerivedFrom(typeId)) {
             views.push_back(*it);