Toward w/o MMV1 , supress inclusion MMVII_MMV1Compat.h as much as pos…

…sible when easy
micmacIGN · Jan 13, 2025 · a7c0449 · a7c0449
1 parent e849f96
commit a7c0449
Show file tree

Hide file tree

Showing 27 changed files with 5 additions and 27 deletions.
diff --git a/MMVII/src/BundleAdjustment/cCorresp32_BA.cpp b/MMVII/src/BundleAdjustment/cCorresp32_BA.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 

diff --git a/MMVII/src/Geoms/PtsBox.cpp b/MMVII/src/Geoms/PtsBox.cpp
@@ -1,6 +1,6 @@
 #include "MMVII_Images.h"
 #include "MMVII_Geom2D.h"
-#include "MMVII_MMV1Compat.h"
+#include "MMVII_Geom3D.h"
 
 namespace MMVII
 {

diff --git a/MMVII/src/ImportFormat/CERN_ImportClino.cpp b/MMVII/src/ImportFormat/CERN_ImportClino.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_Stringifier.h"

diff --git a/MMVII/src/ImportFormat/ImportCalib.cpp b/MMVII/src/ImportFormat/ImportCalib.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 

diff --git a/MMVII/src/ImportFormat/ImportClino.cpp b/MMVII/src/ImportFormat/ImportClino.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_2Include_Serial_Tpl.h"

diff --git a/MMVII/src/ImportFormat/ImportGCP.cpp b/MMVII/src/ImportFormat/ImportGCP.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include <regex>

diff --git a/MMVII/src/ImportFormat/ImportLines.cpp b/MMVII/src/ImportFormat/ImportLines.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_2Include_Serial_Tpl.h"

diff --git a/MMVII/src/ImportFormat/ImportMes32.cpp b/MMVII/src/ImportFormat/ImportMes32.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_2Include_Serial_Tpl.h"

diff --git a/MMVII/src/ImportFormat/ImportOBS.cpp b/MMVII/src/ImportFormat/ImportOBS.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_Topo.h"
 

diff --git a/MMVII/src/ImportFormat/ImportOrgi.cpp b/MMVII/src/ImportFormat/ImportOrgi.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 

diff --git a/MMVII/src/ImportFormat/ImportOri.cpp b/MMVII/src/ImportFormat/ImportOri.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_2Include_Serial_Tpl.h"

diff --git a/MMVII/src/ImportFormat/ImportTiepMul.cpp b/MMVII/src/ImportFormat/ImportTiepMul.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_2Include_Serial_Tpl.h"

diff --git a/MMVII/src/ImportFormat/MergeMesImGCP.cpp b/MMVII/src/ImportFormat/MergeMesImGCP.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_2Include_Serial_Tpl.h"

diff --git a/MMVII/src/ImportFormat/V1ImportGCP.cpp b/MMVII/src/ImportFormat/V1ImportGCP.cpp
@@ -1,5 +1,5 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
+#include "MMVII_MMV1Compat.h"  // TO SEE
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 

diff --git a/MMVII/src/MMV1/ExportSensorMMV1.cpp b/MMVII/src/MMV1/ExportSensorMMV1.cpp
@@ -1,6 +1,6 @@
 #include "V1VII.h"
 
-#include "MMVII_MMV1Compat.h"
+#include "MMVII_MMV1Compat.h" // TO SEE
 
 namespace MMVII
 {

diff --git a/MMVII/src/Sensors/cConvCalib.cpp b/MMVII/src/Sensors/cConvCalib.cpp
@@ -1,7 +1,7 @@
 #define WITH_MMV1_FUNCTION false
 
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
+#include "MMVII_MMV1Compat.h" // TO SEE
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 

diff --git a/MMVII/src/Sensors/cPHP_SysCo.cpp b/MMVII/src/Sensors/cPHP_SysCo.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_Sys.h"
 #include "MMVII_Radiom.h"

diff --git a/MMVII/src/Sensors/cPhotogrammetricProject.cpp b/MMVII/src/Sensors/cPhotogrammetricProject.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_Sys.h"
 #include "MMVII_Radiom.h"

diff --git a/MMVII/src/SysCo/ChSysCoGCP.cpp b/MMVII/src/SysCo/ChSysCoGCP.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_Matrix.h"

diff --git a/MMVII/src/SysCo/ChSysCoOri.cpp b/MMVII/src/SysCo/ChSysCoOri.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_Matrix.h"

diff --git a/MMVII/src/SysCo/CreateRTL.cpp b/MMVII/src/SysCo/CreateRTL.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_Matrix.h"

diff --git a/MMVII/src/SysCo/TestProj.cpp b/MMVII/src/SysCo/TestProj.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_Matrix.h"

diff --git a/MMVII/src/TieP/cAppliToTiePMul.cpp b/MMVII/src/TieP/cAppliToTiePMul.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_2Include_Serial_Tpl.h"

diff --git a/MMVII/src/TieP/cConvTieP.cpp b/MMVII/src/TieP/cConvTieP.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_DeclareAllCmd.h"

diff --git a/MMVII/src/TieP/cIndexe2Merged.cpp b/MMVII/src/TieP/cIndexe2Merged.cpp
@@ -1,5 +1,4 @@
 #include "MMVII_PCSens.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_DeclareCste.h"
 #include "MMVII_BundleAdj.h"
 #include "MMVII_2Include_Serial_Tpl.h"

diff --git a/MMVII/src/Utils/uti_set_sel.cpp b/MMVII/src/Utils/uti_set_sel.cpp
@@ -1,4 +1,4 @@
-#include "MMVII_MMV1Compat.h"
+#include "MMVII_MMV1Compat.h" // TO SEE
 #include "MMVII_2Include_Serial_Tpl.h"
 #include "MMVII_util_tpl.h"
 

diff --git a/MMVII/src/Utils/uti_sysdep.cpp b/MMVII/src/Utils/uti_sysdep.cpp
@@ -1,7 +1,6 @@
 #include "cMMVII_Appli.h"
 #include "MMVII_Sys.h"
 #include "MMVII_DeclareCste.h"
-#include "MMVII_MMV1Compat.h"
 #include "MMVII_2Include_Serial_Tpl.h"
 
 #include <filesystem>