+ restore lost changes, improve whitspaces, suppress useless MSVC warnings

src/3rdParty/salomesmesh/CMakeLists.txt

@@ -127,7 +127,7 @@ ELSE(UNIX)
     ######### Windows ###########
     #MESSAGE("-- Windows system detected")
     IF(MSVC)
-        ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275)
+        ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4267 /wd4390)
     ELSE(MSVC)
         ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB)
     ENDIF(MSVC)

src/App/FeaturePython.cpp

@@ -54,7 +54,7 @@ DocumentObjectExecReturn *FeaturePythonImp::execute()
             Py::Object feature = static_cast<PropertyPythonObject*>(proxy)->getValue();
             if (feature.hasAttr("__object__")) {
                 Py::Callable method(feature.getAttr(std::string("execute")));
-				Py::Tuple args;
+                Py::Tuple args;
                 method.apply(args);
             }
             else {

src/App/PropertyPythonObject.cpp

@@ -89,7 +89,7 @@ std::string PropertyPythonObject::toString() const
         Py::Callable method(pickle.getAttr(std::string("dumps")));
         Py::Object dump;
         if (this->object.hasAttr("__getstate__")) {
-			Py::Tuple args;
+            Py::Tuple args;
             Py::Callable state(this->object.getAttr("__getstate__"));
             dump = state.apply(args);
         }

src/Base/FileInfo.cpp

@@ -521,7 +521,7 @@ std::vector<Base::FileInfo> FileInfo::getDirectoryContent(void) const
 {
     std::vector<Base::FileInfo> List;
 #if defined (FC_OS_WIN32)
-	struct _wfinddata_t dentry;
+    struct _wfinddata_t dentry;
 
     intptr_t hFile;
 
@@ -530,7 +530,7 @@ std::vector<Base::FileInfo> FileInfo::getDirectoryContent(void) const
     wstr += L"/*";
 
     if ((hFile = _wfindfirst( wstr.c_str(), &dentry)) == -1L)
-		return List;
+        return List;
 
     while (_wfindnext(hFile, &dentry) == 0)
         if (wcscmp(dentry.name,L"..") != 0)

src/Gui/MainWindow.cpp

@@ -412,7 +412,9 @@ MainWindow::MainWindow(QWidget * parent, Qt::WFlags f)
         (QString::fromAscii(QT_TRANSLATE_NOOP("QDockWidget","Python console")));
     pDockMgr->registerDockWindow("Std_PythonView", pcPython);
 
-#if 0 //defined(Q_OS_WIN32) this porsion of code is not able to run with a vanilla Qtlib build on Windows. Since it is not build on Linux I pressume its not needed.... (JR 8.2014)
+#if 0 //defined(Q_OS_WIN32) this portion of code is not able to run with a vanilla Qtlib build on Windows.
+    // The MainWindowTabBar is used to show tabbed dock windows with icons
+    //
     // add our own QTabBar-derived class to the main window layout
     // NOTE: This uses some private stuff from QMainWindow which doesn't
     // seem to be accessible on all platforms.

src/Mod/Part/App/AppPart.cpp

@@ -100,7 +100,7 @@ void PartExport initPart()
 #endif
     App::Application::Config()["OCC_VERSION"] = str.str();
 
-	Base::Console().Log("Module: Part\n");
+    Base::Console().Log("Module: Part\n");
 
     // This is highly experimental and we should keep an eye on it
     // if we have mysterious crashes

src/Mod/Points/Init.py

@@ -36,6 +36,6 @@ ParGrp.SetString("WorkBenchName",    "Points Design")
 
 # Append the open handler
 FreeCAD.EndingAdd("Point formats (*.asc)","Points")
-FreeCAD.EndingAdd("Ply points (*.ply)","Points")
+FreeCAD.EndingAdd("PLY points (*.ply)","Points")
 
 

src/Mod/ReverseEngineering/App/PreCompiled.h

@@ -39,6 +39,12 @@
 # define PointsExport
 #endif
 
+#ifdef _MSC_VER
+#   pragma warning(disable : 4181)
+#   pragma warning(disable : 4275)
+#   pragma warning(disable : 4305)
+#endif
+
 #ifdef _PreComp_
 
 // standard