Remove ZipUtils in favor of upstream QgsZipUtils now that needed func…

…tions are available
opengisch · Apr 22, 2024 · 26aad60 · 26aad60
1 parent afe16f9
commit 26aad60
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 219 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -13,7 +13,6 @@ set(QFIELD_CORE_SRCS
     utils/snappingutils.cpp
     utils/stringutils.cpp
     utils/urlutils.cpp
-    utils/ziputils.cpp
     qgsquick/qgsquickcoordinatetransformer.cpp
     qgsquick/qgsquickmapcanvasmap.cpp
     qgsquick/qgsquickelevationprofilecanvas.cpp
@@ -123,7 +122,6 @@ set(QFIELD_CORE_HDRS
     utils/snappingutils.h
     utils/stringutils.h
     utils/urlutils.h
-    utils/ziputils.h
     qgsquick/qgsquickcoordinatetransformer.h
     qgsquick/qgsquickmapcanvasmap.h
     qgsquick/qgsquickelevationprofilecanvas.h

diff --git a/src/core/appinterface.cpp b/src/core/appinterface.cpp
@@ -19,7 +19,6 @@
 #include "platformutilities.h"
 #include "qfield.h"
 #include "qgismobileapp.h"
-#include "ziputils.h"
 #if WITH_SENTRY
 #include "sentry_wrapper.h"
 #endif
@@ -327,7 +326,7 @@ void AppInterface::importUrl( const QString &url )
         if ( fileSuffix == QLatin1String( "zip" ) )
         {
           // Check if this is a compressed project and handle accordingly
-          QStringList zipFiles = ZipUtils::files( filePath );
+          QStringList zipFiles = QgsZipUtils::files( filePath );
           const bool isCompressedProject = std::find_if( zipFiles.begin(),
                                                          zipFiles.end(),
                                                          []( const QString &zipFile ) {
@@ -346,7 +345,7 @@ void AppInterface::importUrl( const QString &url )
             }
             QDir( zipDirectory ).mkpath( "." );
 
-            if ( ZipUtils::unzip( filePath, zipDirectory, zipFiles, false ) )
+            if ( QgsZipUtils::unzip( filePath, zipDirectory, zipFiles, false ) )
             {
               file.remove();
               emit importEnded( zipDirectory );

diff --git a/src/core/utils/ziputils.cpp b/src/core/utils/ziputils.cpp
diff --git a/src/core/utils/ziputils.h b/src/core/utils/ziputils.h