More header cleaning up done.

Removal of fixed includes as they are in stdafx.h Fixed a few files not using pch's
deepskystacker · Mar 7, 2023 · 3c67cd0 · 3c67cd0
1 parent ca48c0b
commit 3c67cd0
Show file tree

Hide file tree

Showing 48 changed files with 60 additions and 174 deletions.
diff --git a/ChartCtrl/ChartLegend.h b/ChartCtrl/ChartLegend.h
@@ -28,8 +28,6 @@
 
 #include "ChartObject.h"
 
-#include <string>
-
 class CChartSerie;
 
 class CChartLegend : public CChartObject  

diff --git a/ChartCtrl/ChartTitle.cpp b/ChartCtrl/ChartTitle.cpp
@@ -21,7 +21,6 @@
 
 #include "stdafx.h"
 #include "ChartTitle.h"
-#include "Math.h"
 
 using namespace std;
 

diff --git a/ChartCtrl/ChartTitle.h b/ChartCtrl/ChartTitle.h
@@ -28,10 +28,6 @@
 
 #include "ChartObject.h"
 
-#include <vector>
-#include <string>
-
-
 class CChartTitle : public CChartObject  
 {
 	friend CChartCtrl;

diff --git a/DeepSkyStacker/AHDDemosaicing.cpp b/DeepSkyStacker/AHDDemosaicing.cpp
@@ -1,6 +1,4 @@
 #include <stdafx.h>
-#include <vector>
-#include <omp.h>
 #include "AHDDemosaicing.h"
 #include "ColorBitmap.h"
 #include "Ztrace.h"

diff --git a/DeepSkyStacker/About.h b/DeepSkyStacker/About.h
@@ -1,8 +1,6 @@
 #ifndef ABOUT_H
 #define ABOUT_H
 
-#include <QDialog>
-
 namespace Ui {
 class About;
 }

diff --git a/DeepSkyStacker/BackgroundCalibration.cpp b/DeepSkyStacker/BackgroundCalibration.cpp
@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
 #include "resource.h"
 #include "BitmapBase.h"
 #include "BackgroundCalibration.h"

diff --git a/DeepSkyStacker/BackgroundOptions.cpp b/DeepSkyStacker/BackgroundOptions.cpp
@@ -1,19 +1,7 @@
 #include "stdafx.h"
-#include <algorithm>
-using std::min;
-using std::max;
-
-#define _WIN32_WINNT _WIN32_WINNT_WIN7
-#include <afx.h>
-
 #include "BackgroundOptions.h"
 #include "ui/ui_BackgroundOptions.h"
-
-#include <ZExcept.h>
-#include <Ztrace.h>
-
-#include "DSSCommon.h"
-#include "StackingTasks.h"
+#include "../DeepSkyStackerTest/AvxAccumulateTest.h"
 #include "Workspace.h"
 
 

diff --git a/DeepSkyStacker/BackgroundOptions.h b/DeepSkyStacker/BackgroundOptions.h
@@ -1,8 +1,6 @@
 #ifndef BACKGROUNDOPTIONS_H
 #define BACKGROUNDOPTIONS_H
 
-#include <QDialog>
-
 enum BACKGROUNDCALIBRATIONMODE : short;
 enum BACKGROUNDCALIBRATIONINTERPOLATION : short;
 enum RGBBACKGROUNDCALIBRATIONMETHOD : short;

diff --git a/DeepSkyStacker/BaseDialog.cpp b/DeepSkyStacker/BaseDialog.cpp
@@ -36,9 +36,6 @@
 // BaseDialog.cpp : implementation file
 //
 #include "stdafx.h"
-#include <QShowEvent>
-#include <QSettings>
-
 #include "DeepSkyStacker.h"
 #include "BaseDialog.h"
 

diff --git a/DeepSkyStacker/BaseDialog.h b/DeepSkyStacker/BaseDialog.h
@@ -1,6 +1,4 @@
 #pragma once
-#include <QDialog>
-#include <QFlags>
 
 namespace DSS
 {

diff --git a/DeepSkyStacker/BilinearParameters.h b/DeepSkyStacker/BilinearParameters.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <atlstr.h>
-
 typedef enum TRANSFORMATIONTYPE
 {
 	TT_LINEAR = 0,

diff --git a/DeepSkyStacker/BitmapExt.cpp b/DeepSkyStacker/BitmapExt.cpp
@@ -835,14 +835,6 @@ bool ApplyGammaTransformation(C32BitsBitmap* pOutBitmap, CMemoryBitmap* pInBitma
 /* ------------------------------------------------------------------- */
 /* ------------------------------------------------------------------- */
 
-#pragma warning( push )
-#pragma warning( disable: 4996 ) // Remove this as soon as having switched to c++20.
-
-#include <concurrent_unordered_set.h>
-#include <shared_mutex>
-
-#pragma warning( pop )
-
 namespace {
 	//
 	// Fowler/Noll/Vo hash

diff --git a/DeepSkyStacker/BitmapInfo.cpp b/DeepSkyStacker/BitmapInfo.cpp
@@ -2,13 +2,6 @@
 #include "BitmapInfo.h"
 #include "Ztrace.h"
 
-
-// Don't want these really.
-#include <atlcomcli.h>
-#include <atlstr.h>
-#include <GdiPlus.h>
-using namespace Gdiplus;
-
 bool RetrieveEXIFInfo(LPCTSTR szFileName, CBitmapInfo& BitmapInfo)
 {
 	ZFUNCTRACE_RUNTIME();

diff --git a/DeepSkyStacker/CometStacking.h b/DeepSkyStacker/CometStacking.h
@@ -3,7 +3,6 @@
 class QPixmap;
 
 #include "DSSCommon.h"
-#include <QWidget>
 
 namespace Ui {
 class CometStacking;

diff --git a/DeepSkyStacker/CosmeticEngine.cpp b/DeepSkyStacker/CosmeticEngine.cpp
@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
 #include "CosmeticEngine.h"
 #include "MemoryBitmap.h"
 #include "Ztrace.h"

diff --git a/DeepSkyStacker/DarkFrame.cpp b/DeepSkyStacker/DarkFrame.cpp
@@ -1,5 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
 #include "DarkFrame.h"
 #include "Ztrace.h"
 #include "DSSProgress.h"

diff --git a/DeepSkyStacker/DeepSkyStacker.cpp b/DeepSkyStacker/DeepSkyStacker.cpp
@@ -36,7 +36,6 @@
 // DeepSkyStacker.cpp : Defines the entry point for the console application.
 //
 #include <stdafx.h>
-#include <atlstr.h>
 
 #include "DeepSkyStacker.h"
 

diff --git a/DeepSkyStacker/DeepSkyStacker.vcxproj b/DeepSkyStacker/DeepSkyStacker.vcxproj
@@ -305,13 +305,13 @@ $(QtToolsPath)\windeployqt --pdb $(TargetPath)</Command>
     <ClCompile Include="GrayBitmap.cpp" />
     <ClCompile Include="GreyMultiBitmap.cpp" />
     <ClCompile Include="group.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="ImageSinks.cpp" />
     <ClCompile Include="imageview.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="MemoryBitmap.cpp" />
     <ClCompile Include="picturelist.cpp" />
@@ -337,12 +337,10 @@ $(QtToolsPath)\windeployqt --pdb $(TargetPath)</Command>
     <ClCompile Include="FrameInfo.cpp" />
     <ClCompile Include="FrameList.cpp" />
     <ClCompile Include="ImageListModel.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeaderFile>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeaderFile>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdafx.h</PrecompiledHeaderFile>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdafx.h</PrecompiledHeaderFile>
     </ClCompile>
     <ClCompile Include="imageloader.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
@@ -375,8 +373,8 @@ $(QtToolsPath)\windeployqt --pdb $(TargetPath)</Command>
     <ClCompile Include="ProcessingDlg.cpp" />
     <ClCompile Include="ProcessSettingsSheet.cpp" />
     <ClCompile Include="QLinearGradientCtrl.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="qwinhost.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

diff --git a/DeepSkyStacker/DeepStackerDlg.cpp b/DeepSkyStacker/DeepStackerDlg.cpp
@@ -1,24 +1,12 @@
 // DeepStackerDlg.cpp : implementation file
 //
-
 #include "stdafx.h"
 #include "DeepSkyStacker.h"
 #include "DeepStackerDlg.h"
 #include "DSS-versionhelpers.h"
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QSplitter>
-#include <QtWidgets/QStackedWidget>
-#include <QtWidgets/QWidget>
-#include <QRect>
-#include <QScreen>
-#include <QSettings>
-
 #include "ExplorerBar.h"
 #include "StackingDlg.h"
 
-
-
 /* ------------------------------------------------------------------- */
 
 static bool	GetDefaultSettingsFileName(CString & strFile)

diff --git a/DeepSkyStacker/DeepStackerDlg.h b/DeepSkyStacker/DeepStackerDlg.h
@@ -1,13 +1,9 @@
-
-
 #pragma once
-
 // DeepStackerDlg.h : header file
 //
 
 #include "DeepStack.h"
 #include "DeepSkyStacker.h"
-#include <list>
 
 class CDSSSetting
 {

diff --git a/DeepSkyStacker/Delaunay.h b/DeepSkyStacker/Delaunay.h
@@ -29,11 +29,7 @@
 // mailto:[email protected]
 
 #pragma once
-
-#include <set>
-#include <algorithm>
-#include <math.h>
-#include "ZExcept.h"
+#include "ZExcBase.h"
 
 //
 // changes to remove dependencies on Microsoft GDI+ 

diff --git a/DeepSkyStacker/ExceptionHandling.cpp b/DeepSkyStacker/ExceptionHandling.cpp
@@ -3,8 +3,6 @@
 
 #if defined(_WINDOWS)
 
-#include <thread>
-#include <inttypes.h>
 #include "StackWalker.h"
 #include "Ztrace.h"
 

diff --git a/DeepSkyStacker/ExplorerBar.cpp b/DeepSkyStacker/ExplorerBar.cpp
@@ -2,8 +2,8 @@
 #include "ExplorerBar.h"
 #include "ui/ui_ExplorerBar.h"
 
-#include <Ztrace.h>
-#include <zexcept.h>
+#include "Ztrace.h"
+#include "zexcept.h"
 #include "DeepSkyStacker.h"
 #include "ProcessingDlg.h"
 #include "Workspace.h"

diff --git a/DeepSkyStacker/FITSUtil.cpp b/DeepSkyStacker/FITSUtil.cpp
@@ -1,11 +1,4 @@
 #include <stdafx.h>
-#include <iostream>
-#include <QSettings>
-#include <omp.h>
-
-// Ouch :(
-#include <windows.h>
-
 #include "resource.h"
 #include "Workspace.h"
 #include "FITSUtil.h"

diff --git a/DeepSkyStacker/FITSUtil.h b/DeepSkyStacker/FITSUtil.h
@@ -2,17 +2,11 @@
 #define __FITSUTIL_H__
 
 /* ------------------------------------------------------------------- */
-#include <filesystem>
 #include "cfa.h"
 #include "DSSCommon.h"
 #include "BitmapExtraInfo.h"
 #include "fitsio.h"
 
-// Want this out!
-#include <atlstr.h>
-
-namespace fs = std::filesystem;
-
 #pragma comment(lib, "cfitsio.lib")
 
 class CFITSHeader

diff --git a/DeepSkyStacker/File.cpp b/DeepSkyStacker/File.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <atlstr.h>
 #include "file.h"
 
 bool GetFileCreationDateTime(LPCTSTR szFileName, FILETIME& FileTime)

diff --git a/DeepSkyStacker/FlatFrame.cpp b/DeepSkyStacker/FlatFrame.cpp
@@ -1,7 +1,4 @@
 #include <stdafx.h>
-#include <omp.h>
-#include <atlstr.h>
-
 #include "FlatFrame.h"
 #include "Multitask.h"
 #include "DSSProgress.h"

diff --git a/DeepSkyStacker/MemoryBitmap.h b/DeepSkyStacker/MemoryBitmap.h
@@ -4,9 +4,6 @@
 #include "ColorRef.h"
 #include "Bayer.h"
 
-// Not nice :(
-#include <wtypesbase.h>
-
 class CMultiBitmap;
 class CMedianFilterEngine;
 class CBitmapCharacteristics;

diff --git a/DeepSkyStacker/QLinearGradientCtrl.cpp b/DeepSkyStacker/QLinearGradientCtrl.cpp
@@ -1,23 +1,11 @@
 // QLinearGradientCtrl.cpp 
 //
-#include <algorithm>
-using std::min;
-using std::max;
-
-#include <QColor>
-#include <QDebug>
-#include <QLinearGradient>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPoint>
-#include <QRect>
-#include <QRegion>
-#include <QWidget>
-
-#include <Ztrace.h>
-
+#include <stdafx.h>
 #include "QLinearGradientCtrl.h"
 
+#include "Ztrace.h"
+#include "ZExcBase.h"
+
 /////////////////////////////////////////////////////////////////////////////
 // QLinearGradientCtrl
 

diff --git a/DeepSkyStacker/QLinearGradientCtrl.h b/DeepSkyStacker/QLinearGradientCtrl.h
@@ -36,15 +36,6 @@
 ****************************************************************************/
 // QLinearGradientCtrl : header file
 //
-#include <zexcept.h>
-
-class QColor;
-class QString;
-
-#include <QWidget>
-#include <QGradient>
-
-
 #define GCW_AUTO -1
 
 #define GC_SELCHANGE			1

diff --git a/DeepSkyStacker/RenameGroup.h b/DeepSkyStacker/RenameGroup.h
@@ -37,7 +37,6 @@
 // RenameGroup.h  : header file
 //
 
-#include <QDialog>
 #include "ui/ui_RenameGroup.h"
 
 namespace DSS

diff --git a/DeepSkyStacker/StackingDlg.cpp b/DeepSkyStacker/StackingDlg.cpp
@@ -62,6 +62,7 @@
 #include "BatchStacking.h"
 #include "StackRecap.h"
 #include "ProcessingDlg.h"
+#include "ZExcept.h"
 
 #define dssApp DeepSkyStacker::instance()