kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Cloud] remove some includes and sorting

Browse Source
This commit is contained in:
Uwe
2022-03-21 00:13:22 +01:00
parent cb64efaaad
commit c4a1d4e5fc
7 changed files with 58 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Cloud/App/AppCloud.cpp
View File

@@ -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;

23
src/Mod/Cloud/App/AppCloud.h
View File

@@ -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;

6
src/Mod/Cloud/Gui/AppCloudGui.cpp
View File

@@ -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);

91
src/Mod/Cloud/Gui/CMakeLists.txt
View File

@@ -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")

4
src/Mod/Cloud/Gui/Command.cpp
View File

@@ -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>

3
src/Mod/Cloud/Gui/PreCompiled.h
View File

@@ -53,9 +53,6 @@
#include <string>
#include <vector>
// Xerces
#include <xercesc/util/XercesDefs.hpp>
#ifdef FC_OS_WIN32
# include <windows.h>
#endif

5
src/Mod/Cloud/Gui/Workbench.cpp
View File

@@ -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