diff --git a/src/Gui/DemoMode.cpp b/src/Gui/DemoMode.cpp index 901992ebd..393a04d11 100644 --- a/src/Gui/DemoMode.cpp +++ b/src/Gui/DemoMode.cpp @@ -28,7 +28,7 @@ # include # include # include -#include +# include #endif #include "DemoMode.h" diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index 15d3d5124..99357987c 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -666,7 +666,7 @@ void TreeWidget::onTestStatus(void) void TreeWidget::onItemEntered(QTreeWidgetItem * item) { // object item selected - if ( item && item->type() == TreeWidget::ObjectType ) { + if (item && item->type() == TreeWidget::ObjectType) { DocumentObjectItem* obj = static_cast(item); obj->displayStatusInfo(); } @@ -881,8 +881,6 @@ DocumentItem::~DocumentItem() connectExpObject.disconnect(); } - - void DocumentItem::slotInEdit(const Gui::ViewProviderDocumentObject& v) { std::string name (v.getObject()->getNameInDocument()); @@ -1098,8 +1096,8 @@ void DocumentItem::slotHighlightObject (const Gui::ViewProviderDocumentObject& o default: break; } + jt->second->setFont(0,f); - } void DocumentItem::slotExpandObject (const Gui::ViewProviderDocumentObject& obj,const Gui::TreeItemMode& mode) @@ -1299,7 +1297,7 @@ std::vector DocumentItem::getAllParents(DocumentObjectItem* for (std::vector::iterator it = inlist.begin(); it != inlist.end(); ++it) { Gui::ViewProvider* vp = pDocument->getViewProvider(*it); - if(!vp) + if (!vp) continue; std::vector child = vp->claimChildren(); for (std::vector::iterator jt = child.begin(); jt != child.end(); ++jt) { diff --git a/src/Mod/Mesh/Gui/MeshSelection.h b/src/Mod/Mesh/Gui/MeshSelection.h index 749f7c96d..9d5bcc921 100644 --- a/src/Mod/Mesh/Gui/MeshSelection.h +++ b/src/Mod/Mesh/Gui/MeshSelection.h @@ -78,7 +78,6 @@ protected: void stopInteractiveCallback(Gui::View3DInventorViewer* viewer); private: - static void selectGLCallback(void * ud, SoEventCallback * n); static void pickFaceCallback(void * ud, SoEventCallback * n);