From c4a1d4e5fc1c1ba84928d69581bf8c223d725736 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Mon, 21 Mar 2022 00:13:22 +0100
Subject: [PATCH] [Cloud] remove some includes and sorting

---
 src/Mod/Cloud/App/AppCloud.cpp    | 11 +---
 src/Mod/Cloud/App/AppCloud.h      | 23 +++-----
 src/Mod/Cloud/Gui/AppCloudGui.cpp |  6 --
 src/Mod/Cloud/Gui/CMakeLists.txt  | 91 +++++++++++++++----------------
 src/Mod/Cloud/Gui/Command.cpp     |  4 --
 src/Mod/Cloud/Gui/PreCompiled.h   |  3 -
 src/Mod/Cloud/Gui/Workbench.cpp   |  5 +-
 7 files changed, 58 insertions(+), 85 deletions(-)

diff --git a/src/Mod/Cloud/App/AppCloud.cpp b/src/Mod/Cloud/App/AppCloud.cpp
index e9cf8b18d3..667fb1c82d 100644
--- a/src/Mod/Cloud/App/AppCloud.cpp
+++ b/src/Mod/Cloud/App/AppCloud.cpp
@@ -20,29 +20,23 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
+
 #if defined(FC_OS_WIN32)
 #include <Windows.h>
 #include <stdint.h>
 #endif
 
 #include <openssl/hmac.h>
-#include <openssl/pem.h>
 #include <openssl/md5.h>
+#include <openssl/pem.h>
 #include <openssl/sha.h>
 
 #include <curl/curl.h>
 
 #include <App/Application.h>
 #include <App/Document.h>
-#include <App/DocumentObject.h>
 #include <App/DocumentPy.h>
-#include <App/DocumentObserverPython.h>
-
 #include <Base/Console.h>
 #include <Base/PyObjectBase.h>
 
@@ -51,6 +45,7 @@
 
 #include "AppCloud.h"
 
+
 using namespace App;
 using namespace std;
 using namespace boost::placeholders;
diff --git a/src/Mod/Cloud/App/AppCloud.h b/src/Mod/Cloud/App/AppCloud.h
index 84202e2a32..eb84340505 100644
--- a/src/Mod/Cloud/App/AppCloud.h
+++ b/src/Mod/Cloud/App/AppCloud.h
@@ -20,26 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <Base/Interpreter.h>
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Base64.h>
-#include <Base/TimeInfo.h>
-//#include <xlocale.h>
-
-#include <App/PropertyContainer.h>
-#include <App/PropertyStandard.h>
-#include <App/PropertyLinks.h>
 #include <App/Document.h>
 
-#include <xercesc/framework/XMLPScanToken.hpp>
-#include <xercesc/sax2/Attributes.hpp>
-#include <xercesc/sax2/DefaultHandler.hpp>
+#include <Base/Base64.h>
+#include <Base/Interpreter.h>
+#include <Base/Reader.h>
+#include <Base/Writer.h>
 
+#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/framework/XMLPScanToken.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/sax/HandlerBase.hpp>
-#include <xercesc/framework/MemBufInputSource.hpp>
+#include <xercesc/sax2/Attributes.hpp>
+#include <xercesc/sax2/DefaultHandler.hpp>
+
 
 XERCES_CPP_NAMESPACE_BEGIN
     class DOMNode;
diff --git a/src/Mod/Cloud/Gui/AppCloudGui.cpp b/src/Mod/Cloud/Gui/AppCloudGui.cpp
index 7f8d18e228..a1064b04f0 100644
--- a/src/Mod/Cloud/Gui/AppCloudGui.cpp
+++ b/src/Mod/Cloud/Gui/AppCloudGui.cpp
@@ -20,11 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
@@ -33,8 +29,6 @@
 
 #include "Workbench.h"
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
 
 // use a different name to CreateCommand()
 void CreateCloudCommands(void);
diff --git a/src/Mod/Cloud/Gui/CMakeLists.txt b/src/Mod/Cloud/Gui/CMakeLists.txt
index 5e6688742c..72d09e6c0a 100644
--- a/src/Mod/Cloud/Gui/CMakeLists.txt
+++ b/src/Mod/Cloud/Gui/CMakeLists.txt
@@ -1,46 +1,45 @@
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${Boost_INCLUDE_DIRS}
-    ${COIN3D_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-set(CloudGui_LIBS
-    Cloud
-    FreeCADGui
-)
-
-if (BUILD_QT5)
-    qt5_add_resources(Cloud_QRC_SRCS Resources/Cloud.qrc)
-else()
-    qt4_add_resources(Cloud_QRC_SRCS Resources/Cloud.qrc)
-endif()
-
-SET(CloudGui_SRCS
-    ${Cloud_QRC_SRCS}
-    AppCloudGui.cpp
-    Command.cpp
-    PreCompiled.cpp
-    PreCompiled.h
-    Workbench.cpp
-    Workbench.h
-)
-
-SET(Cloud_SVG
-    Resources/icons/CloudWorkbench.svg
-)
-
-add_library(CloudGui SHARED ${CloudGui_SRCS} ${Cloud_SVG})
-target_link_libraries(CloudGui ${CloudGui_LIBS})
-
-fc_copy_sources(CloudGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Cloud" ${Cloud_SVG})
-
-SET_BIN_DIR(CloudGui CloudGui /Mod/Cloud)
-SET_PYTHON_PREFIX_SUFFIX(CloudGui)
-    
-install(TARGETS CloudGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
-INSTALL(FILES ${Cloud_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Cloud/Resources/icons")
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${Boost_INCLUDE_DIRS}
+    ${COIN3D_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIR}
+    ${PYTHON_INCLUDE_DIRS}
+)
+
+set(CloudGui_LIBS
+    Cloud
+    FreeCADGui
+)
+
+if (BUILD_QT5)
+    qt5_add_resources(Cloud_QRC_SRCS Resources/Cloud.qrc)
+else()
+    qt4_add_resources(Cloud_QRC_SRCS Resources/Cloud.qrc)
+endif()
+
+SET(CloudGui_SRCS
+    ${Cloud_QRC_SRCS}
+    AppCloudGui.cpp
+    Command.cpp
+    PreCompiled.cpp
+    PreCompiled.h
+    Workbench.cpp
+    Workbench.h
+)
+
+SET(Cloud_SVG
+    Resources/icons/CloudWorkbench.svg
+)
+
+add_library(CloudGui SHARED ${CloudGui_SRCS} ${Cloud_SVG})
+target_link_libraries(CloudGui ${CloudGui_LIBS})
+
+fc_copy_sources(CloudGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Cloud" ${Cloud_SVG})
+
+SET_BIN_DIR(CloudGui CloudGui /Mod/Cloud)
+SET_PYTHON_PREFIX_SUFFIX(CloudGui)
+    
+install(TARGETS CloudGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
+INSTALL(FILES ${Cloud_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Cloud/Resources/icons")
diff --git a/src/Mod/Cloud/Gui/Command.cpp b/src/Mod/Cloud/Gui/Command.cpp
index 572f999fa7..0cfca14423 100644
--- a/src/Mod/Cloud/Gui/Command.cpp
+++ b/src/Mod/Cloud/Gui/Command.cpp
@@ -20,13 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-#endif
 
 #include <Base/Console.h>
-#include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 
diff --git a/src/Mod/Cloud/Gui/PreCompiled.h b/src/Mod/Cloud/Gui/PreCompiled.h
index b6650f805a..1a844c68cf 100644
--- a/src/Mod/Cloud/Gui/PreCompiled.h
+++ b/src/Mod/Cloud/Gui/PreCompiled.h
@@ -53,9 +53,6 @@
 #include <string>
 #include <vector>
 
-// Xerces
-#include <xercesc/util/XercesDefs.hpp>
-
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
diff --git a/src/Mod/Cloud/Gui/Workbench.cpp b/src/Mod/Cloud/Gui/Workbench.cpp
index 95afce4206..b9e26c6986 100644
--- a/src/Mod/Cloud/Gui/Workbench.cpp
+++ b/src/Mod/Cloud/Gui/Workbench.cpp
@@ -20,16 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
 #include "Workbench.h"
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
 
+
 using namespace CloudGui;
 
 /// @namespace CloudGui @class Workbench