Merge pull request #1446 from Framstag/io_package

Move file io stuff to io "package"
Framstag · Jun 11, 2023 · 0fc6c75 · 0fc6c75
2 parents 1bceba6 + 76809a6
commit 0fc6c75
Show file tree

Hide file tree

Showing 120 changed files with 319 additions and 268 deletions.
diff --git a/BasemapImport/src/BasemapImport.cpp b/BasemapImport/src/BasemapImport.cpp
@@ -18,21 +18,19 @@
 */
 
 #include <cstring>
-#include <cstdio>
 
 #include <iostream>
 #include <memory>
-#include <sstream>
 #include <string>
 #include <vector>
 #include <algorithm>
 
 #include <osmscout/projection/MercatorProjection.h>
 
 #include <osmscout/util/CmdLineParsing.h>
-#include <osmscout/util/File.h>
 
-#include <osmscoutimport/Import.h>
+#include <osmscout/io/File.h>
+
 #include <osmscoutimport/ShapeFileScanner.h>
 
 #include <osmscoutimport/WaterIndexProcessor.h>

diff --git a/Import/src/Import.cpp b/Import/src/Import.cpp
@@ -28,7 +28,8 @@
 #include <optional>
 
 #include <osmscout/util/CmdLineParsing.h>
-#include <osmscout/util/File.h>
+
+#include <osmscout/io/File.h>
 
 #include <osmscoutimport/Import.h>
 

diff --git a/PublicTransportMap/src/PublicTransportMap.cpp b/PublicTransportMap/src/PublicTransportMap.cpp
@@ -28,7 +28,8 @@
 #include <osmscout/feature/NameFeature.h>
 
 #include <osmscout/util/CmdLineParsing.h>
-#include <osmscout/util/FileScanner.h>
+
+#include <osmscout/io/FileScanner.h>
 
 /*
  * Example:

diff --git a/Tests/src/CachePerformance.cpp b/Tests/src/CachePerformance.cpp
@@ -22,7 +22,6 @@
 #include <vector>
 
 #include <osmscout/util/Cache.h>
-#include <osmscout/util/FileScanner.h>
 #include <osmscout/util/StopClock.h>
 #include <osmscout/util/CmdLineParsing.h>
 

diff --git a/Tests/src/CalculateResolution.cpp b/Tests/src/CalculateResolution.cpp
@@ -1,7 +1,6 @@
 #include <cstddef>
 #include <iostream>
 
-#include <osmscout/util/File.h>
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/Number.h>
 

diff --git a/Tests/src/File.cpp b/Tests/src/File.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <utility>
 
-#include <osmscout/util/File.h>
+#include <osmscout/io/File.h>
 
 #include <TestMain.h>
 

diff --git a/Tests/src/FileScannerWriter.cpp b/Tests/src/FileScannerWriter.cpp
@@ -2,8 +2,8 @@
 #include <iostream>
 #include <limits>
 
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
 
 #include <TestMain.h>
 

diff --git a/Tests/src/MultiDBRouting.cpp b/Tests/src/MultiDBRouting.cpp
@@ -28,7 +28,8 @@
 #include <osmscout/routing/MultiDBRoutingService.h>
 
 #include <osmscout/util/CmdLineParsing.h>
-#include <osmscout/util/FileScanner.h>
+
+#include <osmscout/io/FileScanner.h>
 
 struct Arguments
 {

diff --git a/Tests/src/OSTAndOSSCheck.cpp b/Tests/src/OSTAndOSSCheck.cpp
@@ -24,8 +24,10 @@
 #include <osmscout/TypeConfig.h>
 #include <osmscoutmap/StyleConfig.h>
 
-#include <osmscout/util/File.h>
+#include <osmscout/io/File.h>
+
 #include <osmscout/util/CmdLineParsing.h>
+
 #include <iomanip>
 
 using namespace std;

diff --git a/Tests/src/ReaderScannerPerformance.cpp b/Tests/src/ReaderScannerPerformance.cpp
@@ -21,8 +21,9 @@
 
 #include <osmscout/Way.h>
 
-#include <osmscout/util/File.h>
-#include <osmscout/util/FileScanner.h>
+#include <osmscout/io/File.h>
+#include <osmscout/io/FileScanner.h>
+
 #include <osmscout/util/StopClock.h>
 
 /**

diff --git a/libosmscout-gpx/include/osmscoutgpx/Export.h b/libosmscout-gpx/include/osmscoutgpx/Export.h
@@ -24,7 +24,8 @@
 #include <osmscoutgpx/Import.h>
 #include <osmscoutgpx/GPXImportExport.h>
 
-#include <osmscout/util/File.h>
+#include <osmscout/io/File.h>
+
 #include <osmscout/util/Exception.h>
 #include <osmscout/util/Breaker.h>
 

diff --git a/libosmscout-gpx/include/osmscoutgpx/Import.h b/libosmscout-gpx/include/osmscoutgpx/Import.h
@@ -24,7 +24,8 @@
 #include <osmscoutgpx/Utils.h>
 #include <osmscoutgpx/GPXImportExport.h>
 
-#include <osmscout/util/File.h>
+#include <osmscout/io/File.h>
+
 #include <osmscout/util/Exception.h>
 #include <osmscout/util/Breaker.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/AreaIndexGenerator.h b/libosmscout-import/include/osmscoutimport/AreaIndexGenerator.h
@@ -27,12 +27,15 @@
 
 #include <osmscout/Pixel.h>
 
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/TypeInfoSet.h>
+
+#include <osmscout/io/File.h>
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/util/TileId.h>
 #include <osmscout/util/String.h>
-#include <osmscout/util/File.h>
+
 #include <osmscout/system/Compiler.h>
-#include <osmscout/TypeInfoSet.h>
 
 namespace osmscout {
 

diff --git a/libosmscout-import/include/osmscoutimport/GenAreaAreaIndex.h b/libosmscout-import/include/osmscoutimport/GenAreaAreaIndex.h
@@ -26,7 +26,7 @@
 #include <osmscout/Area.h>
 #include <osmscout/Pixel.h>
 
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileWriter.h>
 #include <osmscout/util/Geometry.h>
 
 #include <osmscoutimport/Import.h>

diff --git a/libosmscout-import/include/osmscoutimport/GenAreaRouteIndex.h b/libosmscout-import/include/osmscoutimport/GenAreaRouteIndex.h
@@ -29,7 +29,8 @@
 #include <osmscout/Pixel.h>
 #include <osmscout/Route.h>
 
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/TileId.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/GenAreaWayIndex.h b/libosmscout-import/include/osmscoutimport/GenAreaWayIndex.h
@@ -29,7 +29,8 @@
 #include <osmscout/Pixel.h>
 #include <osmscout/Way.h>
 
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/TileId.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/GenNumericIndex.h b/libosmscout-import/include/osmscoutimport/GenNumericIndex.h
@@ -22,11 +22,11 @@
 
 #include <vector>
 
+#include <osmscout/io/File.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
 
 #include <osmscout/util/Cache.h>
-#include <osmscout/util/File.h>
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
 #include <osmscout/util/Number.h>
 #include <osmscout/util/Progress.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/GenOptimizeAreasLowZoom.h b/libosmscout-import/include/osmscoutimport/GenOptimizeAreasLowZoom.h
@@ -31,8 +31,8 @@
 
 #include <osmscout/Area.h>
 
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
 
 #include <osmscout/system/Compiler.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/GenOptimizeWaysLowZoom.h b/libosmscout-import/include/osmscoutimport/GenOptimizeWaysLowZoom.h
@@ -32,8 +32,8 @@
 #include <osmscout/Area.h>
 #include <osmscout/Way.h>
 
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
 
 #include <osmscout/system/Compiler.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/GenRouteDat.h b/libosmscout-import/include/osmscoutimport/GenRouteDat.h
@@ -25,8 +25,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <osmscout/NumericIndex.h>
-
 #include <osmscout/OSMScoutTypes.h>
 
 #include <osmscout/FeatureReader.h>
@@ -44,7 +42,9 @@
 #include <osmscout/routing/RouteNode.h>
 #include <osmscout/routing/TurnRestriction.h>
 
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/NumericIndex.h>
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/util/NodeUseMap.h>
 
 #include <osmscout/system/Compiler.h>

diff --git a/libosmscout-import/include/osmscoutimport/GenWayWayDat.h b/libosmscout-import/include/osmscoutimport/GenWayWayDat.h
@@ -31,7 +31,7 @@
 
 #include <osmscout/TypeInfoSet.h>
 
-#include <osmscout/NumericIndex.h>
+#include <osmscout/io/NumericIndex.h>
 
 #include <osmscout/routing/TurnRestriction.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/Preprocess.h b/libosmscout-import/include/osmscoutimport/Preprocess.h
@@ -27,7 +27,8 @@
 #include <osmscout/Tag.h>
 #include <osmscout/routing/TurnRestriction.h>
 
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/util/WorkQueue.h>
 
 #include <osmscoutimport/Import.h>

diff --git a/libosmscout-import/include/osmscoutimport/RawCoastline.h b/libosmscout-import/include/osmscoutimport/RawCoastline.h
@@ -24,8 +24,8 @@
 
 #include <osmscout/Tag.h>
 
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
 
 #include <osmscout/system/Compiler.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/RawCoord.h b/libosmscout-import/include/osmscoutimport/RawCoord.h
@@ -23,8 +23,8 @@
 #include <osmscout/GeoCoord.h>
 #include <osmscout/TypeConfig.h>
 
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
 
 #include <osmscout/system/Compiler.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/RawNode.h b/libosmscout-import/include/osmscoutimport/RawNode.h
@@ -28,8 +28,8 @@
 #include <osmscout/Tag.h>
 #include <osmscout/TypeConfig.h>
 
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
 
 #include <osmscout/system/Compiler.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/RawRelIndexedDataFile.h b/libosmscout-import/include/osmscoutimport/RawRelIndexedDataFile.h
@@ -20,7 +20,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
 
-#include <osmscout/DataFile.h>
+#include <osmscout/io/DataFile.h>
 
 #include <osmscoutimport/RawRelation.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/RawRelation.h b/libosmscout-import/include/osmscoutimport/RawRelation.h
@@ -26,8 +26,9 @@
 #include <osmscout/Tag.h>
 #include <osmscout/TypeConfig.h>
 
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/util/TagErrorReporter.h>
 
 #include <osmscout/system/Compiler.h>

diff --git a/libosmscout-import/include/osmscoutimport/RawWay.h b/libosmscout-import/include/osmscoutimport/RawWay.h
@@ -26,8 +26,8 @@
 #include <osmscout/Tag.h>
 #include <osmscout/TypeConfig.h>
 
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
 
 #include <osmscout/system/Compiler.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/RawWayIndexedDataFile.h b/libosmscout-import/include/osmscoutimport/RawWayIndexedDataFile.h
@@ -20,7 +20,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
 
-#include <osmscout/DataFile.h>
+#include <osmscout/io/DataFile.h>
 
 #include <osmscoutimport/RawWay.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/SortDat.h b/libosmscout-import/include/osmscoutimport/SortDat.h
@@ -26,10 +26,11 @@
 
 #include <osmscoutimport/Import.h>
 
-#include <osmscout/DataFile.h>
 #include <osmscout/ObjectRef.h>
 
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/DataFile.h>
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/system/Math.h>
 
 namespace osmscout {

diff --git a/libosmscout-import/include/osmscoutimport/WaterIndexProcessor.h b/libosmscout-import/include/osmscoutimport/WaterIndexProcessor.h
@@ -34,11 +34,12 @@
 
 #include <osmscout/projection/Projection.h>
 
-#include <osmscout/util/FileWriter.h>
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/Progress.h>
 #include <osmscout/util/Transformation.h>
 
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/system/Compiler.h>
 
 #include <osmscoutimport/ImportImportExport.h>

diff --git a/libosmscout-import/src/osmscoutimport/GenAreaAreaIndex.cpp b/libosmscout-import/src/osmscoutimport/GenAreaAreaIndex.cpp
@@ -32,8 +32,8 @@
 #include <osmscout/db/AreaAreaIndex.h>
 #include <osmscout/db/AreaDataFile.h>
 
-#include <osmscout/util/File.h>
-#include <osmscout/util/FileScanner.h>
+#include <osmscout/io/File.h>
+#include <osmscout/io/FileScanner.h>
 #include <osmscout/util/GeoBox.h>
 #include <osmscout/util/Geometry.h>
 

diff --git a/libosmscout-import/src/osmscoutimport/GenAreaNodeIndex.cpp b/libosmscout-import/src/osmscoutimport/GenAreaNodeIndex.cpp
@@ -28,9 +28,9 @@
 
 #include <osmscout/system/Assert.h>
 
-#include <osmscout/util/File.h>
-#include <osmscout/util/FileWriter.h>
-#include <osmscout/util/FileScanner.h>
+#include <osmscout/io/File.h>
+#include <osmscout/io/FileWriter.h>
+#include <osmscout/io/FileScanner.h>
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/Number.h>
 

diff --git a/libosmscout-import/src/osmscoutimport/GenLocationIndex.cpp b/libosmscout-import/src/osmscoutimport/GenLocationIndex.cpp
@@ -46,9 +46,10 @@
 #include <osmscout/system/Assert.h>
 #include <osmscout/system/Math.h>
 
-#include <osmscout/util/File.h>
-#include <osmscout/util/FileScanner.h>
-#include <osmscout/util/FileWriter.h>
+#include <osmscout/io/File.h>
+#include <osmscout/io/FileScanner.h>
+#include <osmscout/io/FileWriter.h>
+
 #include <osmscout/util/GeoBox.h>
 #include <osmscout/util/Geometry.h>