Skip to content

Commit 1033c7b

Browse files
committed
Remove unused argument
1 parent 80d2240 commit 1033c7b

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

doc/api_break.dox

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2166,6 +2166,7 @@ QgsVectorLayerImport {#qgis_api_break_3_0_QgsVectorLayerImport}
21662166
QgsCoordinateReferenceSystem is now implicitly shared, using references to QgsCoordinateReferenceSystem rather than
21672167
pointers makes for more robust, safer code. Use an invalid (default constructed) QgsCoordinateReferenceSystem
21682168
in code which previously passed a null pointer to QgsVectorLayerImport.
2169+
- The unused QProgressBar argument in the QgsVectorLayerImport was removed
21692170
- ErrUserCancelled (ImportError enum value) has been renamed to ErrUserCanceled <!--#spellok-->
21702171

21712172

python/core/qgsvectorlayerimport.sip

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ There are two possibilities how to use this class:
7373
QgsWkbTypes::Type geometryType,
7474
const QgsCoordinateReferenceSystem &crs,
7575
bool overwrite = false,
76-
const QMap<QString, QVariant> *options = 0,
77-
QProgressDialog *progress = 0
78-
);
76+
const QMap<QString, QVariant> *options = 0 );
7977
%Docstring
8078
Constructor for QgsVectorLayerImport.
8179
\param uri URI for destination data source
@@ -86,7 +84,6 @@ There are two possibilities how to use this class:
8684
not available
8785
\param overwrite set to true to overwrite any existing data source
8886
\param options optional provider dataset options
89-
\param progress optional progress dialog to show progress of export
9087
%End
9188

9289

src/core/qgsvectorlayerimport.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,9 @@ QgsVectorLayerImport::QgsVectorLayerImport( const QString &uri,
5252
QgsWkbTypes::Type geometryType,
5353
const QgsCoordinateReferenceSystem &crs,
5454
bool overwrite,
55-
const QMap<QString, QVariant> *options,
56-
QProgressDialog *progress )
55+
const QMap<QString, QVariant> *options )
5756
: mErrorCount( 0 )
5857
, mAttributeCount( -1 )
59-
, mProgress( progress )
6058

6159
{
6260
mProvider = nullptr;
@@ -308,7 +306,7 @@ QgsVectorLayerImport::importLayer( QgsVectorLayer *layer,
308306
}
309307

310308
QgsVectorLayerImport *writer =
311-
new QgsVectorLayerImport( uri, providerKey, fields, wkbType, outputCRS, overwrite, options, progress );
309+
new QgsVectorLayerImport( uri, providerKey, fields, wkbType, outputCRS, overwrite, options );
312310

313311
// check whether file creation was successful
314312
ImportError err = writer->hasError();
@@ -325,7 +323,6 @@ QgsVectorLayerImport::importLayer( QgsVectorLayer *layer,
325323
errorMessage->clear();
326324
}
327325

328-
QgsAttributeList allAttr = skipAttributeCreation ? QgsAttributeList() : layer->attributeList();
329326
QgsFeature fet;
330327

331328
QgsFeatureRequest req;

src/core/qgsvectorlayerimport.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,14 @@ class CORE_EXPORT QgsVectorLayerImport : public QgsFeatureSink
9090
* not available
9191
* \param overwrite set to true to overwrite any existing data source
9292
* \param options optional provider dataset options
93-
* \param progress optional progress dialog to show progress of export
9493
*/
9594
QgsVectorLayerImport( const QString &uri,
9695
const QString &provider,
9796
const QgsFields &fields,
9897
QgsWkbTypes::Type geometryType,
9998
const QgsCoordinateReferenceSystem &crs,
10099
bool overwrite = false,
101-
const QMap<QString, QVariant> *options = nullptr,
102-
QProgressDialog *progress = nullptr
103-
);
100+
const QMap<QString, QVariant> *options = nullptr );
104101

105102
//! QgsVectorLayerImport cannot be copied
106103
QgsVectorLayerImport( const QgsVectorLayerImport &rh ) = delete;
@@ -141,7 +138,6 @@ class CORE_EXPORT QgsVectorLayerImport : public QgsFeatureSink
141138
int mAttributeCount;
142139

143140
QgsFeatureList mFeatureBuffer;
144-
QProgressDialog *mProgress = nullptr;
145141

146142
#ifdef SIP_RUN
147143
QgsVectorLayerImport( const QgsVectorLayerImport &rh );

0 commit comments

Comments
 (0)