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

[Web] remove unused headers and Xerces

Browse Source
This commit is contained in:
Uwe
2022-03-20 21:16:27 +01:00
parent 66e8a2bef3
commit ee6d631531
14 changed files with 60 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Web/App/AppWeb.cpp
View File

@@ -20,10 +20,8 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
# include <climits>
# include <sstream>
#endif
@@ -32,10 +30,9 @@
#include <Base/Interpreter.h>
#include <Base/PyObjectBase.h>
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
#include "Server.h"
// See http://docs.python.org/2/library/socketserver.html
/*
import socket

1
src/Mod/Web/App/CMakeLists.txt
View File

@@ -5,7 +5,6 @@ include_directories(
${OCC_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${XercesC_INCLUDE_DIRS}
)
if(BUILD_QT5)

8
src/Mod/Web/App/PreCompiled.h
View File

@@ -38,13 +38,16 @@
// standard
#include <cstdio>
#include <cassert>
#include <climits>
#include <iostream>
#include <stdexcept>
// STL
#include <algorithm>
#include <iostream>
#include <list>
#include <map>
#include <memory>
#include <queue>
#include <set>
#include <sstream>
@@ -52,8 +55,9 @@
#include <string>
#include <vector>
// Xerces
#include <xercesc/util/XercesDefs.hpp>
// Qt
#include <QCoreApplication>
#include <QTcpSocket>
#endif //_PreComp_

16
src/Mod/Web/App/Server.cpp
View File

@@ -20,18 +20,20 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <stdexcept>
# include <memory>
# include <QCoreApplication>
# include <QTcpSocket>
#endif
#include <QCoreApplication>
#include <QTcpSocket>
#include <stdexcept>
#include <memory>
#include "Server.h"
#include <Base/Exception.h>
#include <Base/Interpreter.h>
#include "Server.h"
using namespace Web;
Firewall* Firewall::instance = 0;

4
src/Mod/Web/App/Server.h
View File

@@ -20,16 +20,14 @@
* *
***************************************************************************/
#ifndef WEB_SERVER_H
#define WEB_SERVER_H
#include <QByteArray>
#include <QObject>
#include <QEvent>
#include <QObject>
#include <QTcpSocket>
#include <QTcpServer>
#include <CXX/Objects.hxx>
namespace Web {

9
src/Mod/Web/Gui/AppWebGui.cpp
View File

@@ -20,14 +20,10 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
# include <QMdiArea>
# include <QMdiSubWindow>
# include <QUrl>
# include <QIcon>
# include <QUrl>
#endif
#include <Base/Console.h>
@@ -35,13 +31,12 @@
#include <Base/PyObjectBase.h>
#include <Gui/Application.h>
#include <Gui/MainWindow.h>
#include <Gui/WorkbenchManager.h>
#include <Gui/Language/Translator.h>
#include "BrowserView.h"
#include "Workbench.h"
// use a different name to CreateCommand()
void CreateWebCommands(void);

76
src/Mod/Web/Gui/BrowserView.cpp
View File

@@ -20,75 +20,55 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QAbstractTextDocumentLayout>
# include <QApplication>
# include <QClipboard>
# include <QDateTime>
# include <QHBoxLayout>
# include <QMessageBox>
# include <QNetworkRequest>
# include <QPainter>
# include <QPrinter>
# include <QPrintDialog>
# include <QScrollBar>
# include <QMouseEvent>
# include <QStatusBar>
# include <QTextBlock>
# include <QTextCodec>
# include <QTextStream>
# include <QTimer>
# include <QFileInfo>
# include <QDesktopServices>
# include <QMenu>
# include <QDesktopWidget>
# include <QSignalMapper>
# include <QPointer>
# include <QDir>
# include <QFileInfo>
# include <QLatin1String>
# include <QLineEdit>
# include <QMenu>
# include <QMessageBox>
# include <QMouseEvent>
# include <QNetworkRequest>
# include <QRegExp>
# include <QSignalMapper>
# include <QStatusBar>
#endif
#if defined(QTWEBENGINE)
# include <QWebEnginePage>
# include <QWebEngineView>
# include <QWebEngineSettings>
# include <QWebEngineProfile>
# include <QWebEngineContextMenuData>
# include <QWebEngineUrlRequestInterceptor>
# include <QWebEnginePage>
# include <QWebEngineProfile>
# include <QWebEngineSettings>
# include <QWebEngineUrlRequestInfo>
# include <QWebEngineUrlRequestInterceptor>
# include <QWebEngineView>
#elif defined(QTWEBKIT)
# include <QWebFrame>
# include <QWebView>
# include <QWebSettings>
# include <QNetworkAccessManager>
# include <QWebSettings>
# include <QWebView>
using QWebEngineView = QWebView;
using QWebEnginePage = QWebPage;
#endif
#include <QScreen>
#include <QLatin1String>
#include <QRegExp>
#include "BrowserView.h"
#include "CookieJar.h"
#include <Gui/Application.h>
#include <Gui/MainWindow.h>
#include <Gui/MDIViewPy.h>
#include <Gui/ProgressBar.h>
#include <Gui/Command.h>
#include <Gui/OnlineDocumentation.h>
#include <Gui/DownloadManager.h>
#include <Gui/TextDocumentEditorView.h>
#include <App/Document.h>
#include <Base/Parameter.h>
#include <Base/Exception.h>
#include <Base/Tools.h>
#include <App/Document.h>
#include <CXX/Extensions.hxx>
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/DownloadManager.h>
#include <Gui/MainWindow.h>
#include <Gui/MDIViewPy.h>
#include <Gui/ProgressBar.h>
#include <Gui/TextDocumentEditorView.h>
#include "BrowserView.h"
#include "CookieJar.h"
using namespace WebGui;
using namespace Gui;

2
src/Mod/Web/Gui/BrowserView.h
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#ifndef WEBGUI_BROWSERVIEW_H
#define WEBGUI_BROWSERVIEW_H
@@ -31,6 +30,7 @@
#if defined(QTWEBENGINE)
#include <QWebEngineView>
namespace WebGui {
class WebEngineUrlRequestInterceptor;
}

1
src/Mod/Web/Gui/CMakeLists.txt
View File

@@ -4,7 +4,6 @@ include_directories(
${COIN3D_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS}
)
if (Qt5WebEngineWidgets_FOUND)

6
src/Mod/Web/Gui/Command.cpp
View File

@@ -20,18 +20,14 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/MainWindow.h>
#include <Gui/FileDialog.h>
#include "BrowserView.h"
using namespace std;
using namespace Gui;
using namespace WebGui;

8
src/Mod/Web/Gui/CookieJar.cpp
View File

@@ -20,20 +20,18 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#include <QTextStream>
#include <QFile>
#include <QTimer>
#include <QNetworkCookie>
#endif
#include <App/Application.h>
#include <Base/FileInfo.h>
#include "CookieJar.h"
#include <Base/FileInfo.h>
#include <App/Application.h>
using namespace WebGui;

2
src/Mod/Web/Gui/CookieJar.h
View File

@@ -24,7 +24,9 @@
#ifndef WEBGUI_COOKIEJAR_H
#define WEBGUI_COOKIEJAR_H
#include <QFile>
#include <QNetworkCookieJar>
#include <QTimer>
class QNetworkCookieJar;

5
src/Mod/Web/Gui/PreCompiled.h
View File

@@ -36,9 +36,6 @@
#ifdef _PreComp_
// Python
#include <Python.h>
// standard
#include <iostream>
#include <assert.h>
@@ -59,6 +56,8 @@
# include <windows.h>
#endif
// Qt Core
#include <QLatin1String>
// Qt Toolkit
#ifndef __QtAll__

17
src/Mod/Web/Gui/Workbench.cpp
View File

@@ -20,25 +20,16 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <qobject.h>
#endif
#include "Workbench.h"
#include <Gui/ToolBarManager.h>
#include <Gui/MenuManager.h>
#include <Gui/ToolBarManager.h>
#include <Gui/DockWindowManager.h>
#include <Gui/Application.h>
#include <Gui/Action.h>
#include <Gui/Command.h>
#include <Gui/MenuManager.h>
#include <Gui/Selection.h>
#include <Gui/ToolBoxManager.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <Gui/ToolBarManager.h>
using namespace WebGui;