+ improve whitespaces

FreeCAD · Apr 1, 2015 · ebb1ca3 · ebb1ca3
1 parent 75070b1
commit ebb1ca3
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -168,26 +168,24 @@ OPTION(BUILD_WEB "Build the FreeCAD web module" ON)
 OPTION(BUILD_VR "Build the FreeCAD Oculus Rift support (need Oculus SDK 4.x or higher)" OFF)
 
 if(MSVC)
-OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" OFF)
-OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
-OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
+    OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" OFF)
+    OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
+    OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
 elseif(APPLE)
-	find_library(3DCONNEXIONCLIENT_FRAMEWORK 3DconnexionClient)
-	if(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-		OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion
-		SDK to support 3d mouse." ON)
-	else(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-		OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion
-		SDK to support 3d mouse." OFF)
-	endif(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
+    find_library(3DCONNEXIONCLIENT_FRAMEWORK 3DconnexionClient)
+    if(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
+        OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
+    else(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
+        OPTION(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." OFF)
+    endif(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
 else(MSVC)
-set(FREECAD_USE_3DCONNEXION OFF)
+    set(FREECAD_USE_3DCONNEXION OFF)
 endif(MSVC)
 if(NOT MSVC)
-OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
-OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF)
-OPTION(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
-OPTION(FREECAD_USE_EXTERNAL_PIVY "Use system installed python-pivy instead of the bundled." ON)
+    OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
+    OPTION(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF)
+    OPTION(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
+    OPTION(FREECAD_USE_EXTERNAL_PIVY "Use system installed python-pivy instead of the bundled." ON)
 endif(NOT MSVC)
 
 # if this is set override some options

diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
@@ -7,8 +7,8 @@ endif(WIN32)
 if (FREECAD_USE_3DCONNEXION)
     add_definitions(-D_USE_3DCONNEXION_SDK)
     if(APPLE)
-	set(3DCONNEXION_LINKFLAGS "-F/Library/Frameworks -weak_framework 3DconnexionClient")
-	set(3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers )
+        set(3DCONNEXION_LINKFLAGS "-F/Library/Frameworks -weak_framework 3DconnexionClient")
+        set(3DCONNEXION_INCLUDE_DIR ${3DCONNEXIONCLIENT_FRAMEWORK}/Headers )
     endif(APPLE)
  endif(FREECAD_USE_3DCONNEXION)
 
@@ -54,7 +54,7 @@ else(MSVC)
         ${QT_LIBRARIES}
         ${Boost_LIBRARIES}
         ${OPENGL_gl_LIBRARY}
-	${3DCONNEXION_LINKFLAGS}
+        ${3DCONNEXION_LINKFLAGS}
     )
 endif(MSVC)
 
@@ -139,7 +139,8 @@ endif(FREECAD_USE_3DCONNEXION AND MSVC)
 
 if(FREECAD_USE_3DCONNEXION AND APPLE)
 SET(FreeCADGui_SDK_SRCS
-   3Dconnexion/GuiApplicationNativeEventAwareMac.cpp)
+    3Dconnexion/GuiApplicationNativeEventAwareMac.cpp
+)
 SOURCE_GROUP("3D connexion SDK" FILES ${FreeCADGui_SDK_SRCS})
 endif(FREECAD_USE_3DCONNEXION AND APPLE)
 
@@ -939,7 +940,6 @@ SET(FreeCADGui_SRCS
 
 SET(FreeCADGui_SRCS
     ${FreeCADGui_SDK_SRCS}
-    ${FreeCADGui_SDK_SRCS_Mac}
     ${FreeCADGui_CPP_SRCS}
     ${FreeCADGui_XML_SRCS}
     ${iis_MOC_SRCS}

diff --git a/src/Gui/GuiApplicationNativeEventAware.cpp b/src/Gui/GuiApplicationNativeEventAware.cpp
@@ -77,7 +77,7 @@ Gui::GUIApplicationNativeEventAware::~GUIApplicationNativeEventAware()
     if (InstallConnexionHandlers == NULL)
       {
         Base::Console().Log("3Dconnexion framework not found!\n");
-	return;
+        return;
       }
     /* close the connection with the 3dx driver */
     //std::cerr << "tdxClientID: " << tdxClientID << std::endl;
@@ -132,8 +132,8 @@ void Gui::GUIApplicationNativeEventAware::initSpaceball(QMainWindow *window)
     assert(err == 0);
     if (err)
       {
-	Base::Console().Log("Error installing 3Dconnexion handler\n");
-	return;
+        Base::Console().Log("Error installing 3Dconnexion handler\n");
+        return;
       }
     /* register our app with the driver */
     //Pascal string Application name required to register driver for application
@@ -145,12 +145,11 @@ void Gui::GUIApplicationNativeEventAware::initSpaceball(QMainWindow *window)
     //std::cerr << "tdxClientID: " << tdxClientID << std::endl;
     if (tdxClientID == 0)
       {
-	Base::Console().Log("Couldn't connect to 3Dconnexion driver\n");
-	return;
+        Base::Console().Log("Couldn't connect to 3Dconnexion driver\n");
+        return;
       }
 
-    Base::Console().Log("3Dconnexion device initialized. Client ID: %d\n", 
-			tdxClientID);
+    Base::Console().Log("3Dconnexion device initialized. Client ID: %d\n", tdxClientID);
     spaceballPresent = true;
 #endif
 #endif // _USE_3DCONNEXION_SDK
@@ -167,7 +166,6 @@ bool Gui::GUIApplicationNativeEventAware::processSpaceballEvent(QObject *object,
     QApplication::notify(object, event);
     if (event->type() == Spaceball::MotionEvent::MotionEventType)
     {
-Base::Console().Log("process motion event\n");
         Spaceball::MotionEvent *motionEvent = dynamic_cast<Spaceball::MotionEvent*>(event);
         if (!motionEvent)
             return true;