Skip to content
Permalink
Browse files

fix symbol conflict when building with static libraries (fixes #37134)

  • Loading branch information
jef-n committed Jun 12, 2020
1 parent c75aad0 commit 18e220adfe9e84a0af3a1d6af6347c75d4236fb6
@@ -2516,7 +2516,7 @@ bool QgsOgrProvider::createSpatialIndex()
return false;
}

QString createIndexName( QString tableName, QString field )
QString QgsOgrProvider::createIndexName( QString tableName, QString field )
{
QRegularExpression safeExp( QStringLiteral( "[^a-zA-Z0-9]" ) );
tableName.replace( safeExp, QStringLiteral( "_" ) );
@@ -202,6 +202,7 @@ class QgsOgrProvider final: public QgsVectorDataProvider
private:
unsigned char *getGeometryPointer( OGRFeatureH fet );
QString ogrWkbGeometryTypeName( OGRwkbGeometryType type ) const;
static QString createIndexName( QString tableName, QString field );

//! Starts a transaction if possible and return true in that case
bool startTransaction();
@@ -4341,7 +4341,7 @@ bool QgsSpatiaLiteProvider::addFeatures( QgsFeatureList &flist, Flags flags )
return ret == SQLITE_OK;
}

QString createIndexName( QString tableName, QString field )
QString QgsSpatiaLiteProvider::createIndexName( QString tableName, QString field )
{
QRegularExpression safeExp( QStringLiteral( "[^a-zA-Z0-9]" ) );
tableName.replace( safeExp, QStringLiteral( "_" ) );
@@ -406,6 +406,8 @@ class QgsSpatiaLiteProvider final: public QgsVectorDataProvider
*/
sqlite3 *sqliteHandle( ) const;

static QString createIndexName( QString tableName, QString field );

friend class QgsSpatiaLiteFeatureSource;

// QgsVectorDataProvider interface

0 comments on commit 18e220a

Please sign in to comment.
You can’t perform that action at this time.