Skip to content

Commit e55de90

Browse files
committed
make userData a property so it calls getUserData to avoid crash
1 parent 1d1b7c9 commit e55de90

16 files changed

Lines changed: 96 additions & 75 deletions

‎python/core/auto_generated/locator/qgslocatorfilter.sip.in‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,18 @@ Constructor for QgsLocatorResult.
3434
Constructor for QgsLocatorResult.
3535
%End
3636

37-
3837
QVariant getUserData() const;
3938
%Docstring
4039
Returns the ``userData``.
4140

4241
.. versionadded:: 3.18
42+
%End
43+
44+
void setUserData( QVariant userData );
45+
%Docstring
46+
Set ``userData`` for the locator result
47+
48+
.. versionadded:: 3.34
4349
%End
4450

4551
QgsLocatorFilter *filter;
@@ -48,8 +54,6 @@ Returns the ``userData``.
4854

4955
QString description;
5056

51-
QVariant userData;
52-
5357
QIcon icon;
5458

5559
double score;
@@ -77,6 +81,9 @@ normally.
7781
};
7882

7983
QList<QgsLocatorResult::ResultAction> actions;
84+
85+
%Property( name = userData, get = getUserData, set = setUserData )
86+
8087
};
8188

8289

@@ -363,8 +370,6 @@ QFlags<QgsLocatorFilter::Flag> operator|(QgsLocatorFilter::Flag f1, QFlags<QgsLo
363370

364371

365372

366-
367-
368373
/************************************************************************
369374
* This file has been generated automatically from *
370375
* *

‎src/app/locator/qgsactionlocatorfilter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void QgsActionLocatorFilter::fetchResults( const QString &string, const QgsLocat
5050

5151
void QgsActionLocatorFilter::triggerResult( const QgsLocatorResult &result )
5252
{
53-
QAction *action = qobject_cast< QAction * >( qvariant_cast<QObject *>( result.userData ) );
53+
QAction *action = qobject_cast< QAction * >( qvariant_cast<QObject *>( result.getUserData() ) );
5454
if ( action )
5555
action->trigger();
5656
}
@@ -106,7 +106,7 @@ void QgsActionLocatorFilter::searchActions( const QString &string, QWidget *pare
106106

107107
QgsLocatorResult result;
108108
result.displayString = searchText;
109-
result.userData = QVariant::fromValue( action );
109+
result.setUserData( QVariant::fromValue( action ) );
110110
result.icon = action->icon();
111111
result.score = fuzzyScore( result.displayString, string );
112112

‎src/app/locator/qgsactivelayerfeatureslocatorfilter.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ void QgsActiveLayerFeaturesLocatorFilter::fetchResults( const QString &string, c
175175
QgsLocatorResult result;
176176
result.displayString = QStringLiteral( "@%1" ).arg( field );
177177
result.description = tr( "Limit the search to the field '%1'" ).arg( field );
178-
result.userData = QVariantMap( {{QStringLiteral( "type" ), QVariant::fromValue( ResultType::FieldRestriction )},
178+
result.setUserData( QVariantMap( {{QStringLiteral( "type" ), QVariant::fromValue( ResultType::FieldRestriction )},
179179
{QStringLiteral( "search_text" ), QStringLiteral( "%1 @%2 " ).arg( prefix(), field ) }
180-
} );
180+
} ) );
181181
result.score = 1;
182182
emit resultFetched( result );
183183
}
@@ -195,13 +195,13 @@ void QgsActiveLayerFeaturesLocatorFilter::fetchResults( const QString &string, c
195195
QgsLocatorResult result;
196196

197197
result.displayString = mDispExpression.evaluate( &mContext ).toString();
198-
result.userData = QVariantMap(
198+
result.setUserData( QVariantMap(
199199
{
200200
{QStringLiteral( "type" ), QVariant::fromValue( ResultType::Feature )},
201201
{QStringLiteral( "feature_id" ), f.id()},
202202
{QStringLiteral( "layer_id" ), mLayerId},
203203
{QStringLiteral( "layer_is_spatial" ), mLayerIsSpatial}
204-
} );
204+
} ) );
205205
result.icon = mLayerIcon;
206206
result.score = static_cast< double >( searchString.length() ) / result.displayString.size();
207207
if ( mLayerIsSpatial )
@@ -250,13 +250,13 @@ void QgsActiveLayerFeaturesLocatorFilter::fetchResults( const QString &string, c
250250
continue; //not sure how this result slipped through...
251251

252252
result.description = mDispExpression.evaluate( &mContext ).toString();
253-
result.userData = QVariantMap(
253+
result.setUserData( QVariantMap(
254254
{
255255
{QStringLiteral( "type" ), QVariant::fromValue( ResultType::Feature )},
256256
{QStringLiteral( "feature_id" ), f.id()},
257257
{QStringLiteral( "layer_id" ), mLayerId},
258258
{QStringLiteral( "layer_is_spatial" ), mLayerIsSpatial}
259-
} );
259+
} ) );
260260
result.icon = mLayerIcon;
261261
result.score = static_cast< double >( searchString.length() ) / result.displayString.size();
262262
if ( mLayerIsSpatial )
@@ -278,7 +278,7 @@ void QgsActiveLayerFeaturesLocatorFilter::triggerResult( const QgsLocatorResult
278278

279279
void QgsActiveLayerFeaturesLocatorFilter::triggerResultFromAction( const QgsLocatorResult &result, const int actionId )
280280
{
281-
QVariantMap data = result.userData.value<QVariantMap>();
281+
QVariantMap data = result.getUserData().value<QVariantMap>();
282282
switch ( data.value( QStringLiteral( "type" ) ).value<ResultType>() )
283283
{
284284
case ResultType::Feature:

‎src/app/locator/qgsalllayersfeatureslocatorfilter.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ void QgsAllLayersFeaturesLocatorFilter::fetchResults( const QString &string, con
120120

121121
result.displayString = preparedLayer->expression.evaluate( &( preparedLayer->context ) ).toString();
122122

123-
result.userData = ResultData( f.id(), preparedLayer->layerId, preparedLayer->layerIsSpatial ).toVariant();
123+
result.setUserData( ResultData( f.id(), preparedLayer->layerId, preparedLayer->layerIsSpatial ).toVariant() );
124124
foundFeatureIds << f.id();
125125
result.icon = preparedLayer->layerIcon;
126126
result.score = static_cast< double >( string.length() ) / result.displayString.size();
@@ -154,7 +154,7 @@ void QgsAllLayersFeaturesLocatorFilter::fetchResults( const QString &string, con
154154

155155
result.displayString = preparedLayer->expression.evaluate( &( preparedLayer->context ) ).toString();
156156

157-
result.userData = ResultData( f.id(), preparedLayer->layerId, preparedLayer->layerIsSpatial ).toVariant();
157+
result.setUserData( ResultData( f.id(), preparedLayer->layerId, preparedLayer->layerIsSpatial ).toVariant() );
158158
result.icon = preparedLayer->layerIcon;
159159
result.score = static_cast< double >( string.length() ) / result.displayString.size();
160160

@@ -179,7 +179,7 @@ void QgsAllLayersFeaturesLocatorFilter::triggerResult( const QgsLocatorResult &r
179179

180180
void QgsAllLayersFeaturesLocatorFilter::triggerResultFromAction( const QgsLocatorResult &result, const int actionId )
181181
{
182-
ResultData data = ResultData::fromVariant( result.userData );
182+
ResultData data = ResultData::fromVariant( result.getUserData() );
183183
QgsFeatureId fid = data.id();
184184
QString layerId = data.layerId();
185185
bool layerIsSpatial = data.layerIsSpatial();

‎src/app/locator/qgsbookmarklocatorfilter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void QgsBookmarkLocatorFilter::fetchResults( const QString &string, const QgsLoc
4848
QgsLocatorResult result;
4949
result.filter = this;
5050
result.displayString = name;
51-
result.userData = index;
51+
result.setUserData( index );
5252
result.icon = QgsApplication::getThemeIcon( QStringLiteral( "/mItemBookmark.svg" ) );
5353

5454
if ( context.usingPrefix && string.isEmpty() )
@@ -66,6 +66,6 @@ void QgsBookmarkLocatorFilter::fetchResults( const QString &string, const QgsLoc
6666

6767
void QgsBookmarkLocatorFilter::triggerResult( const QgsLocatorResult &result )
6868
{
69-
const QModelIndex index = qvariant_cast<QModelIndex>( result.userData );
69+
const QModelIndex index = qvariant_cast<QModelIndex>( result.getUserData() );
7070
QgisApp::instance()->zoomToBookmarkIndex( index );
7171
}

‎src/app/locator/qgsexpressioncalculatorlocatorfilter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void QgsExpressionCalculatorLocatorFilter::fetchResults( const QString &string,
5353
QgsLocatorResult result;
5454
result.filter = this;
5555
result.displayString = tr( "Copy “%1” to clipboard" ).arg( resultString );
56-
result.userData = resultString;
56+
result.setUserData( resultString );
5757
result.score = 1;
5858
emit resultFetched( result );
5959
}
@@ -62,5 +62,5 @@ void QgsExpressionCalculatorLocatorFilter::fetchResults( const QString &string,
6262

6363
void QgsExpressionCalculatorLocatorFilter::triggerResult( const QgsLocatorResult &result )
6464
{
65-
QApplication::clipboard()->setText( result.userData.toString() );
65+
QApplication::clipboard()->setText( result.getUserData().toString() );
6666
}

‎src/app/locator/qgsgotolocatorfilter.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void QgsGotoLocatorFilter::fetchResults( const QString &string, const QgsLocator
134134
result.displayString = tr( "Go to %1%2 %3%4 (Map CRS, %5)" ).arg( locale.toString( firstNumber, 'g', 10 ), firstSuffix,
135135
locale.toString( secondNumber, 'g', 10 ), secondSuffix,
136136
currentCrs.userFriendlyIdentifier() );
137-
result.userData = data;
137+
result.setUserData( data );
138138
result.score = 0.9;
139139
emit resultFetched( result );
140140
}
@@ -165,7 +165,7 @@ void QgsGotoLocatorFilter::fetchResults( const QString &string, const QgsLocator
165165
QgsLocatorResult result;
166166
result.filter = this;
167167
result.displayString = tr( "Go to %1°N %2°E (%3)" ).arg( locale.toString( point.y(), 'g', 10 ), locale.toString( point.x(), 'g', 10 ), wgs84Crs.userFriendlyIdentifier() );
168-
result.userData = data;
168+
result.setUserData( data );
169169
result.score = 1.0;
170170
emit resultFetched( result );
171171
}
@@ -305,7 +305,7 @@ void QgsGotoLocatorFilter::fetchResults( const QString &string, const QgsLocator
305305
result.displayString = tr( "Go to %1°N %2°E %3(%4)" ).arg( locale.toString( point.y(), 'g', 10 ), locale.toString( point.x(), 'g', 10 ),
306306
scale > 0.0 ? tr( "at scale 1:%1 " ).arg( scale ) : QString(),
307307
wgs84Crs.userFriendlyIdentifier() );
308-
result.userData = data;
308+
result.setUserData( data );
309309
result.score = 1.0;
310310
emit resultFetched( result );
311311
}
@@ -316,7 +316,7 @@ void QgsGotoLocatorFilter::triggerResult( const QgsLocatorResult &result )
316316
{
317317
QgsMapCanvas *mapCanvas = QgisApp::instance()->mapCanvas();
318318

319-
QVariantMap data = result.userData.toMap();
319+
QVariantMap data = result.getUserData().toMap();
320320
const QgsPointXY point = data[QStringLiteral( "point" )].value<QgsPointXY>();
321321
mapCanvas->setCenter( point );
322322
if ( data.contains( QStringLiteral( "scale" ) ) )

‎src/app/locator/qgslayermetadatalocatorfilter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ void QgsLayerMetadataLocatorFilter::fetchResults( const QString &string, const Q
4747
result.displayString = metadata.identifier();
4848
result.description = metadata.title();
4949
result.icon = QgsIconUtils::iconForGeometryType( metadata.geometryType() );
50-
result.userData = QVariant::fromValue( metadata );
50+
result.setUserData( QVariant::fromValue( metadata ) );
5151
emit resultFetched( result );
5252
}
5353
}
5454
}
5555

5656
void QgsLayerMetadataLocatorFilter::triggerResult( const QgsLocatorResult &result )
5757
{
58-
QgsLayerMetadataProviderResult metadataResult { result.userData.value<QgsLayerMetadataProviderResult>() };
58+
QgsLayerMetadataProviderResult metadataResult { result.getUserData().value<QgsLayerMetadataProviderResult>() };
5959
switch ( metadataResult.layerType() )
6060
{
6161
case Qgis::LayerType::Raster:

‎src/app/locator/qgslayertreelocatorfilter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void QgsLayerTreeLocatorFilter::fetchResults( const QString &string, const QgsLo
4343

4444
QgsLocatorResult result;
4545
result.displayString = layer->layer()->name();
46-
result.userData = layer->layerId();
46+
result.setUserData( layer->layerId() );
4747
result.icon = QgsIconUtils::iconForLayer( layer->layer() );
4848

4949
// return all the layers in case the string query is empty using an equal default score
@@ -62,7 +62,7 @@ void QgsLayerTreeLocatorFilter::fetchResults( const QString &string, const QgsLo
6262

6363
void QgsLayerTreeLocatorFilter::triggerResult( const QgsLocatorResult &result )
6464
{
65-
const QString layerId = result.userData.toString();
65+
const QString layerId = result.getUserData().toString();
6666
QgsMapLayer *layer = QgsProject::instance()->mapLayer( layerId );
6767
QgisApp::instance()->setActiveLayer( layer );
6868
}

‎src/app/locator/qgslayoutlocatorfilter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void QgsLayoutLocatorFilter::fetchResults( const QString &string, const QgsLocat
4242

4343
QgsLocatorResult result;
4444
result.displayString = layout->name();
45-
result.userData = layout->name();
45+
result.setUserData( layout->name() );
4646

4747
if ( context.usingPrefix && string.isEmpty() )
4848
{
@@ -59,7 +59,7 @@ void QgsLayoutLocatorFilter::fetchResults( const QString &string, const QgsLocat
5959

6060
void QgsLayoutLocatorFilter::triggerResult( const QgsLocatorResult &result )
6161
{
62-
const QString layoutName = result.userData.toString();
62+
const QString layoutName = result.getUserData().toString();
6363
QgsMasterLayoutInterface *layout = QgsProject::instance()->layoutManager()->layoutByName( layoutName );
6464
if ( !layout )
6565
return;

0 commit comments

Comments
 (0)