Skip to content

Commit

Permalink
Part: code formating, white spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
berndhahnebach authored and wwmayer committed Feb 18, 2017
1 parent 54bbd79 commit 4169e94
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/Workbench.cpp
Expand Up @@ -133,7 +133,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
*boolop << "Part_Boolean" << "Part_Cut" << "Part_Fuse" << "Part_Common"
<< "Part_CompJoinFeatures" << "Part_CompSplitFeatures" << "Part_CheckGeometry" << "Part_Section"
<< "Part_CrossSections";

Gui::ToolBarItem* measure = new Gui::ToolBarItem(root);
measure->setCommand("Measure");
*measure << "Part_Measure_Linear" << "Part_Measure_Angular" << "Separator" << "Part_Measure_Clear_All" << "Part_Measure_Toggle_All"
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Part/InitGui.py
@@ -1,4 +1,4 @@
# Part gui init module
# Part gui init module
# (c) 2003 Juergen Riegel
#
# Gathering all the information to start FreeCAD
Expand Down Expand Up @@ -48,7 +48,7 @@ def Initialize(self):
try:
Part.BOPTools.addCommands()
except Exception as err:
FreeCAD.Console.PrintError("Features from BOPTools package cannot be loaded. {err}\n".format(err= err.message))
FreeCAD.Console.PrintError("Features from BOPTools package cannot be loaded. {err}\n".format(err= err.message))

def GetClassName(self):
return "PartGui::Workbench"
Expand Down

1 comment on commit 4169e94

@looooo
Copy link
Contributor

@looooo looooo commented on 4169e94 Feb 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@berndhahnebach I know it's important to do formating... but I just want to let you know that these kind of commits can lead to merge-conflicts. Once I had a file that was simple transformed from tabs to space, and all the python3 porting had to be done again.
I think everyone will experience things like this with local branches, but python3 has impact on nearly everything in freecad, so the chance is quite big to get merge conflicts...
err.message is not available in python3 so I got a merge conflict with this. Not a big problem, just for your information ... ;-)

Please sign in to comment.