argumentname containerType

signedav · signedav · commit f4424853f7c5 · 2018-07-06T12:57:05.000+02:00
diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -76,14 +76,14 @@ QgsOfflineEditing::QgsOfflineEditing()
  *  - remove remote layers
  *  - mark as offline project
  */
-bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected, ContainerType dbContainerType )
+bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected, ContainerType containerType )
 {
   if ( layerIds.isEmpty() )
   {
     return false;
   }
   QString dbPath = QDir( offlineDataPath ).absoluteFilePath( offlineDbFile );
-  if ( createOfflineDb( dbPath, dbContainerType ) )
+  if ( createOfflineDb( dbPath, containerType ) )
   {
     spatialite_database_unique_ptr database;
     int rc = database.open( dbPath );
@@ -138,7 +138,7 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath,
         if ( vl )
         {
           QString origLayerId = vl->id();
-          QgsVectorLayer *newLayer = copyVectorLayer( vl, database.get(), dbPath, onlySelected, dbContainerType );
+          QgsVectorLayer *newLayer = copyVectorLayer( vl, database.get(), dbPath, onlySelected, containerType );
           if ( newLayer )
           {
             layerIdMapping.insert( origLayerId, newLayer );
@@ -385,7 +385,7 @@ void QgsOfflineEditing::initializeSpatialMetadata( sqlite3 *sqlite_handle )
   spatial_ref_sys_init( sqlite_handle, 0 );
 }
 
-bool QgsOfflineEditing::createOfflineDb( const QString &offlineDbPath, ContainerType dbContainerType )
+bool QgsOfflineEditing::createOfflineDb( const QString &offlineDbPath, ContainerType containerType )
 {
   int ret;
   char *errMsg = nullptr;
@@ -407,7 +407,7 @@ bool QgsOfflineEditing::createOfflineDb( const QString &offlineDbPath, Container
   QString dbPath = newDb.fileName();
 
   // creating geopackage
-  if ( dbContainerType == GPKG )
+  if ( containerType == GPKG )
   {
     OGRSFDriverH hGpkgDriver = OGRGetDriverByName( "GPKG" );
     if ( !hGpkgDriver )
@@ -492,7 +492,7 @@ void QgsOfflineEditing::createLoggingTables( sqlite3 *db )
   */
 }
 
-QgsVectorLayer *QgsOfflineEditing::copyVectorLayer( QgsVectorLayer *layer, sqlite3 *db, const QString &offlineDbPath, bool onlySelected, ContainerType dbContainerType )
+QgsVectorLayer *QgsOfflineEditing::copyVectorLayer( QgsVectorLayer *layer, sqlite3 *db, const QString &offlineDbPath, bool onlySelected, ContainerType containerType )
 {
   if ( !layer )
     return nullptr;
@@ -503,7 +503,7 @@ QgsVectorLayer *QgsOfflineEditing::copyVectorLayer( QgsVectorLayer *layer, sqlit
   // new layer
   QgsVectorLayer *newLayer = nullptr;
 
-  if ( dbContainerType != GPKG )
+  if ( containerType != GPKG )
   {
     // create table
     QString sql = QStringLiteral( "CREATE TABLE '%1' (" ).arg( tableName );
diff --git a/src/core/qgsofflineediting.h b/src/core/qgsofflineediting.h
@@ -64,7 +64,7 @@ class CORE_EXPORT QgsOfflineEditing : public QObject
      * \param layerIds List of layer names to convert
      * \param onlySelected Only copy selected features from layers where a selection is present
      */
-    bool convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected = false, ContainerType dbContainerType = SpatiaLite );
+    bool convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected = false, ContainerType containerType = SpatiaLite );
 
     //! Returns true if current project is offline
     bool isOfflineProject() const;
@@ -113,10 +113,10 @@ class CORE_EXPORT QgsOfflineEditing : public QObject
 
   private:
     void initializeSpatialMetadata( sqlite3 *sqlite_handle );
-    bool createOfflineDb( const QString &offlineDbPath, ContainerType dbContainerType = SpatiaLite );
+    bool createOfflineDb( const QString &offlineDbPath, ContainerType containerType = SpatiaLite );
     void createLoggingTables( sqlite3 *db );
 
-    QgsVectorLayer *copyVectorLayer( QgsVectorLayer *layer, sqlite3 *db, const QString &offlineDbPath, bool onlySelected, ContainerType dbContainerType = SpatiaLite );
+    QgsVectorLayer *copyVectorLayer( QgsVectorLayer *layer, sqlite3 *db, const QString &offlineDbPath, bool onlySelected, ContainerType containerType = SpatiaLite );
 
     void applyAttributesAdded( QgsVectorLayer *remoteLayer, sqlite3 *db, int layerId, int commitNo );
     void applyFeaturesAdded( QgsVectorLayer *offlineLayer, QgsVectorLayer *remoteLayer, sqlite3 *db, int layerId );

Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,14 @@ QgsOfflineEditing::QgsOfflineEditing()`
`76`	`76`	`* - remove remote layers`
`77`	`77`	`* - mark as offline project`
`78`	`78`	`*/`
`79`		`-bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected, ContainerType dbContainerType )`
	`79`	`+bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath, const QString &offlineDbFile, const QStringList &layerIds, bool onlySelected, ContainerType containerType )`
`80`	`80`	`{`
`81`	`81`	`if ( layerIds.isEmpty() )`
`82`	`82`	`{`
`83`	`83`	`return false;`
`84`	`84`	`}`
`85`	`85`	`QString dbPath = QDir( offlineDataPath ).absoluteFilePath( offlineDbFile );`
`86`		`- if ( createOfflineDb( dbPath, dbContainerType ) )`
	`86`	`+ if ( createOfflineDb( dbPath, containerType ) )`
`87`	`87`	`{`
`88`	`88`	`spatialite_database_unique_ptr database;`
`89`	`89`	`int rc = database.open( dbPath );`
`@@ -138,7 +138,7 @@ bool QgsOfflineEditing::convertToOfflineProject( const QString &offlineDataPath,`
`138`	`138`	`if ( vl )`
`139`	`139`	`{`
`140`	`140`	`QString origLayerId = vl->id();`
`141`		`- QgsVectorLayer *newLayer = copyVectorLayer( vl, database.get(), dbPath, onlySelected, dbContainerType );`
	`141`	`+ QgsVectorLayer *newLayer = copyVectorLayer( vl, database.get(), dbPath, onlySelected, containerType );`
`142`	`142`	`if ( newLayer )`
`143`	`143`	`{`
`144`	`144`	`layerIdMapping.insert( origLayerId, newLayer );`
`@@ -385,7 +385,7 @@ void QgsOfflineEditing::initializeSpatialMetadata( sqlite3 *sqlite_handle )`
`385`	`385`	`spatial_ref_sys_init( sqlite_handle, 0 );`
`386`	`386`	`}`
`387`	`387`
`388`		`-bool QgsOfflineEditing::createOfflineDb( const QString &offlineDbPath, ContainerType dbContainerType )`
	`388`	`+bool QgsOfflineEditing::createOfflineDb( const QString &offlineDbPath, ContainerType containerType )`
`389`	`389`	`{`
`390`	`390`	`int ret;`
`391`	`391`	`char *errMsg = nullptr;`
`@@ -407,7 +407,7 @@ bool QgsOfflineEditing::createOfflineDb( const QString &offlineDbPath, Container`
`407`	`407`	`QString dbPath = newDb.fileName();`
`408`	`408`
`409`	`409`	`// creating geopackage`
`410`		`- if ( dbContainerType == GPKG )`
	`410`	`+ if ( containerType == GPKG )`
`411`	`411`	`{`
`412`	`412`	`OGRSFDriverH hGpkgDriver = OGRGetDriverByName( "GPKG" );`
`413`	`413`	`if ( !hGpkgDriver )`
`@@ -492,7 +492,7 @@ void QgsOfflineEditing::createLoggingTables( sqlite3 *db )`
`492`	`492`	`*/`
`493`	`493`	`}`
`494`	`494`
`495`		`-QgsVectorLayer QgsOfflineEditing::copyVectorLayer( QgsVectorLayer layer, sqlite3 *db, const QString &offlineDbPath, bool onlySelected, ContainerType dbContainerType )`
	`495`	`+QgsVectorLayer QgsOfflineEditing::copyVectorLayer( QgsVectorLayer layer, sqlite3 *db, const QString &offlineDbPath, bool onlySelected, ContainerType containerType )`
`496`	`496`	`{`
`497`	`497`	`if ( !layer )`
`498`	`498`	`return nullptr;`
`@@ -503,7 +503,7 @@ QgsVectorLayer QgsOfflineEditing::copyVectorLayer( QgsVectorLayer layer, sqlit`
`503`	`503`	`// new layer`
`504`	`504`	`QgsVectorLayer *newLayer = nullptr;`
`505`	`505`
`506`		`- if ( dbContainerType != GPKG )`
	`506`	`+ if ( containerType != GPKG )`
`507`	`507`	`{`
`508`	`508`	`// create table`
`509`	`509`	`QString sql = QStringLiteral( "CREATE TABLE '%1' (" ).arg( tableName );`