From 1f7ab061607a291f305a888e7650f83b719e6ab7 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 5 Feb 2023 14:18:59 +0000 Subject: [PATCH] Fix whitespace issues --- .github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml | 4 ++-- .github/labels.yml | 2 +- cMake/FindSMESH.cmake | 6 +++--- data/examples/CMakeLists.txt | 2 +- src/Mod/.gitattributes | 2 +- src/Mod/Material/StandardMaterial/Graphite.FCMat | 2 +- src/Mod/Spreadsheet/Gui/DlgBindSheet.h | 4 ++-- src/Mod/Spreadsheet/TestSpreadsheetGui.py | 3 +-- src/Mod/TechDraw/Gui/Resources/fonts/Y14.5Font.license | 2 +- src/Tools/updateppa.py | 4 +--- tools/build/debian.sh | 2 +- tools/build/fedora.sh | 2 +- tools/build/manjaro.sh | 2 +- tools/build/ubuntu.sh | 2 +- 14 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml b/.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml index 54c1365139..eacbe74092 100644 --- a/.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml @@ -55,7 +55,7 @@ body: id: description attributes: label: Problem description - description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error. + description: Describe the problem and how it impacts user experience, workflow, maintainability or speed of the code. If the problem appears to be a bug with the current functionality, provide as test case or recipe that reproduces the error. placeholder: Description of the problem validations: required: true @@ -65,7 +65,7 @@ body: label: Anything else? description: | Links? References? Anything that will give us more context about the issue you are encountering! - If there is a discussion about the problem on the forum, provide link(s) here. + If there is a discussion about the problem on the forum, provide link(s) here. Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. To attach a FCStd file, ZIP it first (GitHub won't recognize the extension otherwise). validations: diff --git a/.github/labels.yml b/.github/labels.yml index b2e8d169a8..b5143e1d52 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -31,7 +31,7 @@ WB MeshPart: WB OpenSCAD: - 'src/Mod/OpenSCAD/**/*' -WB Part: +WB Part: - 'src/Mod/Part/**/*' WB PartDesign: diff --git a/cMake/FindSMESH.cmake b/cMake/FindSMESH.cmake index f1b7d81bbb..fa48982c1d 100644 --- a/cMake/FindSMESH.cmake +++ b/cMake/FindSMESH.cmake @@ -13,7 +13,7 @@ find_package(VTK REQUIRED) if(CMAKE_SIZEOF_VOID_P EQUAL 8) add_definitions(-DSALOME_USE_64BIT_IDS) endif(CMAKE_SIZEOF_VOID_P EQUAL 8) - + IF (CMAKE_COMPILER_IS_GNUCC) FIND_PATH(SMESH_INCLUDE_DIR SMESH_Mesh.hxx # These are default search paths, why specify them? @@ -27,7 +27,7 @@ ENDIF (CMAKE_COMPILER_IS_GNUCC) IF(SMESH_INCLUDE_DIR) SET(SMESH_INC_ROOT "${SMESH_INCLUDE_DIR}/..") # Append extra include dirs - SET(SMESH_INCLUDE_DIR + SET(SMESH_INCLUDE_DIR "${SMESH_INCLUDE_DIR}; ${SMESH_INC_ROOT}/Controls; ${SMESH_INC_ROOT}/Driver; @@ -53,7 +53,7 @@ SET(SMESH_FOUND FALSE) IF(SMESH_LIBRARY) SET(SMESH_FOUND TRUE) GET_FILENAME_COMPONENT(SMESH_LIBRARY_DIR ${SMESH_LIBRARY} PATH) - set(SMESH_LIBRARIES + set(SMESH_LIBRARIES ${SMESH_LIBRARY_DIR}/libDriver.so ${SMESH_LIBRARY_DIR}/libDriverDAT.so ${SMESH_LIBRARY_DIR}/libDriverSTL.so diff --git a/data/examples/CMakeLists.txt b/data/examples/CMakeLists.txt index 2da83cf4d4..a93957637b 100644 --- a/data/examples/CMakeLists.txt +++ b/data/examples/CMakeLists.txt @@ -1,5 +1,5 @@ -SET(Examples_Files +SET(Examples_Files Schenkel.stp draft_test_objects.FCStd EngineBlock.FCStd diff --git a/src/Mod/.gitattributes b/src/Mod/.gitattributes index 5c90b4c35b..04ab027ee9 100644 --- a/src/Mod/.gitattributes +++ b/src/Mod/.gitattributes @@ -20,7 +20,7 @@ JtReader export-ignore # find AddonManager Arch Complete Draft Idf Fem Material OpenSCAD Show Tux -type f -name '*.*' | sed 's|.*\.||' | sort -u # search for a specific file ending in normalized folders -# find AddonManager Arch Complete Draft Idf Fem Material OpenSCAD Show Tux -type f -name '*.emn' +# find AddonManager Arch Complete Draft Idf Fem Material OpenSCAD Show Tux -type f -name '*.emn' # normalize the line endings of the following files diff --git a/src/Mod/Material/StandardMaterial/Graphite.FCMat b/src/Mod/Material/StandardMaterial/Graphite.FCMat index abfad7f039..51f3c7d643 100644 --- a/src/Mod/Material/StandardMaterial/Graphite.FCMat +++ b/src/Mod/Material/StandardMaterial/Graphite.FCMat @@ -1,7 +1,7 @@ ; Graphite ; Uwe Stöhr, LGPL ; information about the content of such cards can be found on the wiki: -; https://www.freecadweb.org/wiki/Material +; https://www.freecadweb.org/wiki/Material ; file created by FreeCAD 0.20.24516 (Git) [General] diff --git a/src/Mod/Spreadsheet/Gui/DlgBindSheet.h b/src/Mod/Spreadsheet/Gui/DlgBindSheet.h index 02587dd503..eab41e1509 100644 --- a/src/Mod/Spreadsheet/Gui/DlgBindSheet.h +++ b/src/Mod/Spreadsheet/Gui/DlgBindSheet.h @@ -35,11 +35,11 @@ namespace SpreadsheetGui { class DlgBindSheet : public QDialog { Q_OBJECT - + public: explicit DlgBindSheet(Spreadsheet::Sheet *sheet, const std::vector &range, QWidget *parent = nullptr); ~DlgBindSheet() override; - + void accept() override; public Q_SLOTS: diff --git a/src/Mod/Spreadsheet/TestSpreadsheetGui.py b/src/Mod/Spreadsheet/TestSpreadsheetGui.py index d3d5d835d1..3278a1a8a4 100644 --- a/src/Mod/Spreadsheet/TestSpreadsheetGui.py +++ b/src/Mod/Spreadsheet/TestSpreadsheetGui.py @@ -34,7 +34,7 @@ class SpreadsheetGuiCases(unittest.TestCase): self.doc = FreeCAD.newDocument() self.sheet = self.doc.addObject("Spreadsheet::Sheet", "Spreadsheet") self.view_provider = self.sheet.ViewObject - + def getTableView(self): return self.view_provider.getView() @@ -75,4 +75,3 @@ class SpreadsheetGuiCases(unittest.TestCase): FreeCAD.Gui.runCommand("Std_Paste", 0) self.doc.recompute() self.assertEqual(self.sheet.get("A1"), self.sheet.get("E5")) - diff --git a/src/Mod/TechDraw/Gui/Resources/fonts/Y14.5Font.license b/src/Mod/TechDraw/Gui/Resources/fonts/Y14.5Font.license index 2428b7c572..24e10061c6 100644 --- a/src/Mod/TechDraw/Gui/Resources/fonts/Y14.5Font.license +++ b/src/Mod/TechDraw/Gui/Resources/fonts/Y14.5Font.license @@ -4,5 +4,5 @@ Original Y14.5-2018.ttf courtesy of Peter Kanold (https://peterkanold.com/) "This font is free to use for all personal and commercial applications. Copying and redistribution of the font is encouraged. Credit to me as the creator of the font is appreciated but not necessary." -Modified 2023 for the FreeCAD CAx development system by WandererFan (wandererfan@gmail.com). Modifications are distributed under LGPL2 or later. +Modified 2023 for the FreeCAD CAx development system by WandererFan (wandererfan@gmail.com). Modifications are distributed under LGPL2 or later. diff --git a/src/Tools/updateppa.py b/src/Tools/updateppa.py index 60c49c2a55..52248ae13e 100644 --- a/src/Tools/updateppa.py +++ b/src/Tools/updateppa.py @@ -41,8 +41,6 @@ def runUpdate(filename): def main(): runUpdate(sys.argv[1]) - + if __name__ == "__main__": main() - - diff --git a/tools/build/debian.sh b/tools/build/debian.sh index 26456c72c7..2fd181a679 100755 --- a/tools/build/debian.sh +++ b/tools/build/debian.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh apt-get install --no-install-recommends --yes build-essential cmake doxygen \ git libboost-date-time-dev libboost-dev libboost-filesystem-dev \ libboost-graph-dev libboost-iostreams-dev libboost-program-options-dev \ diff --git a/tools/build/fedora.sh b/tools/build/fedora.sh index 7c8823c883..2819f855fd 100644 --- a/tools/build/fedora.sh +++ b/tools/build/fedora.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh dnf --assumeyes install boost-devel cmake Coin3 Coin3-devel desktop-file-utils doxygen \ eigen3-devel freeimage-devel freetype freetype-devel gcc gettext git libspnav-devel \ libXmu-devel med med-devel mesa-libGLU-devel ode-devel opencascade-devel \ diff --git a/tools/build/manjaro.sh b/tools/build/manjaro.sh index b9edc23695..15cc7d0ccd 100755 --- a/tools/build/manjaro.sh +++ b/tools/build/manjaro.sh @@ -3,5 +3,5 @@ pacman --noconfirm --sync boost boost-libs cmake coin curl desktop-file-utils do eigen gc gcc-fortran git glew gnu-free-fonts guile hicolor-icon-theme jsoncpp \ libspnav libtool make med opencascade pyside2 pyside2-tools python-matplotlib \ python-netcdf4 python-pivy qt5-svg qt5-tools qt5-webengine qt5-webkit \ - shared-mime-info shiboken2 swig texinfo xerces-c + shared-mime-info shiboken2 swig texinfo xerces-c diff --git a/tools/build/ubuntu.sh b/tools/build/ubuntu.sh index 655292ee36..e61c5b824f 100644 --- a/tools/build/ubuntu.sh +++ b/tools/build/ubuntu.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh apt-get install --no-install-recommends --yes build-essential cmake doxygen git \ libboost-date-time-dev libboost-dev libboost-filesystem-dev \ libboost-graph-dev libboost-iostreams-dev libboost-program-options-dev \