From 1f0e73a3362fdce65c79a9a2fa091c08e04a0891 Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Tue, 19 Sep 2017 13:24:43 +0200 Subject: [PATCH] QgsGeoPackageImportTask -> QgsConcurrentFileWriterImportTask --- src/providers/ogr/qgsgeopackagedataitems.cpp | 2 +- src/providers/ogr/qgsgeopackagedataitems.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/providers/ogr/qgsgeopackagedataitems.cpp b/src/providers/ogr/qgsgeopackagedataitems.cpp index a248b638b9c2..28647c71f95b 100644 --- a/src/providers/ogr/qgsgeopackagedataitems.cpp +++ b/src/providers/ogr/qgsgeopackagedataitems.cpp @@ -193,7 +193,7 @@ bool QgsGeoPackageConnectionItem::handleDrop( const QMimeData *data, Qt::DropAct bool hasError = false; // Main task - std::unique_ptr< QgsGeoPackageImportTask > mainTask( new QgsGeoPackageImportTask( tr( "GeoPackage import" ) ) ); + std::unique_ptr< QgsConcurrentFileWriterImportTask > mainTask( new QgsConcurrentFileWriterImportTask( tr( "GeoPackage import" ) ) ); QgsTaskList importTasks; const auto lst = QgsMimeDataUtils::decodeUriList( data ); diff --git a/src/providers/ogr/qgsgeopackagedataitems.h b/src/providers/ogr/qgsgeopackagedataitems.h index da219e4691b2..e44402055417 100644 --- a/src/providers/ogr/qgsgeopackagedataitems.h +++ b/src/providers/ogr/qgsgeopackagedataitems.h @@ -129,13 +129,18 @@ class QgsGeoPackageDataItemProvider : public QgsDataItemProvider }; -class QgsGeoPackageImportTask : public QgsTask +/** + * \brief The QgsConcurrentFileWriterImportTask class is the parent task for + * importing layers from a drag and drop operation in the browser. + * Individual layers need to be added as individual substask. + */ +class QgsConcurrentFileWriterImportTask : public QgsTask { Q_OBJECT public: - QgsGeoPackageImportTask( const QString &desc = QString() ) : QgsTask( desc ) {} + QgsConcurrentFileWriterImportTask( const QString &desc = QString() ) : QgsTask( desc ) {} void emitProgressChanged( double progress ) { setProgress( progress ); }