switch from gsl::span to std::span

Author: p0358

headers/entryflagdetection.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <span>
+
 #include <gsl/gsl>
 
 namespace uc2
@@ -17,7 +19,7 @@ class EntryFlagDetection
     inline bool IsLzmaTexture() const noexcept;
 
 private:
-    void DetectSpecialTypes( gsl::span<uint8_t> entryData ) noexcept;
+    void DetectSpecialTypes( std::span<uint8_t> entryData ) noexcept;
 
 private:
     bool m_bEncryptedFile;

headers/fsutils.hpp

@@ -2,14 +2,14 @@
 
 #include <stdint.h>
 #include <filesystem>
-#include <gsl/gsl>
+#include <span>
 #include <vector>
 
 namespace fs = std::filesystem;
 
 std::pair<bool, std::vector<std::uint8_t>> ReadFileToBuffer(
     const fs::path& filePath, uint64_t readLength = 0 );
 bool WriteBufferToFile( const fs::path& filePath,
-                        gsl::span<std::uint8_t> buff );
+                        std::span<std::uint8_t> buff );
 
 bool CreateDirIfUnexisting( const fs::path& newDirPath ) noexcept;

headers/miscutils.hpp

@@ -2,7 +2,7 @@
 
 #include <cstring>
 #include <filesystem>
-#include <gsl/gsl>
+#include <span>
 #include <string>
 #include <string_view>
 
@@ -20,7 +20,7 @@ inline size_t GenerateHashFromString( const std::string& str )
 
 template <typename DataType, typename DataSizeType,
           typename NoPtrDataType = typename std::remove_pointer<DataType>::type>
-inline gsl::span<NoPtrDataType> PairToSpan(
+inline std::span<NoPtrDataType> PairToSpan(
     std::pair<DataType, DataSizeType> src )
 {
     return { src.first, src.second };

headers/nodeextractionmgr.hpp

@@ -3,8 +3,7 @@
 #include <filesystem>
 #include <unordered_map>
 #include <vector>
-
-#include <gsl/gsl>
+#include <span>
 
 #include <uc2/pkgfile.hpp>
 
@@ -39,17 +38,17 @@ class NodeExtractionMgr
     inline int GetExtractionProgress() const;
 
     // from PkgFileModel
-    bool ExtractNodes( const gsl::span<ArchiveBaseNode*> targetNodes,
+    bool ExtractNodes( const std::span<ArchiveBaseNode*> targetNodes,
                        const fs::path& pkgParentPath );
-    bool ExtractPackages( gsl::span<uc2::PkgFile*> pkgs,
+    bool ExtractPackages( std::span<uc2::PkgFile*> pkgs,
                           const fs::path& pkgParentPath );
 
     bool ExtractSingleFileNode( ArchiveFileNode* pFileNode,
                                 const fs::path& pkgParentPath,
                                 fs::path& outResultPath );
 
 private:
-    void AddNodes( const gsl::span<ArchiveBaseNode*> nodes,
+    void AddNodes( const std::span<ArchiveBaseNode*> nodes,
                    uc2::PkgFile* ownerPkgFile );
     void AddFileNode( ArchiveFileNode* pFileNode, uc2::PkgFile* ownerPkgFile,
                       fs::path nodeParentDir = {} );
@@ -72,7 +71,7 @@ class NodeExtractionMgr
 
     // from PkgFileModel
     std::vector<uc2::PkgFile*> GetRequiredPkgFiles(
-        const gsl::span<ArchiveBaseNode*> nodes );
+        const std::span<ArchiveBaseNode*> nodes );
 
 private:
     std::vector<uint8_t> m_vLoadedPkgFile;

headers/specialfilehandler.hpp

@@ -3,33 +3,32 @@
 #include <cstdint>
 #include <filesystem>
 #include <string_view>
-
-#include <gsl/gsl>
+#include <span>
 
 namespace fs = std::filesystem;
 
 class SpecialFileHandler
 {
 public:
-    SpecialFileHandler( gsl::span<std::uint8_t> fileData, fs::path filePath,
+    SpecialFileHandler( std::span<std::uint8_t> fileData, fs::path filePath,
                         bool canDecrypt, bool canDecompress );
     ~SpecialFileHandler();
 
 public:
-    gsl::span<std::uint8_t> ProcessData();
+    std::span<std::uint8_t> ProcessData();
     inline fs::path GetNewFilePath() const;
 
 private:
     bool IsFileEncrypted() const;
     bool IsTextureCompressed() const;
 
-    gsl::span<std::uint8_t> DecryptFile();
-    gsl::span<std::uint8_t> DecompressTexture() const;
+    std::span<std::uint8_t> DecryptFile();
+    std::span<std::uint8_t> DecompressTexture() const;
 
     static void FixDecryptedExtension( fs::path& filePath );
 
 private:
-    gsl::span<std::uint8_t> m_FileData;
+    std::span<std::uint8_t> m_FileData;
     fs::path m_FilePath;
 
     const bool m_bAllowDecryption;

sources/dynpkgfilefactory.cpp

@@ -3,6 +3,7 @@
 #include <array>
 
 #include <QDebug>
+#include <gsl/gsl>
 
 #include "fsutils.hpp"
 #include "miscutils.hpp"

sources/fsutils.cpp

@@ -2,6 +2,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <span>
 
 #include <gsl/gsl>
 
@@ -41,7 +42,7 @@ std::pair<bool, std::vector<uint8_t>> ReadFileToBuffer(
     return { true, std::move( res ) };
 }
 
-bool WriteBufferToFile( const fs::path& filePath, gsl::span<uint8_t> buff )
+bool WriteBufferToFile( const fs::path& filePath, std::span<uint8_t> buff )
 {
     std::ofstream os( filePath, std::ios::binary );
 

sources/nodeextractionmgr.cpp

@@ -24,7 +24,7 @@ NodeExtractionMgr::NodeExtractionMgr(
 {
 }
 
-void NodeExtractionMgr::AddNodes( const gsl::span<ArchiveBaseNode*> nodes,
+void NodeExtractionMgr::AddNodes( const std::span<ArchiveBaseNode*> nodes,
                                   uc2::PkgFile* ownerPkgFile )
 {
     std::string szPkgFilename( ownerPkgFile->GetFilename() );
@@ -214,7 +214,7 @@ bool NodeExtractionMgr::WritePkgEntryInternal( uc2::PkgEntry* pEntry,
                                                bool canDecrypt,
                                                bool canDecompress )
 {
-    gsl::span<uint8_t> decryptedBuffer;
+    std::span<uint8_t> decryptedBuffer;
 
     try
     {
@@ -277,7 +277,7 @@ static std::set<std::string_view> GetDirChildrenFiles(
 }
 
 std::vector<uc2::PkgFile*> NodeExtractionMgr::GetRequiredPkgFiles(
-    const gsl::span<ArchiveBaseNode*> nodes )
+    const std::span<ArchiveBaseNode*> nodes )
 {
     std::unordered_set<uc2::PkgFile*> uniquePkgFiles;
 
@@ -315,7 +315,7 @@ std::vector<uc2::PkgFile*> NodeExtractionMgr::GetRequiredPkgFiles(
 }
 
 bool NodeExtractionMgr::ExtractNodes(
-    const gsl::span<ArchiveBaseNode*> targetNodes,
+    const std::span<ArchiveBaseNode*> targetNodes,
     const fs::path& pkgParentPath )
 {
     auto vPkgFiles = this->GetRequiredPkgFiles( targetNodes );
@@ -353,7 +353,7 @@ bool NodeExtractionMgr::ExtractNodes(
     return true;
 }
 
-bool NodeExtractionMgr::ExtractPackages( gsl::span<uc2::PkgFile*> pkgs,
+bool NodeExtractionMgr::ExtractPackages( std::span<uc2::PkgFile*> pkgs,
                                          const fs::path& pkgParentPath )
 {
     for ( auto&& pPkgFile : pkgs )

sources/specialfilehandler.cpp

@@ -10,7 +10,7 @@
 #include "indexkeycollections.hpp"
 #include "miscutils.hpp"
 
-SpecialFileHandler::SpecialFileHandler( gsl::span<std::uint8_t> fileData,
+SpecialFileHandler::SpecialFileHandler( std::span<std::uint8_t> fileData,
                                         fs::path filePath, bool canDecrypt,
                                         bool canDecompress )
     : m_FileData( fileData ), m_FilePath( filePath ),
@@ -20,7 +20,7 @@ SpecialFileHandler::SpecialFileHandler( gsl::span<std::uint8_t> fileData,
 
 SpecialFileHandler::~SpecialFileHandler() {}
 
-gsl::span<std::uint8_t> SpecialFileHandler::ProcessData()
+std::span<std::uint8_t> SpecialFileHandler::ProcessData()
 {
     if ( this->m_bAllowDecryption && this->IsFileEncrypted() )
     {
@@ -49,7 +49,7 @@ bool SpecialFileHandler::IsTextureCompressed() const
     return bIsCompressedTex;
 }
 
-gsl::span<std::uint8_t> SpecialFileHandler::DecryptFile()
+std::span<std::uint8_t> SpecialFileHandler::DecryptFile()
 {
     try
     {
@@ -73,7 +73,7 @@ gsl::span<std::uint8_t> SpecialFileHandler::DecryptFile()
     return {};
 }
 
-gsl::span<std::uint8_t> SpecialFileHandler::DecompressTexture() const
+std::span<std::uint8_t> SpecialFileHandler::DecompressTexture() const
 {
     try
     {