Skip to content

Commit

Permalink
Trim lines ending with superfluous whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
luzpaz committed Dec 22, 2024
1 parent cad2f33 commit 8aa0b67
Show file tree
Hide file tree
Showing 28 changed files with 49 additions and 48 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The FreeCAD Contribution Process is expressed here with the following specific g
1. FreeCAD uses the git distributed revision control system.
2. Source code for the main application and related subprojects is hosted on github.com in the FreeCAD organization.
3. Problems are discrete, well-defined limitations or bugs.
4. FreeCAD uses GitHub's issue-tracking system to track problems and contributions. For help requests and general discussions, use the project forum.
4. FreeCAD uses GitHub's issue-tracking system to track problems and contributions. For help requests and general discussions, use the project forum.
5. Contributions are sets of code changes that resolve a single problem.
6. FreeCAD uses the Pull Request workflow for evaluating and accepting contributions.

Expand All @@ -47,7 +47,7 @@ The FreeCAD Contribution Process is expressed here with the following specific g
## 5. Contribution Requirements

1. Contributions are submitted in the form of Pull Requests (PR).
2. Maintainers and Contributors MUST have a GitHub account and SHOULD use their real names or a well-known alias.
2. Maintainers and Contributors MUST have a GitHub account and SHOULD use their real names or a well-known alias.
3. If the GitHub username differs from the username on the FreeCAD Forum, effort SHOULD be taken to avoid confusion.
4. A PR SHOULD be a minimal and accurate answer to exactly one identified and agreed-on problem.
5. A PR SHOULD refrain from adding additional dependencies to the FreeCAD project unless no other option is available.
Expand Down
10 changes: 5 additions & 5 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Security Policy

The FreeCAD project is a FOSS (Free and Open-Source Software) project that has a community of thousands of users and
The FreeCAD project is a FOSS (Free and Open-Source Software) project that has a community of thousands of users and
hundreds of developers worldwide. We encourage responsible reporting of security vulnerabilities that may affect users
of this software, and will endeavor to address these vulnerabilities when they are discovered.

## Bounties

FreeCAD does not have a program to pay bounties for security bugs. If you discover a vulnerability that affects a part
of the FreeCAD project (either directly in FreeCAD, in a library it depends on, or in any of the various other
FreeCAD does not have a program to pay bounties for security bugs. If you discover a vulnerability that affects a part
of the FreeCAD project (either directly in FreeCAD, in a library it depends on, or in any of the various other
subprojects such as our website, forums, etc.) we ask you to join the large community of volunteer contributors and
file a report about the issue.

Note that funds may be available from the [FreeCAD Project Association (FPA)](https://fpa.freecad.org) to pursue
security research and/or the development of fixes to any vulnerabilities discovered. However, vulnerabilities held as
Note that funds may be available from the [FreeCAD Project Association (FPA)](https://fpa.freecad.org) to pursue
security research and/or the development of fixes to any vulnerabilities discovered. However, vulnerabilities held as
hostage in demands for "bounties" will not be entertained. Contact the FPA at [email protected] for more information.

## Supported Versions
Expand Down
2 changes: 1 addition & 1 deletion cMake/FindPyCXX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ if(PYCXX_FOUND)
${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx
)

#set old 6.2 pycxx compatibility
#set old 6.2 pycxx compatibility
list(APPEND PYCXX_SOURCES ${PYCXX_SOURCE_DIR}/cxx_exceptions.cxx)
add_definitions(-DPYCXX_6_2_COMPATIBILITY)
#end old compatibility
Expand Down
10 changes: 5 additions & 5 deletions src/Doc/sphinx/DocumentObject.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ The FreeCAD Document Object
:maxdepth: 4

.. automodule:: DocumentObject

.. autoclass:: DocumentObject
:members:

.. method:: __setstate__(value)

allows to save custom attributes of this object as strings, so they can be saved when saving the FreeCAD document

.. method:: __getstate__()

reads values previously saved with __setstate__()
2 changes: 1 addition & 1 deletion src/Doc/sphinx/Matrix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ The Matrix object

.. toctree::
:maxdepth: 4

.. automodule:: FreeCAD

.. autoclass:: Matrix
Expand Down
2 changes: 1 addition & 1 deletion src/Doc/sphinx/Placement.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ The Placement object

.. toctree::
:maxdepth: 4

.. automodule:: FreeCAD

.. autoclass:: Placement
Expand Down
2 changes: 1 addition & 1 deletion src/Doc/sphinx/Vector.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ The Vector object

.. toctree::
:maxdepth: 4

.. automodule:: FreeCAD

.. autoclass:: Vector
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/DlgCheckableMessageBox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ DlgCheckableMessageBox::DlgCheckableMessageBox(QWidget *parent) :
m_d->ui.setupUi(this);
m_d->ui.pixmapLabel->setVisible(false);
connect(m_d->ui.buttonBox, &QDialogButtonBox::accepted, this, &DlgCheckableMessageBox::accept);
connect(m_d->ui.buttonBox, &QDialogButtonBox::rejected, this, &DlgCheckableMessageBox::reject);
connect(m_d->ui.buttonBox, &QDialogButtonBox::rejected, this, &DlgCheckableMessageBox::reject);
connect(m_d->ui.buttonBox, &QDialogButtonBox::clicked,
this, &DlgCheckableMessageBox::slotClicked);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Gui/Inventor/SoFCTransform.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ namespace Gui
/**
* @class SoFCTransform
* @brief A temporary workaround for coin3d/coin#534.
*
*
* This class is a workaround for a missing feature to reduce the OpenGL stack size.
* The issue was reported here: https://github.com/coin3d/coin/issues/534
* And was merged here: https://github.com/coin3d/coin/pull/535
*
*
* Once this feature is available in all supported versions of Coin3D, this class should
* be removed and all instances should revert to using SoTransform.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/BIM/ArchComponent.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def onChanged(self, obj, prop):
prop: string
The name of the property that has changed.
"""

import math

ArchIFC.IfcProduct.onChanged(self, obj, prop)
Expand Down
6 changes: 3 additions & 3 deletions src/Mod/BIM/ArchWall.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def execute(self,obj):
if hasattr(baseProxy,"getPropertySet"):
# get full list of PropertySet
propSetListCur = baseProxy.getPropertySet(obj.Base)
# get updated name (if any) of the selected PropertySet
# get updated name (if any) of the selected PropertySet
propSetSelectedNameCur = baseProxy.getPropertySet(obj.Base,
propSetUuid=propSetPickedUuidPrev)
if propSetSelectedNameCur: # True if selection is not deleted
Expand Down Expand Up @@ -613,11 +613,11 @@ def onChanged(self, obj, prop):
else:
FreeCAD.Console.PrintError(translate("Arch","Error: Unable to modify the base object of this wall")+"\n")

if (prop == "ArchSketchPropertySet"
if (prop == "ArchSketchPropertySet"
and Draft.getType(obj.Base) == "ArchSketch"):
baseProxy = obj.Base.Proxy
if hasattr(baseProxy,"getPropertySet"):
uuid = baseProxy.getPropertySet(obj,
uuid = baseProxy.getPropertySet(obj,
propSetName=obj.ArchSketchPropertySet)
self.ArchSkPropSetPickedUuid = uuid
if (hasattr(obj,"ArchSketchData") and obj.ArchSketchData
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/BIM/Resources/ui/dialogConvertDocument.ui
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<item>
<widget class="QCheckBox" name="checkAskAgain">
<property name="toolTip">
<string>If this is checked, you won't be asked again when creating a new FreeCAD document,
<string>If this is checked, you won't be asked again when creating a new FreeCAD document,
and that document won't be turned into an IFC document automatically.
You can still turn a FreeCAD document into an IFC document manually, using
Utils -&gt; Make IFC project</string>
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/BIM/TestArch.py
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ def testViewGeneration(self):
level = Arch.makeFloor()
level.addObjects([wall, column])
App.ActiveDocument.recompute()

# Create a drawing view
section = Arch.makeSectionPlane(level)
drawing = Arch.make2DDrawing()
Expand All @@ -803,7 +803,7 @@ def testViewGeneration(self):
cut.ProjectionMode = "Cutfaces"
drawing.addObjects([view, cut])
App.ActiveDocument.recompute()

# Create a TD page
tpath = os.path.join(App.getResourceDir(),"Mod","TechDraw","Templates","A3_Landscape_blank.svg")
page = App.ActiveDocument.addObject("TechDraw::DrawPage", "Page")
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/App/FCBRepAlgoAPI_BooleanOperation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ FCBRepAlgoAPI_BooleanOperation::FCBRepAlgoAPI_BooleanOperation(const TopoDS_Shap
SetRunParallel(Standard_True);
SetNonDestructive(Standard_True);
}

void FCBRepAlgoAPI_BooleanOperation::setAutoFuzzy()
{
FCBRepAlgoAPIHelper::setAutoFuzzy(this);
Expand Down
8 changes: 4 additions & 4 deletions src/Mod/Part/App/MeasureClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ MeasureAreaInfoPtr MeasureAreaHandler(const App::SubObjectT& subject)
BRepGProp::SurfaceProperties(shape, gprops);
auto origin = gprops.CentreOfMass();

// TODO: Center of Mass might not lie on the surface, somehow snap to the closest point on the surface?
// TODO: Center of Mass might not lie on the surface, somehow snap to the closest point on the surface?

Base::Placement placement(Base::Vector3d(origin.X(), origin.Y(), origin.Z()), Base::Rotation());
return std::make_shared<MeasureAreaInfo>(true, getFaceArea(shape), placement);
Expand All @@ -340,7 +340,7 @@ MeasurePositionInfoPtr MeasurePositionHandler(const App::SubObjectT& subject)
return std::make_shared<MeasurePositionInfo>(false, Base::Vector3d());
}

TopoDS_Vertex vertex = TopoDS::Vertex(shape);
TopoDS_Vertex vertex = TopoDS::Vertex(shape);
auto point = BRep_Tool::Pnt(vertex);
return std::make_shared<MeasurePositionInfo>( true, Base::Vector3d(point.X(), point.Y(), point.Z()));
}
Expand All @@ -365,11 +365,11 @@ MeasureAngleInfoPtr MeasureAngleHandler(const App::SubObjectT& subject)
Base::Vector3d position;
if (sType == TopAbs_FACE) {
TopoDS_Face face = TopoDS::Face(shape);

GProp_GProps gprops;
BRepGProp::SurfaceProperties(face, gprops);
vec = gprops.CentreOfMass();

} else if (sType == TopAbs_EDGE) {
TopoDS_Edge edge = TopoDS::Edge(shape);

Expand Down
4 changes: 2 additions & 2 deletions src/Mod/Part/App/MeasureInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ class PartExport MeasureRadiusInfo : public MeasureInfo {
//! callback registrations
// TODO: is there more that one place that GeometryHandler is defined?
using GeometryHandler = std::function<Part::MeasureInfoPtr (App::SubObjectT)>;

class PartExport CallbackRegistrationRecord
{
public:
CallbackRegistrationRecord() = default;
CallbackRegistrationRecord(const std::string& module, const std::string& measureType, GeometryHandler callback) :
m_module(module), m_measureType(measureType), m_callback(callback)
{ }

std::string m_module;
std::string m_measureType;
GeometryHandler m_callback;
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/App/ShapeFix/ShapeFix_FixSmallFacePy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</Methode>
<Methode Name="fixShape">
<Documentation>
<UserDocu>Fixes issues in the overall geometric shape.
<UserDocu>Fixes issues in the overall geometric shape.
This function likely encapsulates higher-level fixes that involve multiple faces or elements.</UserDocu>
</Documentation>
</Methode>
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/Gui/TaskSweep.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ void SweepWidget::findShapes()
}
}

if (!shape.Infinite() &&
if (!shape.Infinite() &&
(shape.ShapeType() == TopAbs_FACE ||
shape.ShapeType() == TopAbs_WIRE ||
shape.ShapeType() == TopAbs_EDGE ||
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/parttests/ColorTransparencyTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def test_default_shape_color(self):
of 0 corresponds to a fully transparent color, which is not desirable. It changes
the transparency when loading to 1.0
"""

self._pg.SetUnsigned('DefaultShapeColor', 0xff000000) # red
obj = self._doc.addObject('Part::Box')

Expand Down
3 changes: 2 additions & 1 deletion src/Mod/PartDesign/App/FeatureHelix.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/***************************************************************************
* Copyright (c) 2010 Juergen Riegel <[email protected]> *
* 2020 David Österberg *
Expand Down Expand Up @@ -260,7 +261,7 @@ App::DocumentObjectExecReturn* Helix::execute()
if (SC.State() == TopAbs_IN) {
result.Reverse();
}

fix.LimitTolerance(result, Precision::Confusion() * size * Tolerance.getValue() ); // significant precision reduction due to helical approximation - needed to allow fusion to succeed

AddSubShape.setValue(result);
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/PartDesign/PartDesignTests/TestHelix.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def testGiantHelix(self):
helix.Angle = 0
helix.Mode = 0
self.Doc.recompute()

self.assertTrue(helix.Shape.isValid())
bbox = helix.Shape.BoundBox
self.assertAlmostEqual(bbox.ZMin/((10**exponent)**3),0,places=4)
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@
</property>
<property name="toolTip">
<string>Shape of line end caps. The default (round) should almost
always be the right choice. Flat or square caps are useful
always be the right choice. Flat or square caps are useful
if you are planning to use a drawing as a 1:1 cutting guide.
</string>
</property>
Expand Down
8 changes: 4 additions & 4 deletions src/Mod/TechDraw/Gui/Resources/fonts/osifont.license
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
osifont license:
osifont license:

osifont-lgpl3fe.ttf is used under one or more of the following licenses:
- GNU GPL licence version 3 with GPL font exception,
- GNU GPL licence version 2 with GPL font exception,
osifont-lgpl3fe.ttf is used under one or more of the following licenses:
- GNU GPL licence version 3 with GPL font exception,
- GNU GPL licence version 2 with GPL font exception,
- GNU LGPL licence version 3 with GPL font exception.


Expand Down
2 changes: 1 addition & 1 deletion src/Mod/TechDraw/LineGroup/ASME.Y14.2.2008.ElementDef.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ASME Y14.2-2008 line element definitions
# NOTE: ASME Y14.2-2008 explicitly does not define the lengths of line elements,
# but recommends lengths that "depict the appropriate line convention commensurate
# but recommends lengths that "depict the appropriate line convention commensurate
# with the drawing size and scale". The values used here are generally those
# from ISO128.
# NOTE: saving this file from a spreadsheet program (like LibreOffice Calc) may
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/TechDraw/Templates/locale/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This folder (`locale`) contains translations for [TechDraw workbench templates](https://wiki.freecad.org/TechDraw_Templates) in the parent `Templates` folder.
The name of each `locale` subfolder represents a language, which follows [IETF BCP 47 standardized codes](https://en.wikipedia.org/wiki/IETF_language_tag). The original TechDraw templates in the parent folder are written using American English (`en-US`).

As such, the most basic name for a locale subfolder will include an [ISO 639 language code](https://en.wikipedia.org/wiki/ISO_639) (e.g. `de` for German). If it's necessary, additional subtags can be added to describe language variants. For instance variants spoken in a particular country, or a specific script. Those subtags are combinable and are based in other standards.
As such, the most basic name for a locale subfolder will include an [ISO 639 language code](https://en.wikipedia.org/wiki/ISO_639) (e.g. `de` for German). If it's necessary, additional subtags can be added to describe language variants. For instance variants spoken in a particular country, or a specific script. Those subtags are combinable and are based in other standards.

The most common additional subtag is an additional country code to describe a regional variant of the language (e.g. `de-DE` for German spoken in Germany, `es-AR` for Spanish spoken in Argentina, or `zh-CN` for Simplified Chinese in Mainland China). Country subtags are based on [the ISO 3166-1 standard's country codes](https://en.wikipedia.org/wiki/ISO_3166-1).

Expand Down
2 changes: 1 addition & 1 deletion src/XDGData/org.freecad.FreeCAD.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<keyword>architecture</keyword>
<keyword>assembly</keyword>
<keyword>part</keyword>
<keyword translate="no">coin</keyword>
<keyword translate="no">coin</keyword>
</keywords>
<url type="homepage">https://www.freecad.org/</url>
<url type="bugtracker">https://github.com/FreeCAD/FreeCAD/issues</url>
Expand Down
2 changes: 1 addition & 1 deletion tools/build/MacOS/BUILD_OSX.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ If FreeCAD is installed via the bottle then one will have to wait for a new bott
If any of the dependencies FreeCAD relies on is updated FreeCAD will likely require a rebuild. Mac homebrew does provide a feature to pin packages at specific versions to prevent them from updating, and also allows setting of an environment variable to prevent homebrew from automatically checking for updates (which can slow things down). All that said, FreeCAD can be built using all the dependencies provided by Mac homebrew, but not using the formula file: instead cloning the source to an arbitrary path on a local filesystem. This provides a couple of advantages:

- If `brew cleanup` is run and FreeCAD was installed using the above-provided command, all source tarballs or bottles that were _checked out_ or downloaded during the install process will be deleted from the system. If a reinstall or upgrade is later required then homebrew will have to refetch the bottles, or reclone the git source again.
- Mac homebrew provides a method, _install flag_, for keeping the source regardless if the build succeeds or fails. The options are limited, however, and performing a standard `git clone` outside of homebrew is **much** preferred.
- Mac homebrew provides a method, _install flag_, for keeping the source regardless if the build succeeds or fails. The options are limited, however, and performing a standard `git clone` outside of homebrew is **much** preferred.
- Cloning the FreeCAD source allows passing **any** cmake flags not provided by the formula file
- Allowing the use of other build systems such as _ninja_
- Allowing the use of alternate compilers, e.g. _ccache_
Expand Down
2 changes: 1 addition & 1 deletion tools/build/WindowsInstaller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ msvcp140.dll
vcamp140.dll
vccorlib140.dll
vcomp140.dll
```
```
3. Open the file *Settings.nsh* with a text editor (both jEdit and Visual Studio Code are good editors for NSIS files). Edit the following paths to correspond to your system: `FILES_FREECAD` corresponds to your installation directory (e.g. `CMAKE_INSTALL_PREFIX` if you self-compiled) and `FILES_DEPS` is the folder you created with the MSVC redistributable files in it.
```
!define FILES_FREECAD "C:\FreeCAD\Installer\FreeCAD"
Expand Down

0 comments on commit 8aa0b67

Please sign in to comment.