Fix various trailing whitespace issues

cMake/FindOpenCV.cmake

@@ -3,10 +3,10 @@
 #
 # The following variables are optionally searched for defaults
 #  OpenCV_ROOT_DIR:            Base directory of OpenCv tree to use.
-#  OpenCV_FIND_REQUIRED_COMPONENTS : FIND_PACKAGE(OpenCV COMPONENTS ..) 
+#  OpenCV_FIND_REQUIRED_COMPONENTS : FIND_PACKAGE(OpenCV COMPONENTS ..)
 #    compatible interface. typically  CV CXCORE CVAUX HIGHGUI CVCAM .. etc.
 #
-# The following are set after configuration is done: 
+# The following are set after configuration is done:
 #  OpenCV_FOUND
 #  OpenCV_INCLUDE_DIR
 #  OpenCV_LIBRARIES
@@ -16,10 +16,10 @@
 #  OPENCV_* uppercase replaced by case sensitive OpenCV_*
 #  OPENCV_EXE_LINKER_FLAGS
 #  OPENCV_INCLUDE_DIR : replaced by plural *_DIRS
-# 
-# 2004/05 Jan Woetzel, Friso, Daniel Grest 
+#
+# 2004/05 Jan Woetzel, Friso, Daniel Grest
 # 2006/01 complete rewrite by Jan Woetzel
-# 1006/09 2nd rewrite introducing ROOT_DIR and PATH_SUFFIXES 
+# 1006/09 2nd rewrite introducing ROOT_DIR and PATH_SUFFIXES
 #   to handle multiple installed versions gracefully by Jan Woetzel
 #
 # tested with:
@@ -42,14 +42,14 @@ IF    (NOT OpenCV_FIND_COMPONENTS)
   SET(OpenCV_FIND_REQUIRED_COMPONENTS   CV CXCORE CVAUX HIGHGUI )
   IF   (WIN32)
     LIST(APPEND OpenCV_FIND_REQUIRED_COMPONENTS  CVCAM ) # WIN32 only actually
-  ENDIF(WIN32)  
+  ENDIF(WIN32)
 ENDIF (NOT OpenCV_FIND_COMPONENTS)
 
 
 # typical root dirs of installations, exactly one of them is used
 SET (OpenCV_POSSIBLE_ROOT_DIRS
   "${OpenCV_ROOT_DIR}"
-  "$ENV{OpenCV_ROOT_DIR}"  
+  "$ENV{OpenCV_ROOT_DIR}"
   "$ENV{OPENCV_DIR}"  # only for backward compatibility deprecated by ROOT_DIR
   "$ENV{OPENCV_HOME}" # only for backward compatibility
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Intel(R) Open Source Computer Vision Library_is1;Inno Setup: App Path]"
@@ -59,17 +59,17 @@ SET (OpenCV_POSSIBLE_ROOT_DIRS
   )
 
 
-# MIP Uni Kiel /opt/net network installation 
+# MIP Uni Kiel /opt/net network installation
 # get correct prefix for current gcc compiler version for gcc 3.x  4.x
 IF    (${CMAKE_COMPILER_IS_GNUCXX})
   IF    (NOT OpenCV_FIND_QUIETLY)
     MESSAGE(STATUS "Checking GNUCXX version 3/4 to determine  OpenCV /opt/net/ path")
   ENDIF (NOT OpenCV_FIND_QUIETLY)
-  EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE CXX_COMPILER_VERSION)  
+  EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE CXX_COMPILER_VERSION)
   IF   (CXX_COMPILER_VERSION MATCHES ".*3\\.[0-9].*")
     SET(IS_GNUCXX3 TRUE)
     LIST(APPEND OpenCV_POSSIBLE_ROOT_DIRS /opt/net/gcc33/OpenCV )
-  ENDIF(CXX_COMPILER_VERSION MATCHES ".*3\\.[0-9].*")  
+  ENDIF(CXX_COMPILER_VERSION MATCHES ".*3\\.[0-9].*")
   IF   (CXX_COMPILER_VERSION MATCHES ".*4\\.[0-9].*")
     SET(IS_GNUCXX4 TRUE)
     LIST(APPEND OpenCV_POSSIBLE_ROOT_DIRS /opt/net/gcc41/OpenCV )
@@ -79,15 +79,15 @@ ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
 #DBG_MSG("DBG (OpenCV_POSSIBLE_ROOT_DIRS=${OpenCV_POSSIBLE_ROOT_DIRS}")
 
 #
-# select exactly ONE OpenCV base directory/tree 
+# select exactly ONE OpenCV base directory/tree
 # to avoid mixing different version headers and libs
 #
-FIND_PATH(OpenCV_ROOT_DIR 
-  NAMES 
+FIND_PATH(OpenCV_ROOT_DIR
+  NAMES
   cv/include/cv.h     # windows
   include/opencv/cv.h # linux /opt/net
-  include/cv/cv.h 
-  include/cv.h 
+  include/cv/cv.h
+  include/cv.h
   PATHS ${OpenCV_POSSIBLE_ROOT_DIRS})
 DBG_MSG("OpenCV_ROOT_DIR=${OpenCV_ROOT_DIR}")
 
@@ -106,7 +106,7 @@ SET(OpenCV_INCDIR_SUFFIXES
   otherlibs/_graphics/include
   )
 
-# library linkdir suffixes appended to OpenCV_ROOT_DIR 
+# library linkdir suffixes appended to OpenCV_ROOT_DIR
 SET(OpenCV_LIBDIR_SUFFIXES
   lib
   OpenCV/lib
@@ -119,56 +119,56 @@ SET(OpenCV_LIBDIR_SUFFIXES
 # find incdir for each lib
 #
 FIND_PATH(OpenCV_CV_INCLUDE_DIR
-  NAMES cv.h      
-  PATHS ${OpenCV_ROOT_DIR} 
+  NAMES cv.h
+  PATHS ${OpenCV_ROOT_DIR}
   PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
-FIND_PATH(OpenCV_CXCORE_INCLUDE_DIR   
+FIND_PATH(OpenCV_CXCORE_INCLUDE_DIR
   NAMES cxcore.h
-  PATHS ${OpenCV_ROOT_DIR} 
+  PATHS ${OpenCV_ROOT_DIR}
   PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
-FIND_PATH(OpenCV_CVAUX_INCLUDE_DIR    
+FIND_PATH(OpenCV_CVAUX_INCLUDE_DIR
   NAMES cvaux.h
-  PATHS ${OpenCV_ROOT_DIR} 
+  PATHS ${OpenCV_ROOT_DIR}
   PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
-FIND_PATH(OpenCV_HIGHGUI_INCLUDE_DIR  
-  NAMES highgui.h 
-  PATHS ${OpenCV_ROOT_DIR} 
+FIND_PATH(OpenCV_HIGHGUI_INCLUDE_DIR
+  NAMES highgui.h
+  PATHS ${OpenCV_ROOT_DIR}
   PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
-FIND_PATH(OpenCV_CVCAM_INCLUDE_DIR    
-  NAMES cvcam.h 
-  PATHS ${OpenCV_ROOT_DIR} 
+FIND_PATH(OpenCV_CVCAM_INCLUDE_DIR
+  NAMES cvcam.h
+  PATHS ${OpenCV_ROOT_DIR}
   PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} )
 
 #
-# find sbsolute path to all libraries 
+# find sbsolute path to all libraries
 # some are optionally, some may not exist on Linux
 #
-FIND_LIBRARY(OpenCV_CV_LIBRARY   
+FIND_LIBRARY(OpenCV_CV_LIBRARY
   NAMES cv opencv
-  PATHS ${OpenCV_ROOT_DIR}  
+  PATHS ${OpenCV_ROOT_DIR}
   PATH_SUFFIXES  ${OpenCV_LIBDIR_SUFFIXES} )
 FIND_LIBRARY(OpenCV_CVAUX_LIBRARY
   NAMES cvaux
   PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
-FIND_LIBRARY(OpenCV_CVCAM_LIBRARY   
+FIND_LIBRARY(OpenCV_CVCAM_LIBRARY
   NAMES cvcam
-  PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} ) 
+  PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
 FIND_LIBRARY(OpenCV_CVHAARTRAINING_LIBRARY
   NAMES cvhaartraining
-  PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} ) 
-FIND_LIBRARY(OpenCV_CXCORE_LIBRARY  
+  PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
+FIND_LIBRARY(OpenCV_CXCORE_LIBRARY
   NAMES cxcore
   PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
-FIND_LIBRARY(OpenCV_CXTS_LIBRARY   
+FIND_LIBRARY(OpenCV_CXTS_LIBRARY
   NAMES cxts
   PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
-FIND_LIBRARY(OpenCV_HIGHGUI_LIBRARY  
+FIND_LIBRARY(OpenCV_HIGHGUI_LIBRARY
   NAMES highgui
   PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
-FIND_LIBRARY(OpenCV_ML_LIBRARY  
+FIND_LIBRARY(OpenCV_ML_LIBRARY
   NAMES ml
   PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
-FIND_LIBRARY(OpenCV_TRS_LIBRARY  
+FIND_LIBRARY(OpenCV_TRS_LIBRARY
   NAMES trs
   PATHS ${OpenCV_ROOT_DIR}  PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} )
 
@@ -181,7 +181,7 @@ SET(OpenCV_FOUND ON)
 DBG_MSG("OpenCV_FIND_REQUIRED_COMPONENTS=${OpenCV_FIND_REQUIRED_COMPONENTS}")
 FOREACH(NAME ${OpenCV_FIND_REQUIRED_COMPONENTS} )
 
-  # only good if header and library both found   
+  # only good if header and library both found
   IF    (OpenCV_${NAME}_INCLUDE_DIR AND OpenCV_${NAME}_LIBRARY)
     LIST(APPEND OpenCV_INCLUDE_DIRS ${OpenCV_${NAME}_INCLUDE_DIR} )
     LIST(APPEND OpenCV_LIBRARIES    ${OpenCV_${NAME}_LIBRARY} )
@@ -192,13 +192,13 @@ FOREACH(NAME ${OpenCV_FIND_REQUIRED_COMPONENTS} )
       "\nOpenCV_${NAME}_LIBRARY=${OpenCV_${NAME}_LIBRARY} ")
     SET(OpenCV_FOUND OFF)
   ENDIF (OpenCV_${NAME}_INCLUDE_DIR AND OpenCV_${NAME}_LIBRARY)
-  
+
 ENDFOREACH(NAME)
 
 DBG_MSG("OpenCV_INCLUDE_DIRS=${OpenCV_INCLUDE_DIRS}")
 DBG_MSG("OpenCV_LIBRARIES=${OpenCV_LIBRARIES}")
 
-# get the link directory for rpath to be used with LINK_DIRECTORIES: 
+# get the link directory for rpath to be used with LINK_DIRECTORIES:
 IF    (OpenCV_CV_LIBRARY)
   GET_FILENAME_COMPONENT(OpenCV_LINK_DIRECTORIES ${OpenCV_CV_LIBRARY} PATH)
 ENDIF (OpenCV_CV_LIBRARY)
@@ -239,7 +239,7 @@ IF(NOT OpenCV_FOUND)
       MESSAGE(FATAL_ERROR
         "OpenCV required but some headers or libs not found. Please specify it's location with OpenCV_ROOT_DIR env. variable.")
     ELSE(OpenCV_FIND_REQUIRED)
-      MESSAGE(STATUS 
+      MESSAGE(STATUS
         "ERROR: OpenCV was not found.")
     ENDIF(OpenCV_FIND_REQUIRED)
   ENDIF(NOT OpenCV_FIND_QUIETLY)

cMake/FindPyCXX.cmake

@@ -53,7 +53,7 @@ else(PYCXX_INCLUDE_DIR)
         endif(PyCXX_FIND_REQUIRED)
     endif(NOT PYCXX_INCLUDE_DIR)
 endif(PYCXX_INCLUDE_DIR)
-    
+
 # find the sources directory
 if(PYCXX_SOURCE_DIR)
     # source directory specified, they'd better be there

cMake/FindRift.cmake

@@ -6,7 +6,7 @@
 #  OCULUS_LIBRARIES
 #
 # Copyright (c) 2012 I-maginer
-# 
+#
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
@@ -42,11 +42,11 @@ IF(OCULUS_ROOT)
 	  ${OCULUS_INCLUDE_SEARCH_DIRS}
 	  ${OCULUS_ROOT}/include
   )
-  SET(OCULUS_LIBRARY_SEARCH_RELEASE_DIRS 
+  SET(OCULUS_LIBRARY_SEARCH_RELEASE_DIRS
     ${OCULUS_LIBRARY_SEARCH_DIRS}
     ${OCULUS_ROOT}/Lib/x64/VS2012
   )
-  SET(OCULUS_LIBRARY_SEARCH_DEBUG_DIRS 
+  SET(OCULUS_LIBRARY_SEARCH_DEBUG_DIRS
     ${OCULUS_LIBRARY_SEARCH_DIRS}
     ${OCULUS_ROOT}/Lib/x64/VS2012
   )

cMake/FreeCAD_Helpers/PrintFinalReport.cmake

@@ -99,7 +99,7 @@ macro(PrintFinalReport)
     value(FREECAD_LIBPACK_USE)
 
     section_end()
-    
+
     ################ Libraries ##################
 
     section_begin(Libraries)

cMake/FreeCAD_Helpers/SetupQt.cmake

@@ -15,7 +15,7 @@ if(BUILD_GUI)
     if (BUILD_WEB)
         list (APPEND FREECAD_QT_COMPONENTS WebEngineWidgets)
     endif()
-    if(BUILD_DESIGNER_PLUGIN)        
+    if(BUILD_DESIGNER_PLUGIN)
         list (APPEND FREECAD_QT_COMPONENTS Designer)
     endif()
 endif()

cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake

@@ -190,7 +190,7 @@ macro(find_pip_package PACKAGE)
                 STRING(SUBSTRING "${LINE}" 9 -1 PIP_PACKAGE_LOCATION)
             endif()
         endforeach()
-        file(TO_NATIVE_PATH "${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}/include" INCLUDE_DIR) 
+        file(TO_NATIVE_PATH "${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}/include" INCLUDE_DIR)
         file(TO_NATIVE_PATH "${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}/lib" LIBRARY)
         set(${PACKAGE}_INCLUDE_DIRS ${INCLUDE_DIR} PARENT_SCOPE)
         set(${PACKAGE}_LIBRARIES ${LIBRARY} PARENT_SCOPE)
@@ -200,7 +200,7 @@ macro(find_pip_package PACKAGE)
 endmacro()
 
 
-# Macros similar to FindQt4.cmake's WRAP_UI and WRAP_RC, for the automatic generation of Python 
+# Macros similar to FindQt4.cmake's WRAP_UI and WRAP_RC, for the automatic generation of Python
 # code from Qt4's user interface ('.ui') and resource ('.qrc') files. These macros are called:
 # - PYSIDE_WRAP_UI
 # - PYSIDE_WRAP_RC

cMake/UseLibPackCLbundler.cmake

@@ -44,7 +44,7 @@ set (Qt5XmlPatterns_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5XmlPatterns CACHE PATH "")
 find_library(XercesC_LIBRARY_RELEASE xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib")
 find_library(XercesC_LIBRARY_DEBUG xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib")
 set (XercesC_LIBRARIES debug ${XercesC_LIBRARY_DEBUG} optimized ${XercesC_LIBRARY_RELEASE})
-set(XercesC_FOUND TRUE) 
+set(XercesC_FOUND TRUE)
 
 find_library(COIN3D_LIBRARY_RELEASE coin4 "${FREECAD_LIBPACK_DIR}/lib")
 find_library(COIN3D_LIBRARY_DEBUG coin4d "${FREECAD_LIBPACK_DIR}/lib")

src/Doc/sphinx/conf.py

@@ -2,8 +2,8 @@
 
 #***************************************************************************
 #*                                                                         *
-#*   Copyright (c) 2012                                                    * 
-#*   Yorik van Havre <[email protected]>                                 * 
+#*   Copyright (c) 2012                                                    *
+#*   Yorik van Havre <[email protected]>                                 *
 #*                                                                         *
 #*   This program is free software; you can redistribute it and/or modify  *
 #*   it under the terms of the GNU Lesser General Public License (LGPL)    *
@@ -52,7 +52,7 @@
 elif commands.getstatusoutput("locate FreeCAD/lib")[0] == 0:
     path = commands.getstatusoutput("locate FreeCAD/lib")[1].split()[0]
     sys.path.append(path)
-    
+
 # locate TemplatePyMod
 if commands.getstatusoutput("locate TemplatePyMod")[0] == 0:
     path = commands.getstatusoutput("locate TemplatePyMod")[1].split()[0]

src/MacAppBundle/CMakeLists.txt

@@ -146,7 +146,7 @@ file(GLOB CONFIG_GCC "${HOMEBREW_PREFIX}/opt/gcc/lib/gcc/current")
 execute_process(
     COMMAND find -L /usr/local/Cellar/nglib -name MacOS
     OUTPUT_VARIABLE CONFIG_NGLIB)
-    
+
 install(CODE
     "message(STATUS \"Making bundle relocatable...\")
     # The top-level CMakeLists.txt should prevent multiple package manager

src/Main/freecad.rc.cmake

@@ -12,7 +12,7 @@ IDI_ICON1               ICON    DISCARDABLE     "icon.ico"
 
 // File info for the FreeCAD.exe
 //
-1 VERSIONINFO 
+1 VERSIONINFO
 FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${PACKAGE_VERSION_PATCH},${PACKAGE_BUILD_VERSION}
 BEGIN
     BLOCK "StringFileInfo"

src/Main/freecadCmd.rc.cmake

@@ -12,7 +12,7 @@ IDI_ICON1               ICON    DISCARDABLE     "icon.ico"
 
 // File info for the FreeCADCmd.exe
 //
-1 VERSIONINFO 
+1 VERSIONINFO
 FILEVERSION ${PACKAGE_VERSION_MAJOR},${PACKAGE_VERSION_MINOR},${PACKAGE_VERSION_PATCH},${PACKAGE_BUILD_VERSION}
 BEGIN
     BLOCK "StringFileInfo"

src/Mod/Start/StartPage/StartPage.py

@@ -253,7 +253,7 @@ def getDefaultIcon():
 
 def buildCard(filename,method,arg=None):
 
-    """builds an html <li> element representing a file. 
+    """builds an html <li> element representing a file.
     method is a script + a keyword, for ex. url.py?key="""
 
     result = ""

src/Mod/TechDraw/TechDrawTools/TaskHoleShaftFit.py

@@ -115,7 +115,7 @@ def accept(self):
         rangeValues = iso.getValues()
         mainFormat = dim.FormatSpec
         dim.FormatSpec = mainFormat+selectedField
-        dim.EqualTolerance = False 
+        dim.EqualTolerance = False
         dim.FormatSpecOverTolerance = '(%+.3f)'
         dim.OverTolerance = rangeValues[0]
         dim.UnderTolerance = rangeValues[1]