From f04d77db590886361280712a784aebfbe0470703 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 4 Mar 2022 04:37:36 +0100 Subject: [PATCH] [Gui] Document and Download: remove unused includes --- src/Gui/Document.h | 7 +++--- src/Gui/DocumentModel.cpp | 11 +++------- src/Gui/DocumentModel.h | 2 +- src/Gui/DocumentObserver.cpp | 5 +++-- src/Gui/DocumentObserver.h | 3 +-- src/Gui/DocumentObserverPython.cpp | 10 +++------ src/Gui/DocumentObserverPython.h | 4 ---- src/Gui/DocumentPyImp.cpp | 4 +--- src/Gui/DocumentRecovery.cpp | 35 ++++++++++++------------------ src/Gui/DocumentRecovery.h | 7 +++--- src/Gui/DownloadItem.cpp | 21 +++++++----------- src/Gui/DownloadItem.h | 10 ++++----- src/Gui/DownloadManager.cpp | 5 ++--- src/Gui/DownloadManager.h | 5 +++-- 14 files changed, 50 insertions(+), 79 deletions(-) diff --git a/src/Gui/Document.h b/src/Gui/Document.h index a7884670ed..858b289dd0 100644 --- a/src/Gui/Document.h +++ b/src/Gui/Document.h @@ -20,21 +20,20 @@ * * ***************************************************************************/ - #ifndef GUI_DOCUMENT_H #define GUI_DOCUMENT_H -#include "MDIView.h" - #include #include #include -#include #include +#include +#include "MDIView.h" #include "Tree.h" + class SoNode; class SoPath; diff --git a/src/Gui/DocumentModel.cpp b/src/Gui/DocumentModel.cpp index 4f2e03faec..4684e166bb 100644 --- a/src/Gui/DocumentModel.cpp +++ b/src/Gui/DocumentModel.cpp @@ -20,26 +20,21 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ # include -# include -# include -# include #endif -#include +#include +#include #include "DocumentModel.h" #include "Application.h" #include "BitmapFactory.h" #include "Document.h" #include "ViewProviderDocumentObject.h" -#include -#include -#include + using namespace Gui; namespace bp = boost::placeholders; diff --git a/src/Gui/DocumentModel.h b/src/Gui/DocumentModel.h index fafe3587bb..becb4dedf1 100644 --- a/src/Gui/DocumentModel.h +++ b/src/Gui/DocumentModel.h @@ -26,7 +26,7 @@ #include #include -#include + namespace App { class Property; diff --git a/src/Gui/DocumentObserver.cpp b/src/Gui/DocumentObserver.cpp index bae51df158..a9f6536635 100644 --- a/src/Gui/DocumentObserver.cpp +++ b/src/Gui/DocumentObserver.cpp @@ -28,11 +28,12 @@ #endif #include + +#include "DocumentObserver.h" #include "Application.h" #include "Document.h" #include "ViewProviderDocumentObject.h" -#include "DocumentObserver.h" -#include + using namespace Gui; namespace sp = std::placeholders; diff --git a/src/Gui/DocumentObserver.h b/src/Gui/DocumentObserver.h index 63a20df9b4..ed2471b77b 100644 --- a/src/Gui/DocumentObserver.h +++ b/src/Gui/DocumentObserver.h @@ -20,13 +20,12 @@ * * ***************************************************************************/ - #ifndef GUI_DOCUMENTOBSERVER_H #define GUI_DOCUMENTOBSERVER_H -#include #include + namespace App { class Property; } namespace Gui { diff --git a/src/Gui/DocumentObserverPython.cpp b/src/Gui/DocumentObserverPython.cpp index b98c86f4d7..2a55d9166c 100644 --- a/src/Gui/DocumentObserverPython.cpp +++ b/src/Gui/DocumentObserverPython.cpp @@ -20,20 +20,16 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif +#include #include "Application.h" #include "Document.h" +#include "DocumentObserverPython.h" #include "ViewProvider.h" #include "ViewProviderDocumentObject.h" -#include "DocumentObserverPython.h" -#include -#include + using namespace Gui; namespace bp = boost::placeholders; diff --git a/src/Gui/DocumentObserverPython.h b/src/Gui/DocumentObserverPython.h index 16713c001c..15424c9838 100644 --- a/src/Gui/DocumentObserverPython.h +++ b/src/Gui/DocumentObserverPython.h @@ -24,10 +24,6 @@ #ifndef GUI_DOCUMENTOBSERVERPYTHON_H #define GUI_DOCUMENTOBSERVERPYTHON_H -#include - -#include -#include namespace Gui { diff --git a/src/Gui/DocumentPyImp.cpp b/src/Gui/DocumentPyImp.cpp index 47e82ad4d4..d6c6d80616 100644 --- a/src/Gui/DocumentPyImp.cpp +++ b/src/Gui/DocumentPyImp.cpp @@ -26,13 +26,11 @@ # include #endif +#include #include #include -#include - #include "Application.h" -#include "Document.h" #include "MergeDocuments.h" #include "ViewProviderExtern.h" diff --git a/src/Gui/DocumentRecovery.cpp b/src/Gui/DocumentRecovery.cpp index c3f22d8292..fc7132a389 100644 --- a/src/Gui/DocumentRecovery.cpp +++ b/src/Gui/DocumentRecovery.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - // Implement FileWriter which puts files into a directory // write a property to file only when it has been modified // implement xml meta file @@ -33,42 +32,36 @@ # include # include # include -# include # include -# include # include # include +# include +# include # include # include -# include +# include # include # include -# include -# include -# include # include # include #endif -#include +#include + +#include +#include +#include +#include +#include +#include +#include + #include "DocumentRecovery.h" #include "ui_DocumentRecovery.h" #include "WaitCursor.h" -#include -#include -#include - -#include -#include -#include -#include -#include - -#include - -FC_LOG_LEVEL_INIT("Gui",true,true) +FC_LOG_LEVEL_INIT("Gui", true, true) using namespace Gui; using namespace Gui::Dialog; diff --git a/src/Gui/DocumentRecovery.h b/src/Gui/DocumentRecovery.h index 8fb498123b..2adad23c4e 100644 --- a/src/Gui/DocumentRecovery.h +++ b/src/Gui/DocumentRecovery.h @@ -25,12 +25,11 @@ #define GUI_DIALOG_DOCUMENTRECOVERY_H #include -#include -#include #include #include -#include -#include +#include +#include + namespace Gui { namespace Dialog { diff --git a/src/Gui/DownloadItem.cpp b/src/Gui/DownloadItem.cpp index 6e87fbc5e8..8d9395a1b3 100644 --- a/src/Gui/DownloadItem.cpp +++ b/src/Gui/DownloadItem.cpp @@ -20,39 +20,34 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #include -#include #include #include +#include +#include +#include #include +#include #include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include #include -#include - -#include #include "DownloadItem.h" -#include "DownloadManager.h" #include "Application.h" #include "Document.h" -#include "MainWindow.h" +#include "DownloadManager.h" #include "FileDialog.h" +#include "MainWindow.h" #include "ui_DlgAuthorization.h" #include "Tools.h" + using namespace Gui::Dialog; diff --git a/src/Gui/DownloadItem.h b/src/Gui/DownloadItem.h index 51fc3f8882..8a40514ec7 100644 --- a/src/Gui/DownloadItem.h +++ b/src/Gui/DownloadItem.h @@ -20,19 +20,19 @@ * * ***************************************************************************/ - #ifndef GUI_DIALOG_DOWNLOADITEM_H #define GUI_DIALOG_DOWNLOADITEM_H #include #include #include +#include +#include +#include +#include #include #include -#include -#include -#include -#include + class AutoSaver; class QFileIconProvider; diff --git a/src/Gui/DownloadManager.cpp b/src/Gui/DownloadManager.cpp index 4e61eded72..f31b4e53d5 100644 --- a/src/Gui/DownloadManager.cpp +++ b/src/Gui/DownloadManager.cpp @@ -20,10 +20,8 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #include -#include #include #include @@ -35,12 +33,13 @@ #include #include -#include "DownloadItem.h" #include "DownloadManager.h" #include "ui_DownloadManager.h" #include "DockWindowManager.h" +#include "DownloadItem.h" #include "MainWindow.h" + using namespace Gui::Dialog; /* TRANSLATOR Gui::Dialog::DownloadManager */ diff --git a/src/Gui/DownloadManager.h b/src/Gui/DownloadManager.h index 19cb484367..8a7af7d4c6 100644 --- a/src/Gui/DownloadManager.h +++ b/src/Gui/DownloadManager.h @@ -24,11 +24,12 @@ #ifndef GUI_DIALOG_DOWNLOADMANAGER_H #define GUI_DIALOG_DOWNLOADMANAGER_H +#include #include -#include #include #include -#include +#include + class AutoSaver; class QFileIconProvider;