From f3a451f2a90921be8d6596b8739b209bb15443ab Mon Sep 17 00:00:00 2001 From: Alessandro Pasotti Date: Thu, 13 Aug 2020 11:13:44 +0200 Subject: [PATCH] Renamed subset to subsetstring for clarity --- python/core/auto_generated/qgsvirtuallayerdefinition.sip.in | 2 +- src/core/qgsvirtuallayerdefinition.cpp | 4 ++-- src/core/qgsvirtuallayerdefinition.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/core/auto_generated/qgsvirtuallayerdefinition.sip.in b/python/core/auto_generated/qgsvirtuallayerdefinition.sip.in index 71e4f70e090..7e5e3cadd84 100644 --- a/python/core/auto_generated/qgsvirtuallayerdefinition.sip.in +++ b/python/core/auto_generated/qgsvirtuallayerdefinition.sip.in @@ -94,7 +94,7 @@ uid=column_name is the name of a column with unique inte nogeometry is a flag to force the layer to be a non-geometry layer query=sql represents the SQL query. Must be URL-encoded field=column_name:[int|real|text] represents a field with its name and its type -subset=where_condition represents the subset +subsetstring=subset_string represents the subsetstring %End QUrl toUrl() const; diff --git a/src/core/qgsvirtuallayerdefinition.cpp b/src/core/qgsvirtuallayerdefinition.cpp index 1777d26cb7b..ff096bbb908 100644 --- a/src/core/qgsvirtuallayerdefinition.cpp +++ b/src/core/qgsvirtuallayerdefinition.cpp @@ -162,7 +162,7 @@ QgsVirtualLayerDefinition QgsVirtualLayerDefinition::fromUrl( const QUrl &url ) { def.setLazy( true ); } - else if ( key == QLatin1String( "subset" ) ) + else if ( key == QLatin1String( "subsetstring" ) ) { def.setSubsetString( QUrl::fromPercentEncoding( value.toUtf8() ) ); } @@ -308,7 +308,7 @@ QUrl QgsVirtualLayerDefinition::toUrl() const if ( ! subsetString().isEmpty() ) { - urlQuery.addQueryItem( QStringLiteral( "subset" ), QUrl::toPercentEncoding( subsetString() ) ); + urlQuery.addQueryItem( QStringLiteral( "subsetstring" ), QUrl::toPercentEncoding( subsetString() ) ); } url.setQuery( urlQuery ); diff --git a/src/core/qgsvirtuallayerdefinition.h b/src/core/qgsvirtuallayerdefinition.h index ddf14b377ae..5ccd573cbbe 100644 --- a/src/core/qgsvirtuallayerdefinition.h +++ b/src/core/qgsvirtuallayerdefinition.h @@ -95,7 +95,7 @@ class CORE_EXPORT QgsVirtualLayerDefinition * nogeometry is a flag to force the layer to be a non-geometry layer * query=sql represents the SQL query. Must be URL-encoded * field=column_name:[int|real|text] represents a field with its name and its type - * subset=where_condition represents the subset + * subsetstring=subset_string represents the subsetstring */ static QgsVirtualLayerDefinition fromUrl( const QUrl &url );